15 files changed, 116 insertions, 409 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7dc377c79..0e36f85ad 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,9 @@
 DIST qgis_1.0.2.tar.gz 21357399 RMD160 170e4eb82c9c1c817fe984653d4f73b13f3b94d4 SHA1 44fc9c2717646b89d5f369908cad9d102119618d SHA256 436b77ce02c2945bc72f30b6556e1d9a57640d593eef7445c019d5a740c8de80
 DIST qgis_1.1.0.tar.gz 18146094 RMD160 4550bc3ff9223e75b9abc193ba721653e3651d4f SHA1 2898ce831c193497441e78af0d55daf80b96ce7d SHA256 06b4d5b8f47fae6fe5fd4f61b29eb2ac9a25740ea95f111ed2105416079f5f9a
+DIST qgis_1.2.0.tar.gz 22866156 RMD160 90c7a9ab776ac468756edaa6d836983e8d55030e SHA1 44118192d896ec269a0e030a0c1072a9b08f2865 SHA256 b25e3e8b638022eafe1489a1d18f20a18c382c888ad8e61f9d282cff55dae2fc
 DIST qgis_sample_data.tar.gz 18939952 RMD160 4958e3855ded7666f005546f6ef2a7c00eebde43 SHA1 3e0e8a299f06b8c3d10995596545de8a435aa49c SHA256 0df522de35ee7fc39fc41bae48ca3b565c7056f67051a0a67a7d6649ded25637
-EBUILD qgis-1.0.2.ebuild 2156 RMD160 257272feae512bb4c8a523c19119e927125b6202 SHA1 b67c215fd2a6fc8290380022da7a9c884d99b5ef SHA256 0d92646cde4fc558b06c686e3ed19ac441a595b3eaee25194c2bf4a20cf8c220
-EBUILD qgis-1.1.0.ebuild 2225 RMD160 f59303e772bdfbe0afe4d79e48ec22e0ad17b432 SHA1 e4cb1a1d5a8c54ec7c54032b7b46d2e58ce2f00e SHA256 bd084fd055ade367bcf87f9237a08646fa1c8af178144db4d4708262e3eaae97
-EBUILD qgis-9999.ebuild 2228 RMD160 e816837c117485762e7f1825e2cdc96f6297f7cf SHA1 8d252777eb3c35f0add8e9dbbadd60e48433a2ad SHA256 1d1753c5bba8c13156b0647215d749ecdd89fc91c2628f04b287d646f91e6ae1
+EBUILD qgis-1.0.2.ebuild 2085 RMD160 7a1f75c128c7b4b444359e428626ceb2f5ec4727 SHA1 574edf38d26912f86c4d8001c88635f7c2815067 SHA256 86b27e1478655c5c189ceb9188c8a9cb362ff348ff540c6a80797f4ed792603f
+EBUILD qgis-1.1.0.ebuild 2166 RMD160 ebbde061679f1991b373f4715048567d0d8658d5 SHA1 49c69e4833ddc8846e0094d6776ab6fd37396cbc SHA256 85d020c6512e6cd330a08d80ad578f4836feef3072c483f0aebc75a57e5f16b1
+EBUILD qgis-1.2.0.ebuild 2154 RMD160 6120c19be9db28c279cacce52caf4b8599c3647f SHA1 fee8b9ec35e0bd126d97c78618f1d2453831e058 SHA256 afedc58433b2517dd7b98692d471e2ff2d34bac692699cc1e1236bf4d6554f46
+EBUILD qgis-9999.ebuild 2156 RMD160 1614f0542bba53b6c37b306cba94f9c0472141cf SHA1 f87ad42f43b83d45f0adcc4697e23b9ec287270b SHA256 723344045958a77ef4715d1886a0dd1d1fd546cdf77c8f241fc3e4dbe23f137b
+MISC metadata.xml 385 RMD160 925e6a795e74ddfacbe5279e26a1b8f78cdeb290 SHA1 171000e01c5ab11d53a1ffced57d5b67d0cfb519 SHA256 9db9df5ca5d0df13c2b67c2af1c5a71d58eb363a7248db264238f0b742d64c13
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
new file mode 100644
index 000000000..6554a4ae1
--- /dev/null
+++ b/sci-geosciences/qgis/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-geosciences</herd>
+	<maintainer>
+		<email>premek@vohnout.cz</email>
+		<name>Premysl Vohnout</name>
+	</maintainer>
+	<use>
+		<flag name="grass">Compile support for grass</flag>
+		<flag name="samples">Install example data</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/sci-geosciences/qgis/qgis-1.0.2.ebuild b/sci-geosciences/qgis/qgis-1.0.2.ebuild
index c6c25201e..07cbb6d73 100644
--- a/sci-geosciences/qgis/qgis-1.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-1.0.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug gps grass gsl postgres python samples"
 
