14 files changed, 19 insertions, 1914 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index f3613c9bc3a2..eb256f11bdb4 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.168 2015/07/08 08:28:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.169 2015/08/03 23:03:10 mrueg Exp $
+
+  03 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -gdal-1.10.0-r1.ebuild,
+  -gdal-1.10.1.ebuild, -gdal-1.11.1-r1.ebuild, -gdal-1.11.1-r2.ebuild,
+  -gdal-1.9.2.ebuild:
+  Remove old.
 
 *gdal-2.0.0 (08 Jul 2015)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a227f73fda8c..381a54409b3c 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,19 +5,11 @@ AUX gdal-1.5.0-install_name.patch 1731 SHA256 da631282e7ee42b3f9c46a4ce76d7b4905
 AUX gdal-1.5.0-soname.patch 483 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7 SHA512 c7c022524fd11de2137e15ec8dc31106887a2d23d583f61f1f9bab1d41a01e558faccc162166150c43903dbcaad14af65afd8ddc090670ebbd15dc57f05f228e WHIRLPOOL 7e2f17ea2c804fa7aded2fc8225091e84c44483c69cbb34818af3b38a7d580adf41daff250006778c6d3aea9175b2162e9add3956594b81eefd23689aed0de68
 AUX gdal-1.8.1-zlib_header_fix.patch 253 SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89 SHA512 ee9a5fbef309dabe5014ca0a9e1cd32864af8a8939dd445782afd00c6e6aaf83ec5dcff5e0fd66c10661eafa41f4c5c178a4adfebd09964358127620d89b5f3b WHIRLPOOL 2e2147eb440d6a752676ec5c19656c2939584889478af8976e17c7a1e7ddcd318e3f280cf982abde89b09cbe71ea8134c34b88c4788e94b3b25548928c9ecd78
 AUX gdal-1.9.1-ruby-makefile.patch 1384 SHA256 0588d23d027a716b6a75364abba7222bc15e7f9b4d3546c85c0aaf2d970a8c37 SHA512 ca163fd30b35d8d04584ae3627bd0733570c66ea1fc8e56161794f280877267ef33d3e52022eef547ae9b1f57d1b54f2ef03cee1bf412ebaa4c16caeab0d4479 WHIRLPOOL b94a07435afa3e51a8b8fd61b3320969e8ca167a3f4bdc6b7e2205ef83df63bbe6637ac926477a8a23da73cebadc06f5aaf9cbfbb24c169e1f88ef53ac3029d5
-DIST gdal-1.10.0.tar.gz 10232486 SHA256 1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487 SHA512 908639218e4a4fea1c239d5dbd6d22bff30b8b3644183295f19ba11ca11828db9736a63204a629cc8619b8a44f58e8fc2d9eea2125918cf7c214ace5c8de7fb6 WHIRLPOOL a5c91975614fbdf1b35d9587080beafd09badca97604d618209f6cb12b6d99416331d5bb982be3407e6db6ffa3ac22a129a8cb4d207ded7af34be5c279fd62ac
-DIST gdal-1.10.1.tar.gz 10241357 SHA256 9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea SHA512 214cdb2ad8d01b615b53a53584afcf38be7180174a358963b32af2027201b1e7030cb36be416b271675499e76e42baf8bc09e3646f3d12b0d778b4d1f1a11820 WHIRLPOOL 96a451442dfeec44f12e44a621908afa783c1b0379233b877495c0c2f0f02f2e81a7fedd72e7273e3a7de76415b5c54b80c48ed82723178805b839f36561ad8d
 DIST gdal-1.11.1.tar.gz 10731242 SHA256 f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512 17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3 WHIRLPOOL 1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
 DIST gdal-1.11.2.tar.gz 10746847 SHA256 66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512 f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da WHIRLPOOL 77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
-DIST gdal-1.9.2.tar.gz 9495381 SHA256 9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688 SHA512 d93cd5fb16a3728a1f545bc6ceeb61bf41e011619b9290ed51eb5fc2d99e3c0f5733bfc6b3444ad2991e462c87c1088247e3fbb92d880701d48790125647b423 WHIRLPOOL 87f31c12ac5c4e18b4a7b9c416144b32c6d862ddba7688d5317582c797f8a637e37192cbb74406b6a71a672a4c53d3c71505ba024405911008e7b863881c9b8c
 DIST gdal-2.0.0.tar.gz 11582325 SHA256 53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6 SHA512 74ae9d01a69652c92a16bc91f71b4c8416697d5f7aa137d385f58b7dc63c165c26330464c98891ac66b09475de24fbbff61f506ad1c9ecf64ffe08f1429fbad5 WHIRLPOOL 7d4a27e94e41ea53050ae3b8f1f06720e13626885455897caf6659a88c87bf61c087102963182b580e56a8840e3b57b6fbb8adadde64fd4679d5c37c3aa682c7
