Delete older ebuilds.

Package-Manager: portage-2.2.0_alpha2_p1/cvs/Linux x86_64

6 files changed, 7 insertions, 265 deletions

diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index 3c9a50674368..dbe4e1b7c1de 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/mapnik
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.18 2010/10/18 02:54:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.19 2010/10/29 23:01:54 arfrever Exp $
+
+  29 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -mapnik-0.5.1.ebuild, -files/mapnik-0.5.1-include-fix.patch,
+  -mapnik-0.6.0.ebuild, -files/mapnik-0.6.0-gentoo.patch:
+  Delete.
 
 *mapnik-0.7.1 (18 Oct 2010)
 
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 61fcb162adf1..811cfc79bf06 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -1,14 +1,8 @@
-AUX mapnik-0.5.1-include-fix.patch 328 RMD160 2396fdfe4dd7630e0a8866a3676c42e4c684e53c SHA1 c1fca803a293443241f200039a7355cbce78c3d1 SHA256 e76fcd9328c3207c56a083361d5bb4a4e356262989e85a7c280460dc8d30e05b
-AUX mapnik-0.6.0-gentoo.patch 3075 RMD160 4d3c38ecbed33880d0b90cdd15bcd3cec140abff SHA1 44f173dfdf37c530cf41e52a2afe23a3f9544a24 SHA256 759ec1e6a5fa59c9c80b549a6449c3e292220e41256a6a341acab48e14266026
 AUX mapnik-0.6.1-libagg.patch 2246 RMD160 05fd5ab80165030ea1c98ac3a0eefcd73867d3ce SHA1 57522f67f291c39cfe9048106f3a87b785f358a1 SHA256 5b80027a0973678b30dcd74c6133592a9914d6f98432991ed9bc49f4ebcc0108
 AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f8c SHA1 3adaf5c646ff2b72642bdc29d232489bfb573d17 SHA256 f7114127b1aae227d9ef854ec64c7ac5962a8428d687159604b7e6ff1146f4ff
-DIST mapnik-0.6.0.tar.bz2 7469100 RMD160 aa1cbe18a9d0ce96b5c826ea3c8546e1fdf0cc86 SHA1 4a092f27fe66b8a9f9800a3944a50c6f5b97473a SHA256 c5b04c75a21620882d50c8d7abe9ba86deea814b8a0ecc9efca69f15ad04f286
 DIST mapnik-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b1373 SHA1 6451ad79574dd7620da370343ca45cac2ef125e1 SHA256 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
 DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
-DIST mapnik_src-0.5.1.tar.gz 6517825 RMD160 6ac8830863883c654fd5b3676efc4a0642997157 SHA1 cad0d33ee16c0abf4903a6693e871c9ace19be94 SHA256 7682bba5f578dbb5dd5103d72876e0745e3f2da2eba8fd268cd81f400625812d
-EBUILD mapnik-0.5.1.ebuild 2685 RMD160 44bcd19bcca6b32d7444edc512d1be9a73e0c803 SHA1 2b84cfeb1a7517b8ced0fe618624ea798599969b SHA256 ea24b0f73386c522bdc25e436e0998bfe5612612cdc11286973e767168c7dd07
-EBUILD mapnik-0.6.0.ebuild 2531 RMD160 3b845577038f02eda4d1e553634b48c26af381a2 SHA1 42ef56f433d06b0116dbc8f0bfbe0643826995f5 SHA256 2d6f39a7f02c891392350892e6c1e44c873e6656a4b4365ff64513cae76c6267
 EBUILD mapnik-0.6.1-r3.ebuild 3993 RMD160 cbf9a93e1556bf77cee4a33cbda2868e9ad87019 SHA1 2f3b1c2c0524150c6f5a4bcb863a6f474ffa419f SHA256 29a87ca7aea8f8c89b44aea6650571b2e52efcfdc57664995d021c1c1caaeb8d
 EBUILD mapnik-0.7.1.ebuild 4039 RMD160 c33779650a187a57090d0b804d77451bab5c4004 SHA1 04fa9c114a86424bccfe0efeba9ccbadaa5005f2 SHA256 e2563285b3d0d09560a0283fcd3cc2ee90f04057fd4f64d606021713c84aa3f7
-MISC ChangeLog 4454 RMD160 ad3609929d0ad3c000b3e9ac9f37bd13db72585d SHA1 669769f6ad37da75013d1e951cc063cc3298a0f1 SHA256 e90cb88c563ea6f5b5fb63ffdfb4938a31f423398e06ec17e10e345505584ae4
+MISC ChangeLog 4660 RMD160 fc604999b43280772217d3d44e2e56523d998c2d SHA1 5f549a64a49586480e9ecc7d4c03d54f2f7bfce9 SHA256 a328ac7c62de26c1e28fee0a6e9789e49d0403cfde84b9c29dd5ed9ed845f581
 MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db
