proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

18 files changed, 785 insertions, 0 deletions

diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
new file mode 100644
index 000000000000..101e5525296a
--- /dev/null
+++ b/sci-geosciences/mapnik/Manifest
@@ -0,0 +1,4 @@
+DIST mapnik-v2.0.1.tar.bz2 12018783 SHA256 fe3da0b1adbb48f55ebd01ab0e95e5183f512154249f1d407b7e59aa9176ba8c SHA512 405028b44f39d883d5d235e9f560748210065890df20ef4c581711f2d2373b5b403104f7bc3f9ece2133ca1ca307c54034fe4e37f07d1f7a4ed12fb0834266c6 WHIRLPOOL 22faf112b1cb3b9cd3343ba4881b0b3dd09e810a5d9f67793a241461dd8035aec37eb835c948e6b96e86998d6b2760e39223715490bcbee6bf5d323b19f2eb18
+DIST mapnik-v2.0.2.tar.bz2 12010042 SHA256 40e55c85f5148da22379830f7aaf2da4471f38c04590e06ded04b3fd4d693c5f SHA512 2111b47cc1b73facfa6acd58e25da74f2f4f1faa74fd8a73d69a843611859d0158995c1fc1e587a10287069f275f058881fe0f0e5efcc2230261fd5768172511 WHIRLPOOL 623350f7d87f4368802dbfbed8c91c56b4dd11f94ac467ecf06e0cf73666d29e59128d35930942411843910d7d2302819332a934317b30a69568ce0d2d8309b7
+DIST mapnik-v2.1.0.tar.bz2 17441565 SHA256 d5fcbaaea00359613b707eacaaa2109a0b5696e2baa35c02e4436e8a823b7160 SHA512 3b922e94d229cd8b0091953bd48b18b903e367a1f374d2c821560b6a14f115ab054ceac0749668f18ca40238116bd6617d571403bf860c824b3f260bee054d9e WHIRLPOOL 675082091871db5620f0a75d0a3f35d247150d558dd9546c6100cc6b9d5efc1230868c19707c23d5d5e2c08f9fdeccc33688f229ec96ffecb0e7afa604c3134d
+DIST mapnik-v2.2.0.tar.bz2 23007178 SHA256 9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0 SHA512 6e0bf5027865842a2648ab073b81785dd2c0d8ddb8c75da73caa8aa0c0697e8129ae7e2899f694d44ee1d3de2f207b285abff8e0a0616774564ac6e6b1e774ce WHIRLPOOL a8e50a64b276a92b2b6edaece3928928cf7abfcdd44f6663b7d459652aa95b6959eb769fd6c1958b9f81109470f5112b745792e673514c97a17c7677113d2c68
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch
new file mode 100644
index 000000000000..14321c1cba30
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch
@@ -0,0 +1,24 @@
+From c33d534b802f353a2cd1b42e98a6f5e8e04bc2b5 Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <dane@dbsgeo.com>
+Date: Thu, 9 Feb 2012 16:00:39 -0800
+Subject: [PATCH] link to boost system
+
+---
+ plugins/input/templates/helloworld/build.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/input/templates/helloworld/build.py b/plugins/input/templates/helloworld/build.py
+index 402b882..c0b75f0 100644
+--- a/plugins/input/templates/helloworld/build.py
++++ b/plugins/input/templates/helloworld/build.py
+@@ -44,6 +44,7 @@
+ libraries = [ '' ] # eg 'libfoo'
+ 
+ libraries.append('mapnik')
++libraries.append('boost_system%s' % env['BOOST_APPEND'])
+ # link libicuuc, but ICU_LIB_NAME is used custom builds of icu can
+ # have different library names like osx which offers /usr/lib/libicucore.dylib
+ libraries.append(env['ICU_LIB_NAME'])
+-- 
+1.7.10
+
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch
new file mode 100644
index 000000000000..d7facc363a2a
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch
@@ -0,0 +1,21 @@
+diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct
+--- mapnik-v2.0.1.old/SConstruct	2012-05-26 11:04:50.364638533 +0200
++++ mapnik-v2.0.1/SConstruct	2012-05-26 11:07:49.554621727 +0200
+@@ -501,16 +501,7 @@
+         #print 'missing opt', opt
+         preconfigured = False
+ 
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+-    # since we have custom arguments update environment with all opts to 
+-    # make sure to absorb the custom ones
+-    opts.Update(env)
+-    # now since we've got custom arguments we'll disregard any 
+-    # pickled environment and force another configuration
+-    preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+     if not HELP_REQUESTED:
+         color_print(4,'Using previous successful configuration...')
+         color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch
new file mode 100644
index 000000000000..4379303d71a7
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch
@@ -0,0 +1,12 @@
+diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct
+--- mapnik-v2.0.1.old/SConstruct	2012-05-26 11:04:50.364638533 +0200
++++ mapnik-v2.0.1/SConstruct	2012-05-26 11:26:29.003516741 +0200
+@@ -1445,7 +1445,7 @@
+                     site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON']
+                 else:
+                     site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON']                    
+-                env['PYTHON_SITE_PACKAGES'] = call(site_packages)
++                env['PYTHON_SITE_PACKAGES'] =  os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages)
+             else:
+                 env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip()
+                 env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3]
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch
new file mode 100644
index 000000000000..257d1b0d58bd
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch
@@ -0,0 +1,56 @@
+--- mapnik-v2.0.1.orig/SConstruct
++++ mapnik-v2.0.1/SConstruct
+@@ -313,9 +313,9 @@
+     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),    
+     
+     # Install Variables
+-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
++    ('PREFIX', 'The install path "prefix"', '/usr'),
+     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+-    ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
++    ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'),
+     ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
+     ('PATH_REMOVE', 'A path prefix to exclude from all know command and compile paths', ''),
+     
+@@ -342,15 +342,17 @@
+     PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+     PathVariable('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include', PathVariable.PathAccept),
+     PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+-    PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include', PathVariable.PathAccept),
+-    PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++    PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
++    PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++    PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept),
++    PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+     ('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),
+     
+     # Variables affecting rendering back-ends
+     
+     BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
+     
+-    BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
++    BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'),
+ 
+     BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
+     
+@@ -1087,6 +1089,7 @@
+         ['z', 'zlib.h', True,'C'],
+         ['proj', 'proj_api.h', True,'C'],
+         [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
++        ['agg','agg2/agg_config.h' , True,'C++'],
+     ]
+ 
+     if env['JPEG']:
+diff -ur mapnik-v2.0.1.orig/src/build.py mapnik-v2.0.1/src/build.py
+--- mapnik-v2.0.1.orig/src/build.py	2012-04-09 23:56:48.000000000 +0100
++++ mapnik-v2.0.1/src/build.py	2012-05-06 17:00:53.124452488 +0100
+@@ -333,9 +333,6 @@
+     if 'uninstall' not in COMMAND_LINE_TARGETS:
+       result = env.InstallAs(target=target, source=mapnik)
+       env.Alias(target='install', source=result)
+-      if result:
+-            env.AddPostAction(result, ldconfig)
+-
+     
+     # Install symlinks
+     target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),int(major), int(minor)))
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch
new file mode 100644
index 000000000000..e5ca048c39d8
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -481,16 +481,7 @@
+         #print 'missing opt', opt
+         preconfigured = False
+ 
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+-    # since we have custom arguments update environment with all opts to
+-    # make sure to absorb the custom ones
+-    opts.Update(env)
+-    # now since we've got custom arguments we'll disregard any
+-    # pickled environment and force another configuration
+-    preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+     if not HELP_REQUESTED:
+         color_print(4,'Using previous successful configuration...')
+         color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch
new file mode 100644
index 000000000000..e73e2ccb727c
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch
@@ -0,0 +1,11 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1362,7 +1362,7 @@
+                 site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON']
+             else:
+                 site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON']
+-            env['PYTHON_SITE_PACKAGES'] = call(site_packages)
++            env['PYTHON_SITE_PACKAGES'] = os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages)
+         else:
+             env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip()
+             env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3]
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
new file mode 100644
index 000000000000..bc6524697b01
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
@@ -0,0 +1,12 @@
+--- a/src/build.py
++++ b/src/build.py
+@@ -38,7 +38,8 @@
+         print stderr
+ 
+ def ldconfig(*args,**kwargs):
+-    call('ldconfig')
++    if 0: 
++        call('ldconfig')
+ 
+ if env['LINKING'] == 'static':
+     lib_env.Append(CXXFLAGS="-fPIC")
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch
new file mode 100644
index 000000000000..18d9409532f5
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch
@@ -0,0 +1,15 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -284,10 +284,10 @@
+     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+ 
+     # Install Variables
+-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
++    ('PREFIX', 'The install path "prefix"', '/usr'),
+     ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
+     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+-    ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
++    ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'),
+     ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
+     ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths', ''),
+     ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''),
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
new file mode 100644
index 000000000000..89541cb85ed7
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -503,16 +503,7 @@ for opt in pickle_store:
+         #print 'missing opt', opt
+         preconfigured = False
+ 
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+-    # since we have custom arguments update environment with all opts to
+-    # make sure to absorb the custom ones
+-    opts.Update(env)
+-    # now since we've got custom arguments we'll disregard any
+-    # pickled environment and force another configuration
+-    preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+     if not HELP_REQUESTED:
+         color_print(4,'Using previous successful configuration...')
+         color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
new file mode 100644
index 000000000000..c92c0e9a02a7
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
@@ -0,0 +1,11 @@
+--- a/src/build.py
++++ b/src/build.py
+@@ -38,7 +38,7 @@ def call(cmd, silent=True):
+         print stderr
+ 
+ def ldconfig(*args,**kwargs):
+-    call('ldconfig')
++    pass
+ 
+ if env['LINKING'] == 'static':
+     lib_env.Append(CXXFLAGS="-fPIC")
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch
new file mode 100644
index 000000000000..4266f624070d
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch
@@ -0,0 +1,16 @@
+diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp
+index 07383b3..85e2ff7 100644
+--- a/bindings/python/mapnik_datasource.cpp
++++ b/bindings/python/mapnik_datasource.cpp
+@@ -61,7 +61,11 @@ boost::shared_ptr<mapnik::datasource> create_datasource(dict const& d)
+             PyObject* temp = PyUnicode_AsUTF8String(obj.ptr());
+             if (temp)
+             {
++#if PY_VERSION_HEX >= 0x03000000
++                char* c_str = PyBytes_AsString(temp);
++#else
+                 char* c_str = PyString_AsString(temp);
++#endif
+                 params[key] = std::string(c_str);
+                 Py_DecRef(temp);
+             }
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
new file mode 100644
index 000000000000..0ddcd0f9e0dd
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
@@ -0,0 +1,11 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -291,7 +291,7 @@ opts.AddVariables(
+     ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+ 
+     # Install Variables
+-    ('PREFIX', 'The install path "prefix"', '/usr/local'),
++    ('PREFIX', 'The install path "prefix"', '/usr'),
+     ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
+     ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+     ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
diff --git a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
new file mode 100644
index 000000000000..36262fac634e
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python?]
+	dev-libs/icu
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/tiff
+	net-misc/curl
+	sci-libs/proj
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/agg[truetype]
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
+	)
+	gdal? ( sci-libs/gdal )
+	geos? ( sci-libs/geos )
+	postgres? ( >=dev-db/postgresql-8.3 )
+	sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.0.1-scons.patch \
+		"${FILESDIR}"/${PN}-2.0.1-configure-only-once.patch \
+		"${FILESDIR}"/${PN}-2.0.1-destdir.patch \
+		"${FILESDIR}"/${P}-boost_build.patch
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+	local PLUGINS=shape,raster,osm
+	use gdal && PLUGINS+=,gdal,ogr
+	use geos && PLUGINS+=,geos
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+
+	myesconsargs=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		$(use_scons python BINDINGS all none)
+		$(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+		$(use_scons bidi BIDI)
+		$(use_scons cairo CAIRO)
+		$(use_scons debug DEBUG)
+		$(use_scons debug XML_DEBUG)
+		$(use_scons doc DEMO)
+		$(use_scons doc SAMPLE_INPUT_PLUGINS)
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+		-i -e "s:env\['OPTIMIZATION'\]\,::" \
+		SConstruct || die "sed 3 failed"
+	escons configure
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons install
+
+	# even with all the mess it still installs into $S
+	mv "${S}/usr" "${ED}" || die
+
+	if use python ; then
+		fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+		dobin utils/stats/mapdef_stats.py
+	fi
+
+	dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+
+	use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
new file mode 100644
index 000000000000..2339b909fb0c
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python?]
+	dev-libs/icu
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/tiff
+	net-misc/curl
+	sci-libs/proj
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/agg[truetype]
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
+	)
+	gdal? ( sci-libs/gdal )
+	geos? ( sci-libs/geos )
+	postgres? ( >=dev-db/postgresql-8.3 )
+	sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.0.1-scons.patch \
+		"${FILESDIR}"/${PN}-2.0.1-configure-only-once.patch \
+		"${FILESDIR}"/${PN}-2.0.1-destdir.patch \
+		"${FILESDIR}"/${PN}-2.0.1-boost_build.patch
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+	local PLUGINS=shape,raster,osm
+	use gdal && PLUGINS+=,gdal,ogr
+	use geos && PLUGINS+=,geos
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+
+	myesconsargs=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		$(use_scons python BINDINGS all none)
+		$(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+		$(use_scons bidi BIDI)
+		$(use_scons cairo CAIRO)
+		$(use_scons debug DEBUG)
+		$(use_scons debug XML_DEBUG)
+		$(use_scons doc DEMO)
+		$(use_scons doc SAMPLE_INPUT_PLUGINS)
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+		-i -e "s:env\['OPTIMIZATION'\]\,::" \
+		SConstruct || die "sed 3 failed"
+	escons configure
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons install
+
+	# even with all the mess it still installs into $S
+	mv "${S}/usr" "${ED}" || die
+
+	if use python ; then
+		fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+		dobin utils/stats/mapdef_stats.py
+	fi
+
+	dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+
+	use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
new file mode 100644
index 000000000000..e942e8f43060
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python?]
+	dev-libs/icu
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/freetype
+	media-libs/libpng
+	media-libs/tiff
+	net-misc/curl
+	sci-libs/proj
+	sys-libs/zlib
+	virtual/jpeg
+	x11-libs/agg[truetype]
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+		python? ( dev-python/pycairo )
+	)
+	gdal? ( sci-libs/gdal )
+	geos? ( sci-libs/geos )
+	postgres? ( >=dev-db/postgresql-8.3 )
+	sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.1.0-scons.patch \
+		"${FILESDIR}"/${PN}-2.1.0-configure-only-once.patch \
+		"${FILESDIR}"/${PN}-2.1.0-destdir.patch \
+		"${FILESDIR}"/${PN}-2.1.0-dont-run-ldconfig.patch
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+	local PLUGINS=shape,raster,osm
+	use gdal && PLUGINS+=,gdal,ogr
+	use geos && PLUGINS+=,geos
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+
+	myesconsargs=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		$(use_scons python BINDINGS all none)
+		$(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+		$(use_scons bidi BIDI)
+		$(use_scons cairo CAIRO)
+		$(use_scons debug DEBUG)
+		$(use_scons debug XML_DEBUG)
+		$(use_scons doc DEMO)
+		$(use_scons doc SAMPLE_INPUT_PLUGINS)
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+		-i -e "s:env\['OPTIMIZATION'\]\,::" \
+		SConstruct || die "sed 3 failed"
+	escons configure
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons install
+
+	# even with all the mess it still installs into $S
+	mv "${S}/usr" "${ED}" || die
+
+	if use python ; then
+		fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+		dobin utils/stats/mapdef_stats.py
+	fi
+
+	dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+
+	use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
new file mode 100644
index 000000000000..bfc3b65b61a3
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+MY_P="${PN}-v${PV}"
+
+inherit eutils python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://mapnik.s3.amazonaws.com/dist/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cairo debug doc gdal postgres python sqlite"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[threads,python?]
+	dev-libs/icu:=
+	sys-libs/zlib
+	media-libs/freetype
+	dev-libs/libxml2
+	media-libs/libpng
+	media-libs/tiff
+	virtual/jpeg
+	media-libs/libwebp
+	sci-libs/proj
+	media-fonts/dejavu
+	x11-libs/agg[truetype]
+	net-misc/curl
+	cairo? (
+		x11-libs/cairo
+		dev-cpp/cairomm
+		python? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	)
+	postgres? ( >=dev-db/postgresql-8.3 )
+	gdal? ( sci-libs/gdal )
+	sqlite? ( dev-db/sqlite:3 )
+	python_single_target_python3_3? ( >=dev-libs/boost-1.53[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-configure-only-once.patch \
+		"${FILESDIR}"/${P}-dont-run-ldconfig.patch \
+		"${FILESDIR}"/${P}-scons.patch \
+		"${FILESDIR}"/${P}-python3.patch
+
+	# do not version epidoc data
+	sed -i \
+		-e 's:-`mapnik-config --version`::g' \
+		utils/epydoc_config/build_epydoc.sh || die
+
+	# force user flags, optimization level
+	sed -i -e "s:\-O%s:%s:" \
+		-i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \
+		SConstruct || die
+
+	epatch_user
+}
+
+src_configure() {
+	local PLUGINS=shape,csv,raster,geojson,osm
+	use gdal && PLUGINS+=,gdal,ogr
+	use postgres && PLUGINS+=,postgis
+	use sqlite && PLUGINS+=,sqlite
+	use python && PLUGINS+=,python
+
+	myesconsargs=(
+		"CC=$(tc-getCC)"
+		"CXX=$(tc-getCXX)"
+		"INPUT_PLUGINS=${PLUGINS}"
+		"PREFIX=/usr"
+		"DESTDIR=${D}"
+		"XMLPARSER=libxml2"
+		"LINKING=shared"
+		"RUNTIME_LINK=shared"
+		"PROJ_INCLUDES=/usr/include"
+		"PROJ_LIBS=/usr/$(get_libdir)"
+		"SYSTEM_FONTS=/usr/share/fonts"
+		$(use_scons python BINDINGS all none)
+		$(use python && use_scons python PYTHON $PYTHON)
+		$(use_scons python BOOST_PYTHON_LIB boost_python-$(echo $EPYTHON | sed 's/python//'))
+		$(use_scons cairo CAIRO)
+		$(use_scons debug DEBUG)
+		$(use_scons debug XML_DEBUG)
+		$(use_scons doc DEMO)
+		$(use_scons doc SAMPLE_INPUT_PLUGINS)
+		"CUSTOM_LDFLAGS=${LDFLAGS}"
+		"CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+	)
+
+	escons configure
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	escons install
+
+	if use python ; then
+		python_optimize
+		fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+		dobin utils/stats/mapdef_stats.py
+	fi
+
+	dodoc AUTHORS.md README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	elog ""
+	elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+	elog "or the installed examples for the default mapnik ogcserver config."
+	elog ""
+}
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
new file mode 100644
index 000000000000..129219105f78
--- /dev/null
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<longdescription>Mapnik is a toolkit for developing both web and desktop
+    mapping applications.  The core libraries are written in C++, with
+    optional Python bindings.
+</longdescription>
+<use>
+  <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+  <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+</use>
+</pkgmetadata>