-EBUILD gdal-1.10.0-r1.ebuild 7467 SHA256 dd4b9569597b485b64dfd498454f600c3623003895c87c1ab6c9f9e940deb81d SHA512 faaed69e870c4b64fe5b0778e430c86bf74dfc202bbffb56b52bb27121dd8d8a7e7a2ac376db53d166c136a129a1c376fd3e604b1d558335b1cbbbd90f34eccd WHIRLPOOL 469bec9b5f566aeda04f9e2487abbfa3e4d71d3bfec7b06ec494026ec5c326bb190af5310452841a6be149d492c4abd4ab013644ac4a83200c19074894eceae1
-EBUILD gdal-1.10.1.ebuild 8593 SHA256 f5ffe4362ebd76a528f1e8054bc34e7218f513b81abfef36ae0025cd6414e55d SHA512 207906acf000cb735ca67ba7b8543b97863f895d2335efa6cc50d269d8613c583e979e814a5d869034bd5223dc8ea5044d1a52a491053853c2c16eda5b49985a WHIRLPOOL e7d385eb06d5c0706d1cdaf4e0e21bd5e440b1ca8bbe419788a36b9654ad70f51c8fe5e5228425bedfeb74b8a0854a898aa97016c3f9cb7f5a74341133dc2903
-EBUILD gdal-1.11.1-r1.ebuild 8766 SHA256 40347a4e0bf5ce9cc044d176c49358a57b6cbb7dc7ca0736d8742d1c40428919 SHA512 181bd5f50d327f9f863d3cab9351a5f6707fa7f938e2e7ef71a2cdf23be0f6ddaf9ce8eba70c23e6ef6bff45a5c2833716fe048b1748cccdb646b99dca3fc5b1 WHIRLPOOL b5b3017082723bee7ec890df1075a707ca318753822aabc5dcd6dcc7a290179778bd0fef5fa01a3a6f9811185e6a13cf3d1ebbede0ae5d7357727d35e39de74a
-EBUILD gdal-1.11.1-r2.ebuild 8844 SHA256 25bc7664bca05cc4c094be83f5d8a509218d6be0d1d22b5d6f3646dc31129755 SHA512 ca6a883b766ac2f5d8150af9dc41da04ff20928617dff17947ba49758ec855f09c30f73a6749b606460b01749ece7d8580fa05479d271af79274fbb53a79f84a WHIRLPOOL f718bbc17ed2dda4cd479faad4f4077b460785fe1943ff4a33cfb92e1ab7950d38c6bc20dc0d857930f16fd72ff7226cdff5cc8acc4aedc2804cc40a02a23866
 EBUILD gdal-1.11.1-r3.ebuild 8909 SHA256 ad13921c2c7c3c2d68682753c28c08669ce5e5519b21b9b0d4502273ec87f038 SHA512 cce6429290ace0e754f34d2d06dad2aa530ba2e7f42769b2e9bfcccfa449b6d78f12c74c779b7a8533e34f4cfacb54d13c355164b47965cb50e12d29ed6f9482 WHIRLPOOL 026da0fe151861f0f8970e21a4489dc3cf66b6397e352dc56ef94d80bdbfa4feaf9ab46ab3e6e284421d5a7db919c7ff90ffa46beed22383a462355608599275
 EBUILD gdal-1.11.2.ebuild 8817 SHA256 1add0df584b2ddbe53e8504f1d0beb066d6d6e2e9730972f2f649b4ec9aba429 SHA512 6394c5412efc79828b64e9ccb575817f8cf5d6eecf91ee51bd5d8321e37257deb1634bb765440eb535b7a05dff5c33fb821855e2f915db80b2475e97382ef1a4 WHIRLPOOL 5d76aa4d01bb2deb94d5c434cb590c8f2ae1b0250c7b98fd1f02d68b0c8e863dfe0e51cc771660ba95c7e384c5b53947c1f6bf043c7190e9464968e6a6e795c0
-EBUILD gdal-1.9.2.ebuild 7451 SHA256 70cb598d751ab607bcb624614b328edb0c50f76ecc8edd13dd237a43939bf32a SHA512 dc3e4d87a3e7a0245bb0b3eb2215268f837395817f7469fa81222b449abc47a71bed239a6a8f4ec49853422e23dc8ee3bd9ccdc36de39ed78ec329b7412eb884 WHIRLPOOL d1ae57dfc6170314fa1820b1256279c6e82606e453411d58a54b01b2b6ec3569ecbd3f2a3d91ce177e78f556b1783433f2099c0ca9de5de440259a959362b94b
 EBUILD gdal-2.0.0.ebuild 8737 SHA256 024cfea3814c3e3119c059fd1f6a13a392a491f40b75535cab961e4b6814f28e SHA512 490d3a1e4d8d817aa9850ef4cac0db12440ef5958d5ac1fd4036740718ce4d5c6aaf6a7636d9e040e43f262ce5e4f88b8df2f432f4547f3cec383901936d008e WHIRLPOOL c66e6d3569e6f10bd118bb51b3ba3a5908170eddc61ffb35a74107aa46cf1554a86088aa5989a9e839e9202cef080ad07506d32bb16cefb9e051a762bb3312ee