diff --git a/sci-geosciences/mapnik/files/mapnik-0.5.1-include-fix.patch b/sci-geosciences/mapnik/files/mapnik-0.5.1-include-fix.patch
deleted file mode 100644
index f2f5f3536ad5..000000000000
--- a/sci-geosciences/mapnik/files/mapnik-0.5.1-include-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/mapnik/plugin.hpp.orig	2008-09-21 16:43:15.368310392 -0700
-+++ include/mapnik/plugin.hpp	2008-09-21 16:45:29.859309106 -0700
-@@ -29,7 +29,9 @@
- // stl
- #include <string>
- 
--typedef struct lt_dlhandle_struct * lt_dlhandle;
-+// ltdl 
-+#include <ltdl.h>
-+
- namespace mapnik
- {
-    class PluginInfo : boost::noncopyable
diff --git a/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch b/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch
deleted file mode 100644
index 5976a5a4ed27..000000000000
--- a/sci-geosciences/mapnik/files/mapnik-0.6.0-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- SConstruct.old	2009-06-11 10:45:29.000000000 +0200
-+++ SConstruct	2009-06-11 10:47:03.000000000 +0200
-@@ -110,7 +110,7 @@
-     BoolVariable('FAST', "Make scons faster at the cost of less precise dependency tracking", 'False'),
-     
-     # 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', '/'),
-     
-@@ -132,8 +132,8 @@
-     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),
-     
-     # Variables affecting rendering back-ends
-     BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
-@@ -301,7 +301,7 @@
-     env = context.env
-     tool = config.lower()
-     context.Message( 'Checking for %s... ' % tool)
--    ret = context.TryAction(env[config])[0]
-+    ret = context.TryAction('%s --help' % env[config])[0]
-     if ret:
-         lib_path = call('%s --libdir' % env[config])
-         inc_path = call('%s --includedir' % env[config])
-@@ -686,7 +686,7 @@
-         if env['SKIPPED_DEPS']:
-             color_print(4,'\nAlso, these optional dependencies were not found:\n   - %s' % '\n   - '.join(env['SKIPPED_DEPS']))
-         color_print(4,"\nSet custom paths to these libraries and header files on the command-line or in a file called '%s'" % SCONS_LOCAL_CONFIG)
--        color_print(4,"    ie. $ python scons/scons.py BOOST_INCLUDES=/usr/local/include/boost-1_37 BOOST_LIBS=/usr/local/lib")
-+        color_print(4,"    ie. $ python scons/scons.py BOOST_INCLUDES=/usr/include/boost-1_37 BOOST_LIBS=/usr/lib")
-         color_print(4, "\nOnce all required dependencies are found a local '%s' will be saved and then install:" % SCONS_LOCAL_CONFIG)
-         color_print(4,"    $ sudo python scons/scons.py install")
-         color_print(4,"\nTo view available path variables:\n    $ python scons/scons.py --help or -h")
-@@ -883,6 +883,3 @@
- # Build the Python bindings
- if 'python' in env['BINDINGS']:
-     SConscript('bindings/python/SConscript')
--
--# Configure fonts and if requested install the bundled DejaVu fonts
--SConscript('fonts/SConscript')
-\ No newline at end of file
diff --git a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild b/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
deleted file mode 100644
index 2eca4458cc2d..000000000000
--- a/sci-geosciences/mapnik/mapnik-0.5.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.10 2010/06/17 21:01:40 patrick Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Free Toolkit for developing mapping applications."
-HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="mirror://berlios/mapnik/mapnik_src-${PV}.tar.gz"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bidi debug doc postgres python xml"
-
-RDEPEND=">=dev-libs/boost-1.33.0
-	>=media-libs/libpng-1.2.12
-	>=media-libs/jpeg-6b
-	>=media-libs/tiff-3.8.2
-	>=sys-libs/zlib-1.2.3
-	>=media-libs/freetype-2.1.10
-	media-fonts/dejavu
-	>=sci-libs/proj-4.4.9
-	sci-libs/gdal
-	xml? ( dev-libs/libxml2 )
-	postgres? (
-		>=dev-db/postgresql-base-8.0
-		>=dev-db/postgis-1.1.2
-	)
-	python? ( >=dev-lang/python-2.4 )
-	bidi? ( dev-libs/fribidi )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/python-1.5.2
-	>=dev-util/scons-0.9.8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-include-fix.patch
-
-	sed -i -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
-	    bindings/python/SConscript || die "sed 1 failed"
-	sed -i -e "s:/usr/local:/usr:g" SConstruct \
-	    || die "sed 2 failed"
-	sed -i -e "s:SConscript('fonts/SConscript')::g" SConstruct \
-	    || die "sed 3 failed"
-	rm -rf fonts
-	find . -type d -perm /g+s -exec chmod -s '{}' \;
-
-	sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
-	    plugins/input/{gdal,postgis,shape,raster}/SConscript \
-	    || die "sed 4 failed"
-}
-
-src_compile() {
-	MAKEOPTS="INPUT_PLUGINS=all"
-	MAKEOPTS="${MAKEOPTS} PROJ_INCLUDES=/usr/include"
-	MAKEOPTS="${MAKEOPTS} PROJ_LIBS=/usr/$(get_libdir)"
-	MAKEOPTS="${MAKEOPTS} XML2_CONFIG=/usr/bin/xml2-config \
-	    XMLPARSER=libxml2"
-
-	if ! use python ; then
-	    MAKEOPTS="${MAKEOPTS} BINDINGS=none"
-	fi
-	if use debug ; then
-	    MAKEOPTS="${MAKEOPTS} DEBUG=yes"
-	fi
-	if use bidi ; then
-	    MAKEOPTS="${MAKEOPTS} BIDI=yes"
-	fi
-	if use postgres ; then
-	    MAKEOPTS="${MAKEOPTS} \
-		PGSQL_INCLUDES=$(pg_config --includedir)
-	        PGSQL_LIBS=$(pg_config --libdir)"
-	fi
-
-	scons CXX="$(tc-getCXX)" ${MAKEOPTS} \
-	    || die "scons make failed"
-}
-
-src_install() {
-	scons DESTDIR="${D}" install \
-	    || die "scons install failed"
-
-	if use python ; then
-	    dobin utils/stats/mapdef_stats.py
-	    insinto /usr/share/doc/${P}/examples
-	    doins utils/ogcserver/{ogcserver,ogcserver.conf}
-	fi
-
-	if use doc ; then
-	    dohtml -r docs/epydocs/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "See the home page or the OpenStreetMap wiki for more info, and"
-	elog "the installed examples for the default mapnik ogcserver config."
-	elog ""
-}
diff --git a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild b/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
deleted file mode 100644
index dcfbbc8f07f5..000000000000
--- a/sci-geosciences/mapnik/mapnik-0.6.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.6 2010/06/17 21:01:40 patrick Exp $
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Free Toolkit for developing mapping applications."
-HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cairo curl debug +gdal postgres python sqlite"
-
-RDEPEND="dev-libs/boost
-	dev-libs/libxml2
-	dev-libs/icu
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	media-libs/freetype:2
-	sci-libs/proj
-	x11-libs/agg
-	media-fonts/dejavu
-	python? ( >=dev-libs/boost-1.35.0-r5[python] )
-	cairo? ( x11-libs/cairo
-		dev-cpp/cairomm )
-	postgres? (
-		>=dev-db/postgresql-base-8.0
-		>=dev-db/postgis-1.1.2
-	)
-	gdal? ( sci-libs/gdal )
-	sqlite? ( dev-db/sqlite:3 )
-	curl? ( net-misc/curl )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/scons-1.0.0"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	sed -i -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
-	    bindings/python/SConscript || die "sed 1 failed"
-
-	sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
-	    plugins/input/{gdal,postgis,shape,raster}/SConscript \
-	    || die "sed 2 failed"
-}
-
-src_configure() {
-	MAKEOPTS="INTERNAL_LIBAGG=no"
-
-	MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS="
-	use postgres && MAKEOPTS="${MAKEOPTS}postgis,"
-	use gdal     && MAKEOPTS="${MAKEOPTS}gdal,ogr,"
-	use sqlite   && MAKEOPTS="${MAKEOPTS}sqlite,"
-	use curl     && MAKEOPTS="${MAKEOPTS}osm,"
-	MAKEOPTS="${MAKEOPTS}shape,raster"
-
-	use cairo  || MAKEOPTS="${MAKEOPTS} CAIRO=false"
-	use python || MAKEOPTS="${MAKEOPTS} BINDINGS=none"
-	use debug  && MAKEOPTS="${MAKEOPTS} DEBUG=yes"
-
-	use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes"
-
-	scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \
-	    || die "scons configure failed"
-}
-
-src_compile() {
-	scons || die "scons make failed"
-}
-
-src_install() {
-	scons install || die "scons install failed"
-
-	if use python ; then
-		fperms o-w /usr/lib/python*/site-packages/mapnik/paths.py
-	    dobin utils/stats/mapdef_stats.py
-	    insinto /usr/share/doc/${P}/examples
-	    doins utils/ogcserver/*
-	fi
-
-	dodoc AUTHORS CHANGELOG README
-	dohtml -r docs/api_docs/python/*
-}
-
-pkg_postinst() {
-	elog ""
-	elog "See the home page or the OpenStreetMap wiki for more info, and"
-	elog "the installed examples for the default mapnik ogcserver config."
-	elog ""
-}