-DEPEND=">=sci-libs/gdal-1.6.1
+RDEPEND=">=sci-libs/gdal-1.6.1
 		x11-libs/qt-core:4[qt3support]
 		x11-libs/qt-gui:4
 		x11-libs/qt-svg:4
@@ -24,23 +24,19 @@ DEPEND=">=sci-libs/gdal-1.6.1
 		dev-db/sqlite:3
 		sci-libs/geos
 		sci-libs/proj
-		postgres? ( >=virtual/postgresql-base-8
-				dev-db/postgis )
+		postgres? ( >=virtual/postgresql-base-8 )
 		grass? ( >=sci-geosciences/grass-6.0.1
 			   sci-libs/gdal-grass )
 		gps? ( dev-libs/expat
 			sci-geosciences/gpsbabel )
-		gsl? ( sci-libs/gsl )"
-
-RDEPEND="${DEPEND}
-		dev-util/cmake
-		sys-devel/bison
-		sys-devel/flex
+		gsl? ( sci-libs/gsl )
 		python? ( dev-lang/python
 			dev-python/PyQt4
 			dev-python/sip )
 		gps? ( sci-geosciences/gpsbabel )"
 
+DEPEND="${RDEPEND}"
+
 src_configure() {
 	local mycmakeargs
 	mycmakeargs="${mycmakeargs} -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -82,4 +78,3 @@ pkg_postinst() {
 		einfo "/usr/share/doc/${PF}/sample_data/"
 	fi
 }
-
diff --git a/sci-geosciences/qgis/qgis-1.1.0.ebuild b/sci-geosciences/qgis/qgis-1.1.0.ebuild
index cff6648fd..786c593b1 100644
--- a/sci-geosciences/qgis/qgis-1.1.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.1.0.ebuild
@@ -16,9 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug gps grass gsl postgres python sqlite samples"
 
-DEPEND="dev-util/cmake
-		sys-devel/bison
-		sys-devel/flex
+RDEPEND="${DEPEND}
 		>=sci-libs/gdal-1.6.1
 		x11-libs/qt-core:4[qt3support]
 		x11-libs/qt-gui:4
@@ -27,20 +25,19 @@ DEPEND="dev-util/cmake
 		>=sci-libs/geos-3.0.0
 		sci-libs/proj
 		sqlite? ( dev-db/sqlite:3 )
-		postgres? ( virtual/postgresql-base
-				dev-db/postgis )
+		postgres? ( virtual/postgresql-base	)
 		grass? ( >=sci-geosciences/grass-6.0.1
 			   sci-libs/gdal-grass )
 		gps? ( dev-libs/expat
 			sci-geosciences/gpsbabel )
-		gsl? ( sci-libs/gsl )"
-
-RDEPEND="${DEPEND}
+		gsl? ( sci-libs/gsl )
 		python? ( dev-lang/python
 			dev-python/PyQt4
 			dev-python/sip )
 		gps? ( sci-geosciences/gpsbabel )"
 
+DEPEND="${RDEPEND}"
+
 src_configure() {
 	local mycmakeargs
 	mycmakeargs="${mycmakeargs} -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -83,4 +80,3 @@ pkg_postinst() {
 		einfo "/usr/share/doc/${PF}/sample_data/"
 	fi
 }