-MISC ChangeLog 30973 SHA256 6868b2b7be4b7ae86b0f144eb67848d5da471d6bcb81dc5f0621ab6526a4785e SHA512 b4db59614c6c4290b308b014a5888826bc38c219f300a207c266a4450401b41e69077b03c9be41555493dc2e5c53292c870f51a6172fc67862348078d51b38d8 WHIRLPOOL 0bdad78788e316d4d5f4bad60ffc902192b3f3769897cf1483699287ca75cd0f47d4cb83d4a2d4694c7477dca0898c746786c66ca55edb7b180120ab369843a7
+MISC ChangeLog 31151 SHA256 a364877ef5d4d1e3f9e5cb4cd3861a2366cd416fc50864934a5b49a048ca784c SHA512 1a15b4f89275123b9be164e1fdb84a811766944257abf9332d74c5c88a3c1d088ce140ffa316ec38993903fb67f4334f6f5b16ee3a16d4fa1dfcf8552e612eb8 WHIRLPOOL 9f909c983b9e24090d6dd8a67572e479046fd7b0b6ec75bd6bdb239d0eb06a9fe57d392412e63b66ded7da8a297bd4dd568642c2506a37cfc0ade8c146d2335a
 MISC metadata.xml 1358 SHA256 25a3063ee14c6c99706a045b00ca2c93ab49b2f595759be6d85c0eb5ee20bc53 SHA512 82f014319806fa20e404244780bedf0fdcb5bf8c070d3758095c23d62a1fbb0bb712222cbaaea1101940b06c8ea6b1a588dc3a9815f5f8e2d7342fa08243a9cc WHIRLPOOL 5e964a8c85ab7ce5820a35043d13e7c6535f5cd13d16c95d635fc7c735a9366994ce9b843f72db801777b689562e94183227c57504ddc33d0afc6e182e15ec96
diff --git a/sci-libs/gdal/gdal-1.10.0-r1.ebuild b/sci-libs/gdal/gdal-1.10.0-r1.ebuild
deleted file mode 100644
index 6dae9970d3b7..000000000000
--- a/sci-libs/gdal/gdal-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.0-r1.ebuild,v 1.8 2015/02/28 15:52:54 jlec Exp $
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-PYTHON_DEPEND="python? *"
-
-inherit autotools eutils libtool perl-module python toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	|| ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? ( dev-python/numpy )
-	ruby? ( dev-lang/ruby:1.9 )
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	use python && python_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with the src path
-	default
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.9.1-ruby-makefile.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	if use python; then
-		myopts+="
-			--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
-		"
-	fi
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-expat \
-		--without-grass \
-		--without-hdf4 \
-		--without-fme \
-		--without-pcraster \
-		--without-kakadu \
-		--without-mrsid \
-		--without-jp2mrsid \
-		--without-msg \
-		--without-bsb \
-		--without-dods-root \
-		--without-oci \
-		--without-ingres \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-idb \
-		--without-podofo \
-		--without-sde \
-		--without-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--with-grib \
-		--with-libtiff \
-		--with-geotiff \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with postgres pg) \
-		$(use_with fits cfitsio) \
-		$(use_with netcdf) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with jpeg pcidsk) \
-		$(use_with gif) \
-		$(use_with hdf5) \
-		$(use_with jpeg2k jasper) \
-		--without-ecw \
-		$(use_with gml xerces) \
-		$(use_with odbc) \
-		$(use_with opencl) \
-		$(use_with curl) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with spatialite) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with geos) \
-		$(use_with aux_xml pam) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with python) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	# updated for newer swig (must specify the path to input files)
-	if use python; then
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate
-		fi
-	done
-
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	default
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/*
-		docinto ogr
-		dohtml ogr/html/*
-	fi
-
-	if use python; then
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	pushd man/man1 > /dev/null
-	for i in * ; do
-		newman ${i} ${i}
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize osgeo
-	fi
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup osgeo
-	fi
-}
diff --git a/sci-libs/gdal/gdal-1.10.1.ebuild b/sci-libs/gdal/gdal-1.10.1.ebuild
deleted file mode 100644
index 1bad01d8635e..000000000000
--- a/sci-libs/gdal/gdal-1.10.1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.15 2015/04/08 18:32:59 mgorny Exp $
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libpcre
-	dev-libs/libxml2
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:* )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	ruby? ( dev-lang/ruby:1.9 )
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	tc-export AR RANLIB
-
-	eautoreconf
-
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}" || die
-		find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
-		find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
-#		mkdir -p "${BUILD_DIR}"/swig/python || die
-#		mkdir -p "${BUILD_DIR}"/apps || die
-#		cp -dpR --target="${BUILD_DIR}"/swig/ \
-#			"${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
-#		ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
-#		ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
-#		ln -s "${S}"/port "${BUILD_DIR}"/ || die
-	}
-	if use python; then
-		python_foreach_impl prepare_python
-	fi
-}
-
-gdal_src_configure() {
-	local myopts=""
-
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	if use sqlite; then
-		myopts+=" LIBS=-lsqlite3"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-libtiff \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--without-bsb \
-		--without-dods-root \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-libtool \
-		--without-mrsid \
-		--without-msg \
-		--without-oci \
-		--without-pcraster \
-		--without-podofo \
-		--without-sde \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		--without-ecw \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	if [[ -n $use_python ]]; then
-		# updated for newer swig (must specify the path to input files)
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-#			-e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
-	fi
-}
-
-src_configure() {
-	local use_python=""
-
-	gdal_src_configure
-
-	if use python; then
-		use_python="yes"
-		python_foreach_impl run_in_build_dir gdal_src_configure
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate
-		fi
-	done
-
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	use doc && emake docs
-
-	compile_python() {
-		rm -f swig/python/*_wrap.cpp
-		emake -C swig/python generate
-		emake -C swig/python build
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir compile_python
-	fi
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	default
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/*
-		docinto ogr
-		dohtml ogr/html/*
-	fi
-
-	install_python() {
-		emake -C swig/python DESTDIR="${D}" install
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir install_python
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	pushd man/man1 > /dev/null
-	for i in * ; do
-		newman ${i} ${i}
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-1.11.1-r1.ebuild b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
deleted file mode 100644
index bffde2629fe3..000000000000
--- a/sci-libs/gdal/gdal-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.10 2015/04/08 18:32:59 mgorny Exp $
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/json-c
-	dev-libs/libpcre
-	dev-libs/libxml2
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:* )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	ruby? ( dev-lang/ruby:1.9 )
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# Fix swig-3.0.3 problem (bug #534168)
-	epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
-
-	tc-export AR RANLIB
-
-	eautoreconf
-
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}" || die
-		find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
-		find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
-#		mkdir -p "${BUILD_DIR}"/swig/python || die
-#		mkdir -p "${BUILD_DIR}"/apps || die
-#		cp -dpR --target="${BUILD_DIR}"/swig/ \
-#			"${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
-#		ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
-#		ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
-#		ln -s "${S}"/port "${BUILD_DIR}"/ || die
-	}
-	if use python; then
-		python_foreach_impl prepare_python
-	fi
-}
-
-gdal_src_configure() {
-	local myopts=""
-
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	if use sqlite; then
-		myopts+=" LIBS=-lsqlite3"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-libtiff \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--without-bsb \
-		--without-dods-root \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-libtool \
-		--without-mrsid \
-		--without-msg \
-		--without-oci \
-		--without-pcraster \
-		--without-podofo \
-		--without-sde \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		--without-ecw \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	if [[ -n $use_python ]]; then
-		# updated for newer swig (must specify the path to input files)
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-#			-e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
-	fi
-}
-
-src_configure() {
-	local use_python=""
-
-	gdal_src_configure
-
-	if use python; then
-		use_python="yes"
-		python_foreach_impl run_in_build_dir gdal_src_configure
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate
-		fi
-	done
-
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	use doc && emake docs
-
-	compile_python() {
-		rm -f swig/python/*_wrap.cpp
-		emake -C swig/python generate
-		emake -C swig/python build
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir compile_python
-	fi
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	default
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/*
-		docinto ogr
-		dohtml ogr/html/*
-	fi
-
-	install_python() {
-		emake -C swig/python DESTDIR="${D}" install
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir install_python
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	pushd man/man1 > /dev/null
-	for i in * ; do
-		newman ${i} ${i}
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-1.11.1-r2.ebuild b/sci-libs/gdal/gdal-1.11.1-r2.ebuild
deleted file mode 100644
index 7f9effaf5566..000000000000
--- a/sci-libs/gdal/gdal-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r2.ebuild,v 1.3 2015/04/08 18:32:59 mgorny Exp $
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/json-c
-	dev-libs/libpcre
-	dev-libs/libxml2
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	ruby? ( dev-lang/ruby:1.9 )
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# Fix swig-3.0.3 problem (bug #534168)
-	epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
-
-	# bug 540132
-	epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
-
-	tc-export AR RANLIB
-
-	eautoreconf
-
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}" || die
-		find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
-		find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
-#		mkdir -p "${BUILD_DIR}"/swig/python || die
-#		mkdir -p "${BUILD_DIR}"/apps || die
-#		cp -dpR --target="${BUILD_DIR}"/swig/ \
-#			"${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
-#		ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
-#		ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
-#		ln -s "${S}"/port "${BUILD_DIR}"/ || die
-	}
-	if use python; then
-		python_foreach_impl prepare_python
-	fi
-}
-
-gdal_src_configure() {
-	local myopts=""
-
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	if use sqlite; then
-		myopts+=" LIBS=-lsqlite3"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-libtiff \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--without-bsb \
-		--without-dods-root \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-libtool \
-		--without-mrsid \
-		--without-msg \
-		--without-oci \
-		--without-pcraster \
-		--without-podofo \
-		--without-sde \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		--without-ecw \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with postgres pg) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	if [[ -n $use_python ]]; then
-		# updated for newer swig (must specify the path to input files)
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-#			-e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
-	fi
-}
-
-src_configure() {
-	local use_python=""
-
-	gdal_src_configure
-
-	if use python; then
-		use_python="yes"
-		python_foreach_impl run_in_build_dir gdal_src_configure
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate
-		fi
-	done
-
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	use doc && emake docs
-
-	compile_python() {
-		rm -f swig/python/*_wrap.cpp
-		emake -C swig/python generate
-		emake -C swig/python build
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir compile_python
-	fi
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	default
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/*
-		docinto ogr
-		dohtml ogr/html/*
-	fi
-
-	install_python() {
-		emake -C swig/python DESTDIR="${D}" install
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir install_python
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	pushd man/man1 > /dev/null
-	for i in * ; do
-		newman ${i} ${i}
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-1.9.2.ebuild b/sci-libs/gdal/gdal-1.9.2.ebuild
deleted file mode 100644
index fd96449d5442..000000000000
--- a/sci-libs/gdal/gdal-1.9.2.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.12 2015/02/28 15:52:54 jlec Exp $
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-PYTHON_DEPEND="python? *"
-
-inherit autotools eutils libtool perl-module python toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="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="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	|| ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? ( dev-python/numpy )
-	ruby? ( dev-lang/ruby:1.9 )
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with the src path
-	default
-}
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.9.1-ruby-makefile.patch
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Update for zlib header changes (see bug #383569)
-	epatch "${FILESDIR}"/${PN}-1.8.1-zlib_header_fix.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	fi
-
-	if use python; then
-		myopts+="
-			--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
-		"
-	fi
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-expat \
-		--without-grass \
-		--without-hdf4 \
-		--without-fme \
-		--without-pcraster \
-		--without-kakadu \
-		--without-mrsid \
-		--without-jp2mrsid \
-		--without-msg \
-		--without-bsb \
-		--without-dods-root \
-		--without-oci \
-		--without-ingres \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-idb \
-		--without-podofo \
-		--without-sde \
-		--without-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--with-grib \
-		--with-vfk \
-		--with-libtiff=external \
-		--with-geotiff=external \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with postgres pg) \
-		$(use_with fits cfitsio) \
-		$(use_with netcdf) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with jpeg pcidsk) \
-		$(use_with gif) \
-		$(use_with hdf5) \
-		$(use_with jpeg2k jasper) \
-		--without-ecw \
-		$(use_with gml xerces) \
-		$(use_with odbc) \
-		$(use_with opencl) \
-		$(use_with curl) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with spatialite) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with geos) \
-		$(use_with aux_xml pam) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with python) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-
-	# updated for newer swig (must specify the path to input files)
-	if use python; then
-		sed -i \
-			-e "s: gdal_array.i: ../include/gdal_array.i:" \
-			-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-			swig/python/GNUmakefile || die "sed python makefile failed"
-		sed -i \
-			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-			swig/python/setup.cfg || die "sed python setup.cfg failed"
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate
-		fi
-	done
-
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_install
-		popd > /dev/null
-		sed -i \
-			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-			GDALmake.opt || die
-	fi
-
-	default
-
-	if use ruby ; then
-		# weird reinstall collision; needs manual intervention...
-		pushd "${S}"/swig/ruby > /dev/null
-		rm -rf "${D}"${RUBY_MOD_DIR}/gdal
-		exeinto ${RUBY_MOD_DIR}/gdal
-		doexe *.so || die "doins ruby modules failed"
-		popd > /dev/null
-	fi
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/*
-		docinto ogr
-		dohtml ogr/html/*
-	fi
-
-	if use python; then
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize osgeo
-	fi
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup osgeo
-	fi
-}
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 899fa7e672e8..755970d36a0a 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gsl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.88 2015/04/29 06:35:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.89 2015/08/03 23:04:24 mrueg Exp $
+
+  03 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -gsl-1.14-r1.ebuild,
+  -gsl-1.15.ebuild:
+  Remove old.
 
   29 Apr 2015; Patrick Lauer <patrick@gentoo.org> gsl-1.14-r1.ebuild,
   gsl-1.14.ebuild, gsl-1.15.ebuild, gsl-1.16.ebuild:
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index cabbc881c67f..106e070d2923 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -6,11 +6,8 @@ AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7
 AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5
 AUX gsl-1.16-cblas.patch 17458 SHA256 568f6bf06b9441f741c028eaf7b12edb0e96093a16ea7a2d975e0cbde261c083 SHA512 70cae5682bfc7788e6f67ec355b52e291f32c2500b9baf9dd336d7cbb42b5eac4d89ecafeb23c4b478836d3c137d40d47dd17d375708df3c2dd41781a78f56bf WHIRLPOOL a7a5e6b52dc0466ad180853f5824d071d715743ef850ec808c7615fcc3b4f98d940c6f896faf44647c8e0915a6e5b6b7575ff9b66a59e337e04cd18d94cc7807
 DIST gsl-1.14.tar.gz 3128269 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
-DIST gsl-1.15.tar.gz 3281134 SHA256 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 SHA512 dcea557bcd34d4ee6d2c52741c2f95702e5e6110a99f033b412489b1930d21a40ead29392f754656375801d706df01199878263e856ca3081f9a514dc3299185 WHIRLPOOL 06ffffb83ea56cf6306878063770a117e096352dda3c3dd4a7526153bc770969f61e38fa08c02ec01335bd812581db15e4e5164a7da2363741179268cb393478
 DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301
-EBUILD gsl-1.14-r1.ebuild 3165 SHA256 3e2fbd07761e82d3cef8db146fee2228f245051712599136ece29457c33de829 SHA512 ebc5cbded59b78a27b07ea681c5876ebd2244b69e5a25a21f33593bde4287afbd007b1bee73cd1c880a13155a4f874a04b90f3ad30d8b99817e6989cba04c6f6 WHIRLPOOL 35d14b9b30289eef0e247a3d2be1ac80a46fd786b5f7eccd787e47c09976b4e90b1fc5f25d1dcd7af8eca71481883fe099382e689e5e99b7b7d82d2062b35a1d
 EBUILD gsl-1.14.ebuild 2910 SHA256 57c8109622a22e2495c04e9fbc9ade5b0372a10d367bc1df4705d5247a5338f6 SHA512 0bf4bd693b3ebdbfa2816e4fb02c2018835b949b1e259b8be9ec7de0b7ceb656b08ff3040d4859f4f2a6d7452f3cf9033bda7a868389f51208921dfae5cced7a WHIRLPOOL f8d3b5850bc8d6616319bc08bc64bb515d714ab93841db460fbe0d05d28d42a361e24b7e344f79d95075bcfeaa694be86d45e17b5cda4a425148928d05a39db3
-EBUILD gsl-1.15.ebuild 3189 SHA256 5e8ac40ba3b67564a52ce6dfe495fac127c02c5f0dc0083e902d27f6f90f7420 SHA512 dbf2486a43d7323466891e5b2a0775f669aab55e75dc4aa0a749719c6285587acc0465e596317a5dbc3503be44c9a1aa97f1ff9829406d62720e8c0a1129e9a6 WHIRLPOOL 755e0b963dc340f1d8df7b9256d7138f280f120fa98b8d01c36554eebc3ffacc46f470019db25ee0f7b1cdd5aafa82328db320b42248319a7f6db6ce571fad57
 EBUILD gsl-1.16.ebuild 3183 SHA256 33a16d179c5b4e660d681f7020eed9b63affceb4c1395a07c67df6b49fd801cf SHA512 d36a477ac13f51d5ed750e28247c09e33f029a7e2dff4a396f93201ed7027eb9abd06153b939e1c9cf575c0cf06395eb112c37a8fbf9f1878ea8a91eb238a2e0 WHIRLPOOL a530676d0196797acbb9eacf84236c628a0aaf8917611eba626fffc82fd6cb127d822126b1543a368f3d950ef0a17fef5d040bcaf088d8e2d08dc01f7d41342e
-MISC ChangeLog 13640 SHA256 f30f52537bd3e550cbf996806576539a0b5fed6c95f83424e5821a89efe95832 SHA512 c6c4cab4da31c733b7d9af111a24987c6e52724651c00e34ab0345f8b7ed08752970f8958836d4c5137f55c792269e93de1c72dd857ee4e15869e9e5931c0b32 WHIRLPOOL 8e4552b16444d4d5c861f395787d8e2032af85a7fe42972fdee9a5901b6d201a083dad431d7a0b97209095f9033d1da530e6164053ed814e30cca13364a7f210
+MISC ChangeLog 13742 SHA256 a458deacb59f40e9d52dc9ee082ccc820664f067a2c36e3f135e17128576a00b SHA512 b82cd0aaee623fbd9fc56e75ac6b62d0e43153cbbd01b325e884c4afece61f56a55989ca67e66c045515832dc61ecc032707586669680774de99405287d95265 WHIRLPOOL e381d5a7ce245eb5a5155bd70e9ed4271a1790c4d59ceb678cdc961ce67b674d3312f2f184411eaf6b80a906949bb116961e978f5c75e257fb3312ddeb4f2594
 MISC metadata.xml 1026 SHA256 6df14f9543ae80840437ac04fca5f5b4ca052a722c5146b015eeb26b1c11f1f4 SHA512 02751504e7a1563ca2008426536d03c8d5f00272519f73dccbe4df8f93fa26132fa57eee085cee9e1ce68e396893ef602283d8cd6722ba2f27bb322b8c201951 WHIRLPOOL fcbfd38fc5d1bafc3d3e08d0031b401fd5d67f1dcc1318c9ef57fa443d8998c6f9975d4f9a2b08e1d10e5e0e557511508193fd9742dc6e415067ccd723f740d8
diff --git a/sci-libs/gsl/gsl-1.14-r1.ebuild b/sci-libs/gsl/gsl-1.14-r1.ebuild
deleted file mode 100644
index 985e5e7d9a60..000000000000
--- a/sci-libs/gsl/gsl-1.14-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.10 2015/04/29 06:35:06 patrick Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-pkg_setup() {
-	ESELECT_PROF="gsl"
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib=$(eselect cblas show | cut -d' ' -f2)
-	if use cblas-external && [[ ${current_lib} == gsl ]]; then
-		ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-		ewarn "However the current selected external cblas is gsl."
-		ewarn "Please install and/or eselect another cblas"
-		die "Circular gsl dependency"
-	fi
-}
-
-src_prepare() {
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	epatch "${FILESDIR}"/${P}-cblas.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external cblas) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc || die "installing cblas.pc failed"
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die
-}
diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild
deleted file mode 100644
index 84081638cb38..000000000000
--- a/sci-libs/gsl/gsl-1.15.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.8 2015/04/29 06:35:06 patrick Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic autotools toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	epatch "${FILESDIR}"/${P}-cblas.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external cblas) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc || die "installing cblas.pc failed"
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die
-}
diff --git a/sci-libs/ufconfig/ChangeLog b/sci-libs/ufconfig/ChangeLog
index 0f69fcb189e4..38c080ec7c5a 100644
--- a/sci-libs/ufconfig/ChangeLog
+++ b/sci-libs/ufconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/ufconfig
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ChangeLog,v 1.36 2012/10/15 21:14:59 naota Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ChangeLog,v 1.37 2015/08/03 23:05:21 mrueg Exp $
+
+  03 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -ufconfig-3.1.0.ebuild:
+  Remove old.
 
   15 Oct 2012;  <naota@gentoo.org> ufconfig-3.7.1.ebuild:
   Add ~x86-fbsd.
diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index c748f9ed21da..f8c9a4e7d298 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -1,34 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST UFconfig-3.1.0.tar.gz 6573 SHA256 3190d44a76ff56ffd8575a6099c115cc12a9867f9fe8f5c297436a700d1fdd45
 DIST UFconfig-3.5.0.tar.gz 8001 SHA256 32614de9acc4aec534e41d61201d805e4c353cb23cce9c715f8cf2cb078378c1
 DIST UFconfig-3.6.0.tar.gz 8166 SHA256 6df4f0d4d525b31e1593bbce3423968a7575d0fe5711d37fda9559bd27f86b3e
 DIST UFconfig-3.6.1.tar.gz 8163 SHA256 7640438363114c250ed24bc5d7afa9810f4b082b3f1a02bb445d2e4cafc6b3bf
 DIST UFconfig-3.7.0.tar.gz 8557 SHA256 2f6b7bd0d01502586d11cc1f262ba41599b33eeb070dd637a53ec600a3e98215 SHA512 f5aa3723484e05a889434e12fc85521d378430b18d707d7d8807c755ea7046aa28854f8bcb459a42e8764a82f07597b73183a9c7ef070a4b376e76b475cb8d24 WHIRLPOOL 27f4a75705342b9cc5fe7f0444b8e6b0d55a3a30572b904887479d8e16d50100fbecdc0ef8c6dfd78776d4fa848dc0e592a9abbf448c357b96e290f296f6e512
 DIST UFconfig-3.7.1.tar.gz 8523 SHA256 0ea8bb484400dc16096cfd6c2bc2d735c5f9587f0fba889ed162e29ce6a73530 SHA512 a9d562205b6d047d8064d6f61e4f9fdb782774637f0522abef6031e8633c7372db108c69b48098e8b41ffdf786ce7bda0d8df9a3dee634dfb11b5e6073996a22 WHIRLPOOL c3fe66c4fe35866c6c7605c156b957f2ecb07d4d5ae3ba8685fa5c4dbd45e4fc71ed1c02b62bbbebdf95bf9be3a51cbcb416d6c2836c413493016b61d89da7f8
-EBUILD ufconfig-3.1.0.ebuild 700 SHA256 7b101388c57c06fec78c8619df004f3dee38a7a772ef070880fdf238edfeb2c7 SHA512 2ad3dc6780d267b83816b4828edc70dfdf1308a75fd963b233699583a2f745a65bec639c6919f65d367c406946ae7c5e1a9ea0088de5f43f5d6c86a85b47292b WHIRLPOOL 6342062c8d2e8920b28fe7ce0721cd990a26e7792afb5837b5fc7099d0ba0a74edb25895ba6d3eafe73c995b82efd58e5fe6e05e04518d8688d34f63c58c1682
 EBUILD ufconfig-3.5.0.ebuild 1503 SHA256 a28efc1273ad3cf5a19878164a720b79eb1b5e50f89dc5855b2cebba9b2e7bb5 SHA512 4c7d8668f9d151ef3be94ed98a851b5a55fe7eee68ff4fe885dd0e242d7d782786de9bf9b20fdfb0bd1c39a2587c64929a7e331fd4c0c10608ce4d668c396638 WHIRLPOOL 37b92cd966a0fcdb3e7ab935bd4f94fc8ae173cb945e51efcf14a10deb271ce2457d2c8c38e7b1f9baf0e06780c04c526bb0db4c7f686230c92f6174f3ac1bf9
 EBUILD ufconfig-3.6.0.ebuild 1514 SHA256 1150c3c7f56288d9c9f566b38b7f5b76b4b2d4b9323b9a1e66fe285b7032d592 SHA512 0c834d00d83b552faefd0b9f26689d09fbaee30c318a39ee15f44bb84e6bdd890b11352d3a6b8cd5c472473d0183b45273c9ace14f0e980a8febd62cdbba6c2a WHIRLPOOL 54ada56c0eca258be72a2947b63cc4d059d2745d35c2ed9860d9c9f3d482148663f48a833d7927b789af7a23749ccbb59d830a74f29198a3ba51a104bbbb03bf
 EBUILD ufconfig-3.6.1.ebuild 1483 SHA256 b3e24d99d4262b3b5c9e6c52c05df08776889d012df72e1e19ee462517ad24f4 SHA512 32fe66ba7e3902c4669c5b37ad79735740b1f73b92f3b800ad8bb2b95e15d994257e282a307aed7473fe6a3e54867c04e38677cf288daef5432fdbf999ea4475 WHIRLPOOL c5ab3a87fb1ff1685b028f204affdf565a00d14d6da9e4da4c8c2a24c0cdd89dcf8ba873c8e7aff2e225b251c117f8d8995efad6b7c7f5349e070b255670da84
 EBUILD ufconfig-3.7.0.ebuild 1718 SHA256 d22c14493c14513d5986f560b7368b717ac4beaa3a6cf47cc862179f3144df39 SHA512 bd098b64af160e0d3427bd90092946a78e1aed9fcbb84f1d7eb2b1a004cb74e5c732d3fb0954e1b419fc15747921a4aeb4d0a5df0696ae0f7242e2726da1f230 WHIRLPOOL 6ea38fbe9619af2bb12400ebb0bc64da04eddb925ee2f22920d7a93ce11bf0e26e5159fc92f974a39d6d70a1ffbdec8963a9acadb571a0080f3fe0aec6457bec
 EBUILD ufconfig-3.7.1.ebuild 1725 SHA256 9b2f1fff4ce1a19476ce5c268d32668b059df6dd87947cc60e4a886edfb93099 SHA512 dde41a39d0969562b794ec598a82a5031b50fec7926301400cea7ed4dd03e7391de84d23c278fec9a55b5d55a5366543d2cf820d90f87918428f0c76e8720e8c WHIRLPOOL d0f031b6ecc62b27d76fd68ce7b425bd0caae05fb7368f1dfcb5984050d8bd6bb649edf58e87c4d1c4397500cbbbe315fb4c77b1b9cabfd0205e3dd4c8943ac0
-MISC ChangeLog 4413 SHA256 44f4f824fd7df219dc9edafdd15e2a2fab22d0e8acd15de9cf9dae06a4d11024 SHA512 375e6571006ab9ab1d90c3217b120e5d5024b63d24eaa8a404549da989f09ac61bc7f4a5e12d99f689aa9ed5c3591c33b87e62f43cf7d4b2aa38ab93bfc54d35 WHIRLPOOL 25b49848c93f2fd9a78d1d032d18fac4343c2e902868623e0ff7dc314c78251b372b3d8b6a9ed479ab9387ccabe41d1216d46854578095d6dc99496eb944dc60
+MISC ChangeLog 4500 SHA256 f91bd0ce62ca90553fb19d571f36946e289f6f6466232d582cd6a9c53dda28c7 SHA512 7b5bd9cb39245389d216e19a28fd7601f37a2a8eab9c36771691a116bd9e9a106929ddea5da836a93d05de5d49a4c02d2d12c1bd2e63a647388c8c73eeed7f0b WHIRLPOOL 181a162e9d35e14228e27879f1afc6ba17c6b04d75713199594b5dfbf05cd19cfb3e7a17830ddbc181daf099e3dd6307f33b5c9a93a91e59c5a325dba1dc85ec
 MISC metadata.xml 359 SHA256 50b5569417c92af8ac72be09f541e2f3d1c1775e8cb3686cea7996a78e4b201d SHA512 7a12016c2fc5d7479394f43d8c280a5bdfb70e3dd30213632c6dc247fd6702b840ed4ca4d79cb0c94347054a02909e5818cbfeb43a957b3f640ab324b67947c4 WHIRLPOOL a7f06411df06152639539ea555d446555d5335ba77f8c89d57c90ef35a6e49cb07315477a3a700550aad2117063665f3dbf6aaadd58e8ae02af79729c3819288
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQfHzdAAoJEDYO1FT4VRUUyh0QAKKObuuN2B9awvdjfWWuXVY9
-5S05Gz+oPmuXNMKS/5C2lkSb3gK4mA9+TO9sFqD7MaO5bifCe0D6qKan3RS5DYw3
-4tC1fzAkgXkms6ojFeGA1hMNX7ff1cBlB4E5DEyyMRsQOLzo61TusWWywQic0CNm
-LmkrboCr9UTIxx3pJUJLKUjSz+aIzAZKjI6qQYsf4jGmgmZQaTDwzu5+ulrcr5+M
-mHDmNEIu44oRRpExwnEJl/T52JFHQz9f3VD6QMl2Kj03XPqKqj2bfkVXr+PDjjan
-wD9sWvRErfs1dq+ZPAJDga9zJ+HAh0M2MB+cvYQw6Jg7NBJpGP409IwZDXbOYfnp
-lU/7i0gJ9oRT+elTeH32kjJKioOIsg061qVHcr0al1ATREpWCnJlne8GxWarOvgG
-6aMzYdqgNLFfZjF1NrwmhKWEqsfTX1XjViCJJLGd8JIhAx+Zb9yjBxmYknxUgPI4
-akAvcNvGZAZsTFfuJSNs8AyFIazwKqvhLBDXQqSHODBh0g/OxFIUnHD0709FhBwv
-PJ/EeUPImLmO5pm7bwAc7vOmpp9mGoTAuztYm6LUAW/d9uFAHoQY3nsicz+i9E31
-iONVYbc2Sv8MNzIlHSyYIoZV7JZMJ2kvOD/LvyPWFUXp1V1SHEaafwfkumB6YLV8
-vh+GFN/KOsQOfNaemIhd
-=D+K0
------END PGP SIGNATURE-----
diff --git a/sci-libs/ufconfig/ufconfig-3.1.0.ebuild b/sci-libs/ufconfig/ufconfig-3.1.0.ebuild
deleted file mode 100644
index 3dc0755ffcaf..000000000000
--- a/sci-libs/ufconfig/ufconfig-3.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ufconfig/ufconfig-3.1.0.ebuild,v 1.13 2010/07/09 10:04:36 ssuominen Exp $
-
-MY_PN=UFconfig
-
-DESCRIPTION="Common configuration scripts for the SuiteSparse libraries"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/UFconfig"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-
-src_install() {
-	insinto /usr/include
-	doins UFconfig.h || die "failed to install include file"
-	dodoc README.txt || die
-}