-
diff --git a/sci-geosciences/qgis/qgis-1.2.0.ebuild b/sci-geosciences/qgis/qgis-1.2.0.ebuild
new file mode 100644
index 000000000..80031790c
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-1.2.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit cmake-utils eutils qt4
+
+DESCRIPTION="Quantum GIS (QGIS) is a Geographic Information System (GIS)"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="http://download.osgeo.org/qgis/src/${PN}_${PV}.tar.gz
+	samples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gps grass gsl postgres python sqlite samples"
+
+RDEPEND=">=sci-libs/gdal-1.6.1
+		x11-libs/qt-core:4[qt3support]
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-sql:4
+		>=sci-libs/geos-3.0.0
+		sci-libs/proj
+		sqlite? ( dev-db/sqlite:3 )
+		postgres? ( virtual/postgresql-base	)
+		grass? ( >=sci-geosciences/grass-6.0.1
+			   sci-libs/gdal-grass )
+		gps? ( dev-libs/expat
+			sci-geosciences/gpsbabel )
+		gsl? ( sci-libs/gsl )
+		python? ( dev-lang/python
+			dev-python/PyQt4
+			dev-python/sip )
+		gps? ( sci-geosciences/gpsbabel )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs
+	mycmakeargs="${mycmakeargs} -DBUILD_SHARED_LIBS:BOOL=ON \
+		$(cmake-utils_use_with postgres POSTGRESQL) \
+		$(cmake-utils_use_with grass GRASS) \
+		$(cmake-utils_use_with gps EXPAT) \
+		$(cmake-utils_use_with gsl GSL) \
+		$(cmake-utils_use_with python BINDINGS) \
+		$(cmake-utils_use_with sqlite SPATIALITE)"
+
+	if use grass; then
+		GRASS_ENVD="/etc/env.d/99grass /etc/env.d/99grass-6 /etc/env.d/99grass-cvs";
+		for file in ${GRASS_ENVD}; do
+			if test -r ${file}; then
+				GRASSPATH=$(sed -n 's/LDPATH="\(.*\)\/lib"$/\1/p' ${file});
+			fi
+		done
+		mycmakeargs="${mycmakeargs} -DGRASS_PREFIX=${GRASSPATH}"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon images/icons/qgis-icon.png qgis.png
+	make_desktop_entry qgis Qgis qgis.png 'Science;Geoscience'
+
+	if use samples; then
+		cd "${WORKDIR}"
+		insinto /usr/share/doc/${PF}/sample_data
+		doins qgis_sample_data/* || die "Unable to install sample data"
+	fi
+}
+
+pkg_postinst() {
+	if use samples; then
+		einfo "You can find sample data to use with qgis in"
+		einfo "/usr/share/doc/${PF}/sample_data/"
+	fi
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 7524ff97d..a66e24942 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -12,16 +12,12 @@ SRC_URI="samples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz
 
 ESVN_REPO_URI="http://svn.osgeo.org/qgis/trunk/qgis"
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug gps grass gsl postgres python sqlite samples"
 
-DEPEND="dev-util/cmake
-		sys-devel/bison
-		sys-devel/flex
-		>=sci-libs/gdal-1.6.1
+RDEPEND=">=sci-libs/gdal-1.6.1
 		x11-libs/qt-core:4[qt3support]
 		x11-libs/qt-gui:4
 		x11-libs/qt-svg:4
@@ -29,20 +25,19 @@ DEPEND="dev-util/cmake
 		>=sci-libs/geos-3.0.0
 		sci-libs/proj
 		sqlite? ( dev-db/sqlite:3 )
-		postgres? ( virtual/postgresql-base
-				dev-db/postgis )
+		postgres? ( virtual/postgresql-base )
 		grass? ( >=sci-geosciences/grass-6.0.1
 			   sci-libs/gdal-grass )
 		gps? ( dev-libs/expat
 			sci-geosciences/gpsbabel )
-		gsl? ( sci-libs/gsl )"
-
-RDEPEND="${DEPEND}
+		gsl? ( sci-libs/gsl )
 		python? ( dev-lang/python[sqlite]
 			dev-python/PyQt4
 			dev-python/sip )
 		gps? ( sci-geosciences/gpsbabel )"
 
+DEPEND="${RDEPEND}"
+
 src_configure() {
 	local mycmakeargs
 	mycmakeargs="${mycmakeargs} -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -85,4 +80,3 @@ pkg_postinst() {
 		einfo "/usr/share/doc/${PF}/sample_data/"
 	fi
 }
-
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
deleted file mode 100644
index 345c6fd1e..000000000
--- a/sci-libs/gdal/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
-AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
-AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
-AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
-AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e9848cafea7 SHA1 62b30b6a4e55dd46f1e985d445b6ace58d698f4f SHA256 419c2c4713ae72a617cbdb5433a69a7217bc99743e34e94430bbca8119b5c1cf
-AUX gdal-1.6.1-ruby-make.patch 1071 RMD160 ec020c5c22a397e248363232197358ea0e9eb6de SHA1 d7b5a568da01dd83f46fee897f8622db3b6b6db2 SHA256 4a027ce95da9ab870676e097239b83d40e87b199852590854bbe349b18c7ac4e
-AUX gdal-1.6.1-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
-DIST gdal-1.6.1.tar.gz 6999411 RMD160 64955b4940675475bfaf0cc8fd5f0b264b56b0bb SHA1 b2091a3830d8230a97aa0ced429935e7caef00ee SHA256 e9876a5a6e80d0b078b10aeb29e7dc01df8be38f13d836257190c9ca48a998ad
-EBUILD gdal-1.6.1.ebuild 6006 RMD160 faa8adb5847e2ee715ab46b5dd54929259cb25d7 SHA1 300c3c6703e65b78fff428f4f0ab80868bb514f8 SHA256 d0922047402999bf7868ef5679d34afa8ac1cf4b9cf6bb77c6151327aa3ffc51
diff --git a/sci-libs/gdal/files/gdal-1.4.2-datadir.patch b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
deleted file mode 100644
index 95cd05825..000000000
--- a/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
-+++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
-@@ -54,7 +54,7 @@
- exec_prefix	=	@exec_prefix@
- INST_PREFIX	=	@exec_prefix@
- INST_INCLUDE	=	@includedir@
--INST_DATA 	=	@datadir@
-+INST_DATA 	=	@datadir@/gdal
- INST_LIB	=	@libdir@
- INST_BIN	=	@bindir@
- INST_PYMOD      =       @pymoddir@
diff --git a/sci-libs/gdal/files/gdal-1.5.0-makefile.patch b/sci-libs/gdal/files/gdal-1.5.0-makefile.patch
deleted file mode 100644
index a24aa5015..000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- GNUmakefile.orig	2008-02-02 18:19:45.000000000 -0800
-+++ GNUmakefile	2008-02-02 18:48:56.000000000 -0800
-@@ -226,12 +226,12 @@
- else
- 	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
- 	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER)
-+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER)
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER) $(GDAL_SLIB_B))
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_SLIB_SO_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
- endif
- 
- else
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
deleted file mode 100644
index f78453631..000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
-+++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
diff --git a/sci-libs/gdal/files/gdal-1.5.1-python-install.patch b/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
deleted file mode 100644
index fd1b7e488..000000000
--- a/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- swig/python/GNUmakefile.orig	2008-02-02 17:00:52.000000000 -0800
-+++ swig/python/GNUmakefile	2008-02-02 17:02:03.000000000 -0800
-@@ -51,9 +51,9 @@
- install:
- 
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
- 
- 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch b/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
deleted file mode 100644
index be0a2b47e..000000000
--- a/sci-libs/gdal/files/gdal-1.5.2-xerces-64-bit.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp
-===================================================================
---- ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(r�vision 15504)
-+++ ogr/ogrsf_frmts/ili/iom/iom_utilities.cpp	(copie de travail)
-@@ -168,33 +168,33 @@
- */
- char *iom_toUTF8(const XMLCh *src)
- {
--	unsigned int srcLen=XMLString::stringLen(src);
--	int destLen=srcLen+10;
--	char *dest;
--	dest=dbgnew char[destLen+1];
--	unsigned int eaten;
--	unsigned int endDest;
--	endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
-+	XMLSize_t srcLen=XMLString::stringLen(src);
-+	XMLSize_t destLen=srcLen+10;
-+	XMLByte *dest;
-+	dest=dbgnew XMLByte[destLen+1];
-+	XMLSize_t eaten;
-+	XMLSize_t endDest;
-+	endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
- 	while(eaten<srcLen){
- 		delete[] dest;
- 		destLen=destLen+srcLen-eaten+10;
--		dest=dbgnew char[destLen+1];
--		endDest=utf8_transcoder->transcodeTo(src,srcLen,(unsigned char *)dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
-+		dest=dbgnew XMLByte[destLen+1];
-+		endDest=utf8_transcoder->transcodeTo(src,srcLen,dest,destLen,eaten,XMLTranscoder::UnRep_RepChar);
- 	}
- 	dest[endDest]=0;
--	return dest;
-+	return (char*)dest; /* should be a unsigned char* == XMLByte* instead */
- }
- 
- /** transcode an utf8 encoded string to a xerces unicode one.
- */
- XMLCh *iom_fromUTF8(const char *src)
- {
--	int srcLen=XMLString::stringLen(src);
--	int destLen=srcLen;
-+	XMLSize_t srcLen=XMLString::stringLen(src);
-+	XMLSize_t destLen=srcLen;
- 	XMLCh *dest=dbgnew XMLCh[destLen+1];
- 	unsigned char *charSizes=dbgnew unsigned char[destLen];
--	unsigned int eaten;
--	unsigned int endDest=utf8_transcoder->transcodeFrom((unsigned char *)src,srcLen,dest,destLen,eaten,charSizes);
-+	XMLSize_t eaten;
-+	XMLSize_t endDest=utf8_transcoder->transcodeFrom((const XMLByte *)src,srcLen,dest,destLen,eaten,charSizes);
- 	dest[endDest]=0;
- 	delete[] charSizes;
- 	return dest;
diff --git a/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
deleted file mode 100644
index f71db69b7..000000000
--- a/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- swig/ruby/RubyMakefile.mk.orig	2009-04-20 18:43:31.107342741 -0700
-+++ swig/ruby/RubyMakefile.mk	2009-04-20 18:45:51.396591741 -0700
-@@ -25,7 +25,9 @@
- INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
- 
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
--LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
- RUBY_LIB := -l$(RUBY_SO_NAME)
- 
- build: $(RUBY_MODULES)
-@@ -41,17 +43,17 @@
- $(INSTALL_DIR):
- 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
- 
--install: $(INSTALL_DIR)
-+install: $(INSTALL_DIR) $(RUBY_MODULES)
- 	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
- 
- $(RUBY_MODULES): %.so: %_wrap.o
- 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
- 
- %.o: %.cpp
--	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
-+	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
- 
- %.o: %.cxx
--	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<
diff --git a/sci-libs/gdal/files/gdal-1.6.1-swig-fix.patch b/sci-libs/gdal/files/gdal-1.6.1-swig-fix.patch
deleted file mode 100644
index 38c94da52..000000000
--- a/sci-libs/gdal/files/gdal-1.6.1-swig-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- swig/include/gdal.i.orig	2009-04-24 21:55:06.315863023 -0700
-+++ swig/include/gdal.i	2009-04-24 22:10:28.806611326 -0700
-@@ -176,6 +176,17 @@
- %include "gdal_typemaps.i"
- #endif
- 
-+/* Default memberin typemaps required to support SWIG 1.3.39 and above */
-+%typemap(memberin) char *Info %{
-+/* char* Info memberin typemap */
-+$1;
-+%}
-+
-+%typemap(memberin) char *Id %{
-+/* char* Info memberin typemap */
-+$1;
-+%}
-+
- //************************************************************************
- //
- // Define the exposed CPL functions.
diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
deleted file mode 100644
index 42c52a54a..000000000
--- a/sci-libs/gdal/gdal-1.6.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.1 2009/04/25 06:08:09 nerdboy Exp $
-
-WANT_AUTOCONF="2.5"
-inherit autotools distutils eutils perl-module toolchain-funcs
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~ppc ~x86"
-
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7.0
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/postgresql-server )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( !media-libs/lcms
-		    sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${P}-ruby-make.patch \
-	    "${FILESDIR}"/${P}-swig-fix.patch \
-	    || die "sed failed"
-
-	if useq hdf; then
-	    einfo	"Checking if HDF4 is compiled with szip..."
-	    if built_with_use sci-libs/hdf szip ; then
-		einfo	"Found HDF4 compiled with szip. Nice."
-	    else
-		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-
-	    if useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	    fi
-	fi
-}
-
-src_compile() {
-
-	distutils_python_version
-
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --with-grass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
-	    $(use_with sqlite sqlite3) $(use_with jpeg2k jasper) $(use_with odbc) \
-	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
-	    $(use_enable debug)"
-
-	# It can't find this
-	if useq ogdi ; then
-	    use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
-	fi
-
-	if useq mysql ; then
-	    use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}"
-	fi
-
-	if useq gif ; then
-	    use_conf="--with-gif=internal ${use_conf}"
-	else
-	    use_conf="--with-gif=no ${use_conf}"
-	fi
-
-	if useq python ; then
-	    use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
-		${use_conf}"
-	fi
-
-	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
-	    GDALmake.opt.in || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	make DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if useq doc ; then
-	    dohtml html/* || die "install html failed"
-	    docinto ogr
-	    dohtml ogr/html/* || die "install ogr html failed"
-	fi
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you should install gdal-grass."
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}