Drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

16 files changed, 25 insertions, 434 deletions

diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index a637e9da6f8d..c7c79a96da92 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/libdbi-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.68 2014/11/03 11:22:20 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.69 2014/11/23 15:02:21 pacho Exp $
+
+  23 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libdbi-drivers-0.8.3-doc-build-fix.patch,
+  -files/libdbi-drivers-0.8.3-firebird-fix.patch,
+  -files/libdbi-drivers-0.8.3-fix-ac-macro.patch,
+  -files/libdbi-drivers-0.8.3-oracle-build-fix.patch,
+  -libdbi-drivers-0.8.3-r2.ebuild, -libdbi-drivers-0.8.3.ebuild:
+  Drop old
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
   libdbi-drivers-0.8.3.ebuild, libdbi-drivers-0.8.3-r2.ebuild,
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index b2b11ed85c36..f9c552d0392b 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libdbi-drivers-0.8.3-doc-build-fix.patch 566 SHA256 ef18cdb0e5338d29bcdbbf9839bd64283d067bfe3eed3d4af3eb58fa29a316ec SHA512 060a254af1664de2e2c3eca18336c4f1460372a734dfe4ceeb9eeceb1d0686fe93b7f8336d37a8220d6903b16df4837d511d60b4c8b1093eb85fd81b57bb4a31 WHIRLPOOL a9fc78ec7a6dace052bc0160f9d4afa090fbab82b7297cbded4374850a4b5436c493be86de9a7a210e1bf83916d5700303632271cab204d09cdf8a29c0125221
-AUX libdbi-drivers-0.8.3-firebird-fix.patch 1374 SHA256 8e94e8dcc9445c887c7f3defdc3ed049d683f539c01d5a5007b158c3c8e0f97c SHA512 4595beee6ce1d58c92567e88cc2d92c4fbdf3a717879b7c4d6e2bc8fb3676d9721ae41d15a5a4222df1b2e8cbb9b1d76cd510adb9c5bf7e2a08c4e2dc06afaac WHIRLPOOL bed1b2dc561ac191c49400398c40cce789e24c7cd44586b8e0d7a88d87c24e217e232ad622f91411d5912686c81500fe662ad6ab4c7c70d84fde1518c8d8c06f
-AUX libdbi-drivers-0.8.3-fix-ac-macro.patch 452 SHA256 a6dc9b658d52d664d9acda7a52ee3609c9c70b8767db6fbf744cb18d0cea59a4 SHA512 31734eb7799dbeea8ffe340c6fc33be2bd3e2f84dce5c31cecd9d838ab6ab18427c1f9f79905bd2e1852b7638201cd0b52652ea6f125167ee470e6afa9470a01 WHIRLPOOL bf54107174cd73eb98662c06ad0c1f5f91de4e7f8936f4c6c401e44760aa70d3a51cbcd892c78fb43f156472e43a66bddf4dddcb10a47a30303527cc064d7c7e
-AUX libdbi-drivers-0.8.3-oracle-build-fix.patch 485 SHA256 67d088a16f91f77a377eeae1fe8d1fa30540fcf5beb0566d1146fe56cbbd3dec SHA512 028ca89ef13c1c83dc7afcad752cd56407a97cb641d2b2d29c27ff19b9c0399ecd8f7ef2d79bfd0538012636ca1412c3d494e2d9bbf92be2200f6c740062224f WHIRLPOOL 89fbc30e204502714e6d56389ceeaa866950c8d14c9a8c8884a19779420a85c4f24de8a3d4fec69196fecd6a11033adae842a0fcee244d8f3e49871ab151621b
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 SHA256 e1750eaeff253efee00c13765184028f10129f2367522861c7b526f0cf825d39 SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e WHIRLPOOL 9dbc00f61263332c26196190928573e6d44c650fd0b538d8d256782a83c98174cb7bfe0d23292527d8fd5a456a30a5eb10113fba78226eb0a31a51a6ce46d038
-DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 SHA512 c2cb76234b9137cc4a05af42a69ea7d5b08586287378406cbd4d114598598057f29cccb368bfbe0f86e19846ceab88ed636cccff6555ef9f7eebbb98bbcd3824 WHIRLPOOL fc8df681ccdf6995727b0bf7aa315090dc4af2849c02e6b78913f6d5ecdc51c5e60b7eba3f515050a4ae93e74dfa7f1dcc1f7aca7fe3c12e3f02ecfd04184700
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 SHA256 43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1 WHIRLPOOL 6ed745a19afe4b6b5d51f7730ca9698e645fac529051aeaae886938e063f8fcd3357c2f24913a5428db4847de1de38e931acc1e3e20aeed3e6d71b6877a104d6
-EBUILD libdbi-drivers-0.8.3-r2.ebuild 2178 SHA256 7581a457ef99217f5f35a09a264e4b3a3b78bd39b5c4141c4cafc99659aaa435 SHA512 3ef3a2983a142d555ac82e2a8441b2f6e28011475d73f8bd88e2bd759d1466e2ae52d2c2f1d7166408bb5817a01c138bff00d2828fefb494c3b6b706ff2f6033 WHIRLPOOL b6acf383ab3353b89336d3de4507895083f83ce9aacfa625588e9798b962234078b6e8ec05669ea6433270f344d950bfb647157d0bd0aef237c5f3e19e68e6e7
-EBUILD libdbi-drivers-0.8.3.ebuild 2900 SHA256 e0578820d50960d5d08f7489f94c9d7f6d36e24abcb13543caefda81db8c0aa4 SHA512 a98c794518b5a840b7569bffd48b82ac5ee446d15125793f1de7794c0cec3e2f9d2c63f6c4d59f5099422715d4ee13e0582fb7f3ea768285eb27cc9b34f6dd2d WHIRLPOOL d9a7f0d985eac2f19446bc93d33593f0c097ffcba1733d7ce73014c0a42b79002cd79b6273e27a113bc25d73d6fbfd27aaa0522de2ed5df309eefc718f4bde74
 EBUILD libdbi-drivers-0.9.0.ebuild 2222 SHA256 b283d536ac4d82c25ea113a0a9b0745ef8da54d23592a16f64644ef6a21d02c5 SHA512 e2fa6f400aa86f4da4c7ce99dd07def42ad7dc80b23cf736e2468ad792b2f5f5b5a5feb1274637387ff8f185feacc1de8b107459391ad83a65c1bd5cb638bb54 WHIRLPOOL ab2931f6aa9670969b7a24e7234b1475dba110ee2c90eb784689ce04dfdc17f876c9b018fae36f03fc02142774bf0995fd53dd4cd2c7da14f8bc3fc9cf96c95f
-MISC ChangeLog 10375 SHA256 d4ebb64ee52829e5558a25833a117284df8aee0707947ecbf324e575a1c92940 SHA512 3afceffad82e8bb18a077b56468669f4edc8e407b9f14c26a7ef23614c17f50fc6dc8b9ae50e184fffd7c5b9db4f19317c4dffb5eac9ecef0d7c7787efd7e65f WHIRLPOOL 9df376e11181276a994a13b909f1b07a3f45163adb5d71980e0f840ef0f084c7b499909c404d851a3f19829e3334b137ec504a6c88cd09cfea39bf0dd7715b34
+MISC ChangeLog 10698 SHA256 b7c7c0d8ed3907a825c1576fa3b711bd6f855a5167870935423b39dcff03f529 SHA512 522fde783a3e10dcb8057cf4b41eaf0411daf271d15ac8dda3b87ff1a55a88113d050579ed10ed7831838eb08cc3f305e20af4a76b9831f9a9fa87b65ef53442 WHIRLPOOL 7aebfdc361f6d8a4b71ac1eaf6f165b3377386defb84f42b0d126c32f775665f2c9d60036a384f1709c1efafe6d03d3d248772464ba07514c1ea3011f531744b
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRXZW0ACgkQVxOqA9G7/aDihwD+OCP1lAGRmgteLNRVwKAc+tYc
-3N7W6mhajjGkZjXC8OcA+wXZ4Zwzq0W03OWfunacjkAjftXh5Zum6pKWGuDxzQE8
-=zi3P
+iEYEAREIAAYFAlRx9v4ACgkQCaWpQKGI+9TM0gCdGVXNbfGlv/qt14n1DnGcg+Ke
+QxwAnjGZe5QSy4bMmVc3qIkYiVbzC+mn
+=qBNS
 -----END PGP SIGNATURE-----
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
deleted file mode 100644
index f3caedb1dbc6..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-doc-build-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar libdbi-drivers-0.8.3-1.orig/configure.in libdbi-drivers-0.8.3-1/configure.in
---- libdbi-drivers-0.8.3-1.orig/configure.in	2008-10-09 17:09:09.303141877 -0700
-+++ libdbi-drivers-0.8.3-1/configure.in	2008-10-09 17:10:48.100635797 -0700
-@@ -149,7 +149,8 @@
--ac_docs="YES"
-+ac_docs="no"
- AC_ARG_ENABLE(docs,
- 	[  --disable-docs	  do not build and install the documentation.],
--	[  ac_docs="NO" ])
-+	[ ac_docs="$enableval" ],
-+	[ ac_docs="no" ])
- 
--if test "$ac_docs" = "YES"; then
-+if test "$ac_docs" = "yes"; then
- dnl   AC_PATH_PROGS(myjade, openjade jade)
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
deleted file mode 100644
index 6a5047466c2b..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nuar libdbi-drivers-0.8.3-1.orig/acinclude.m4 libdbi-drivers-0.8.3-1/acinclude.m4
---- libdbi-drivers-0.8.3-1.orig/acinclude.m4	2007-12-30 11:05:40.000000000 +0000
-+++ libdbi-drivers-0.8.3-1/acinclude.m4	2009-10-26 06:50:49.823477194 +0000
-@@ -450,8 +450,8 @@
- 		firebird_incdirs="/opt/firebird/include /usr/include /usr/local/include /usr/include/firebird /usr/local/include/firebird /usr/local/firebird/include /opt/firebird/include"
- 		AC_FIND_FILE(ibase.h, $firebird_incdirs, ac_firebird_incdir)
- 		firebird_libdirs="/opt/firebird/lib /usr/lib /usr/local/lib /usr/lib/firebird /usr/local/lib/firebird /usr/local/firebird/lib /opt/firebird/lib"
--dnl		AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
--		AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
-+		AC_FIND_FILE(libfbclient.so, $firebird_libdirs, ac_firebird_libdir)
-+dnl		AC_FIND_FILE(libfbembed.so, $firebird_libdirs, ac_firebird_libdir)
- 		if test "$ac_firebird_incdir" = "no"; then
- 			AC_MSG_RESULT(no)
- 			AC_MSG_ERROR([Invalid Firebird/Interbase directory - include files not found.])
-@@ -479,8 +479,8 @@
- 	[SCHAR_MSG="no"])
- 	AC_MSG_RESULT([$SCHAR_MSG])
- 
--dnl	FIREBIRD_LIBS="-lfbclient"
--	FIREBIRD_LIBS="-lfbembed"
-+	FIREBIRD_LIBS="-lfbclient"
-+dnl	FIREBIRD_LIBS="-lfbembed"
- 	FIREBIRD_INCLUDE="-I$ac_firebird_incdir"
- 	FIREBIRD_LDFLAGS="-L$ac_firebird_libdir"
- 	
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch
deleted file mode 100644
index d6509560468a..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-fix-ac-macro.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libdbi-drivers-0.8.3-1-old/configure.in libdbi-drivers-0.8.3-1/configure.in
---- libdbi-drivers-0.8.3-1-old/configure.in	2013-05-14 02:28:23.315926087 +0000
-+++ libdbi-drivers-0.8.3-1/configure.in	2013-05-14 02:29:05.655762313 +0000
-@@ -3,7 +3,7 @@
- AM_MAINTAINER_MODE
- 
- AM_INIT_AUTOMAKE(libdbi-drivers, 0.8.3-1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_LIBTOOL_WIN32_DLL
- 
- dnl library versioning currently unnecessary...
diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
deleted file mode 100644
index ad73595a462b..000000000000
--- a/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c
---- libdbi-drivers-0.8.3-1.orig/drivers/oracle/dbd_oracle.c	2009-01-26 16:31:42.000000000 +0300
-+++ libdbi-drivers-0.8.3-1/drivers/oracle/dbd_oracle.c	2009-01-26 16:32:38.000000000 +0300
-@@ -841,7 +841,7 @@
- {
-   struct  tm tmt;
- /*  char    stime[101], *cp = NULL; */
--/*  time_t  loct = 0L; */
-+  time_t  loct = 0L;
- 
- /*    memset(stime, 0, sizeof(stime)); */
-    
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
deleted file mode 100644
index de2a1246d16d..000000000000
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild,v 1.6 2014/11/03 11:22:20 titanofold Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-MY_P="${P}-1"
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-
-IUSE="bindist doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT=0
-
-RDEPEND="
-	>=dev-db/libdbi-0.8.3
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-text/openjade )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	firebird? ( !bindist )
-	|| ( mysql postgres sqlite firebird oci8 )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README README.osx TODO"
-
-pkg_setup() {
-	use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-ac-macro.patch \
-		"${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch \
-		"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
-		"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	# WARNING: the configure script does NOT work correctly
-	# --without-$driver does NOT work
-	# so do NOT use `use_with...`
-	use mysql && myconf+=" --with-mysql"
-	use postgres && myconf+=" --with-pgsql"
-	use sqlite && myconf+=" --with-sqlite3"
-	use firebird && myconf+=" --with-firebird"
-	if use oci8; then
-		[[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
-		myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
-	fi
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_test() {
-	if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
deleted file mode 100644
index c08baeb2e0fd..000000000000
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild,v 1.22 2014/11/03 11:22:20 titanofold Exp $
-
-inherit eutils autotools
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-DEPEND=">=dev-db/libdbi-0.8.3
-		mysql? ( virtual/mysql )
-		postgres? ( virtual/postgresql )
-		sqlite? ( <dev-db/sqlite-3 )
-		sqlite3? ( >=dev-db/sqlite-3 )
-		!bindist? ( firebird? ( dev-db/firebird ) )
-		doc? ( app-text/openjade )"
-
-IUSE="mysql postgres sqlite oci8 firebird sqlite3 bindist doc"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT=0
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.8.3-doc-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-	cd "${S}"
-	eautoreconf
-}
-
-pkg_setup() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} pgsql"
-	use sqlite && drivers="${drivers} sqlite"
-	use sqlite3 && drivers="${drivers} sqlite3"
-	if use firebird; then
-		if use bindist; then
-			eerror "The Interbase Public License is incompatible with LGPL, see bug #200284."
-			eerror "Disabling firebird in the build"
-		else
-			drivers="${drivers} firebird"
-		fi
-	fi
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		drivers="${drivers} oracle"
-	fi
-	# safety check
-	if [ -z "${drivers// /}" ]; then
-		die "No supported databases in your USE flags! (mysql, postgres, sqlite, sqlite3, oracle, firebird)"
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	# WARNING: the configure script does NOT work correctly
-	# --without-$driver does NOT work
-	# so do NOT use `use_with...`
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sqlite && myconf="${myconf} --with-sqlite"
-	use sqlite3 && myconf="${myconf} --with-sqlite3"
-	use !bindist && use firebird && myconf="${myconf} --with-firebird"
-	if use oci8; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			die "\$ORACLE_HOME is not set!"
-		fi
-		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle"
-	fi
-
-	econf $(use_enable doc docs) ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README README.osx TODO
-}
-src_test() {
-	if [ -z "${WANT_INTERACTIVE_TESTS}" ]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check || die "Tests failed"
-}
diff --git a/dev-db/libdbi/ChangeLog b/dev-db/libdbi/ChangeLog
index 6cbe28ce9155..7754a6b8e1db 100644
--- a/dev-db/libdbi/ChangeLog
+++ b/dev-db/libdbi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libdbi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.63 2014/08/10 20:00:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.64 2014/11/23 15:01:09 pacho Exp $
+
+  23 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libdbi-0.8.1-pkg-config.patch, -files/libdbi-0.8.3-doc-build-fix.patch,
+  -files/libdbi-0.8.4-doc-build-fix.patch,
+  -files/libdbi-0.8.4-fix-ac-macro.patch, -libdbi-0.8.3.ebuild,
+  -libdbi-0.8.4.ebuild:
+  Drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libdbi-0.8.3.ebuild,
   libdbi-0.8.4.ebuild, libdbi-0.9.0.ebuild:
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index 421cd0911dca..bad61fda9798 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA256
 
 AUX dbi.pc.in 244 SHA256 9c7969c72ad8bb5371fd8c30a163408ed5dcd2a9523b6274b2e7e7f2fb9eba40 SHA512 6865b37e8d84d7a95b0ae482d9b1cb486ab7abbe726e699099ea4368d418f64b6d8cb02ecd4d1473f643aa5d715c57817a9496bd8950461921d5db4ff4272ef9 WHIRLPOOL 4d170682fe48f03bbbd9deb51281b36cecfbf5d5fdcd4705215c43509668dd61b96f2efd9f1bc55b9761ada74327730f93ee9cf18cd187dbfa4e36aca1f3dabc
-AUX libdbi-0.8.1-pkg-config.patch 202 SHA256 835cfe7ce28f0859c092848404a2d35820a876fff9023115dcfac9d671c96daa SHA512 a2cc1ab269365984bc32d569d2884f8dbed0171a8b3614790f96084aabb24f42c947bd4971d16d52fe96b50f945bf876143ddba3b5fbd09e1644363626b449b1 WHIRLPOOL 5bbf2bf453565dae1cd0e4556b6f8ff67b4a718e97f35eaca7d8a84a9eced738042990d4064178f84b53a3eb6fdd0d2a5878c1a868317b10c135a1ed95c2708f
-AUX libdbi-0.8.3-doc-build-fix.patch 526 SHA256 eda2d5fe104894f946f80cf2067f6340d0908996d2459a405becd44d9c3be388 SHA512 4b2c13c940a52a3a37c9b511b6a4b25237d091031beef507b9653528691bdafdd5a4035a69918408b8044f73cf62fdc9d47808e7ee6711f248d0fcc77c4c5424 WHIRLPOOL 312863deb14681ea5b4c77ce07a779b6158e82be25a44ca5992003ac11112d44d39a6ac881c1b5efb4c38dd0d1c14083ff40d7b559c705de73b76aee349b8342
-AUX libdbi-0.8.4-doc-build-fix.patch 719 SHA256 e21eecf9b414e33214430b8c453e45db3e47c0967a936c6339d7ab6cff6a9b88 SHA512 5831c5f2df17f2a619c6e94d206bbae37226e76a2c7ec798bf62b7b04edf2cdf3b0123925a04945be40eb32b9ad50ce2de2f63f34ef0de3def4dd48ebbb33721 WHIRLPOOL ea91235d791d3a9a747649540143287778920b1c22d2789dd8b755da8f356e84174ebf27b7e99656391ab839a7fa31c201f50009d3930edbbbe662087c59c0fa
-AUX libdbi-0.8.4-fix-ac-macro.patch 382 SHA256 4c0ac8fde4e833fdf9e85f587a24bc4cc9455f9db79e26cd78a61c9767ce8405 SHA512 5f8ddfed73945d3d211ab05dccc04333f6be26d0a40104d9172f148caa91ca139bf28f4d40b8bfbebe8e9e1bb0c012074c83ecffe82496fa09742d5722dd0d34 WHIRLPOOL c420b92b430fe5f4d7f065af54ab9254ec24557efc939cc6ccf9f36f993dc3b90a0c7d4cc6c165ac29b51f919f92cfccdde553e5909295c82ded2110c389ca35
 AUX libdbi-0.9.0-doc-build-fix.patch 662 SHA256 548e01cb57ae4123ba6fc909642f5d300e735f6b0b0e58f24417a83c1c7b39dd SHA512 db18d3697be13ef416914843d0933caead3b1f57c13790373ec435318212f0ccfb599514f8bd6f1c603e09f13bd526b62322ff92e68512e43020b31f8d0dec55 WHIRLPOOL bc1e08665484bf2b869902e25c27e64b9279b6de9e1a0f0e4b5812e9c25c876aa270b566cd086852d6da5c221683c1bf73640b6ce820c3c9ca3d6b69dd08d0ce
-DIST libdbi-0.8.3.tar.gz 1060714 SHA256 72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3 SHA512 408b13deb46e03af9b05bbb258236f06942a5732b58732cd85b0867e01407474a37164703c51c0d48e44d97b7622a7106f8db66a2adf15d056bc92f96a9454a0 WHIRLPOOL 72ed96b886116587f3dd290035ee98f877595021c81c71ed47077224f250370fb7e0c232af8764c7657daa0863e26b80dabdcc7881a743827e3505935b3c35ff
-DIST libdbi-0.8.4.tar.gz 1045247 SHA256 ef38db616f0752ccb09b8ba2eac471722369b8ded50b153c25e238cac2c8de99 SHA512 7e28945a96483785840511df23fd8177383a1f9ee3929df863a3e458550b6eb943f8f86f49ede167125ce64daf718b14c40ac09b99e2e8eea474eecf7ee6a530 WHIRLPOOL 6f5770d2a10e02e0e16c6354548d053811ca0205f2942c2e261cd189097423d49a0f2f86afb8308fe7b3cbfde34afc9cb0e16c2fd1471c733c44802235879064
 DIST libdbi-0.9.0.tar.gz 1194284 SHA256 dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503 SHA512 ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce WHIRLPOOL 32770a9247670f30cd280a7c2111239d251e09d7c72e6b3890d02fdf3db7384de88e899431999e1b476ac099d4b8cd9f4d727d9610d47d62dccb9229bcdb36b7
-EBUILD libdbi-0.8.3.ebuild 1375 SHA256 9f86eff8c9cbcea641ecd9fbbad26a71fd6b1633e8b279524f29150a902acee3 SHA512 dc1f32679baad339207385ea61c5280587c9e1d1e46aa6462cc76e274af4091f653718849f8d1c661741080d79eafacb141538800f5da290184a89d8917dd889 WHIRLPOOL b7092923c06199275771fd6aebfe3eae6222df05eb0e461948cd0fbfc5e3576c91884fad2956d2b5db3af6102fd85e9c66e987809aba3404543c414e838f7659
-EBUILD libdbi-0.8.4.ebuild 1492 SHA256 d216df4eac7ad59be42836d04ff6be6e9b92920863280873d8616b23bf18144d SHA512 a09a07030d4e9d40af67ea2344a227de93313c6ee8f08328d1b7b1460e6fc1cb93936ea66eef2930365e47add6e6256bd392386e6d1a24eb99d1ed48b9c6b400 WHIRLPOOL 5c58b6dabfe82b7bf75c70e30d537ff65ee3fd8a3244889ff7f0ac9d78fa9c1f388d429b9030544ce126c893724ce5f3dbc4ae245590cb052d5671145461908e
 EBUILD libdbi-0.9.0.ebuild 1514 SHA256 ef4daf535263ff964d1795aeabe4a7c1cc72b1c87e18bf00a5b58bd28d365558 SHA512 65c1254738d63ed3c14d4157ea5315756fc715e74a8257067d512233d27cbf628c2f1069011757b3a67425cda8ae5cd4b9e74c719b2978908fac4775a74b5153 WHIRLPOOL 7ca6e74cfd0d90b3b397c5d8bfaf6071b40ddf1e09a223548ab4f0fc3a0f400153d65f1a7c54010a2ccbc82dd7812524f8ea4624449f131060d97e9cc7e2b531
-MISC ChangeLog 7340 SHA256 e943ccb9767c95d263c7aa1c5803586bc44ff7901d8e2f75be4536431ade94ea SHA512 8b37050a9a54e0dbc74f0311aaa37159634d3c76b82ba3c05ea3b4c82462ae0a98331a88a1f9bd99bd99f8b6456459ec035b0c0290c1235b9502fc514411aaf6 WHIRLPOOL ef26fd147ef5e222381dd1e68fb757b526eef74606c86b4a4e435fd3ecd1d7acedc5e73d2c42172cdd35a651c0ab30f221026e871fe9be1deefffaad2891db64
+MISC ChangeLog 7609 SHA256 d400dda66e55797110340b5f2cc3fa68213586fe63a3e066dd2596ab1c8b8455 SHA512 21eb3b0ad6e0f5d415e341311e809be7a8d4bc732e1bb5d37b1f6b7215d53beb5be335e4186fab6c20a7b7ff1b4e28e2eb8f1588f7ae3ea5ea4ed0520cb5c30b WHIRLPOOL d3298505b5ebc4889ef6efa96338eda6204243af3299e9d121995c0a1bb2aafa589cc2f0af16160472946df89e92ff1800024a800fd077a1234bc316d0da7e54
 MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnz2AACgkQcaHudmEf86oEsgCfbgKehddVmfbsmn8cElmvLoy0
-RbIAn0HYN95uazF2SgkdhtSFR/TXFW3y
-=xxwt
+iEYEAREIAAYFAlRx9rYACgkQCaWpQKGI+9R7aQCfQ4gylbdozLZ9YL1awPBEzazQ
+f/4An3oMXq0NpK5OBZFof63GIgyQDkZq
+=UE1M
 -----END PGP SIGNATURE-----
diff --git a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch b/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
deleted file mode 100644
index a770ef3ceb51..000000000000
--- a/dev-db/libdbi/files/libdbi-0.8.1-pkg-config.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.in.orig	2008-09-23 15:16:20.000000000 -0400
-+++ configure.in	2008-09-23 15:16:39.000000000 -0400
-@@ -149,4 +149,5 @@
- 	doc/Makefile
- 	include/Makefile
- 	include/dbi/Makefile
-+	dbi.pc
- 	])
diff --git a/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch
deleted file mode 100644
index 831d6d25c2b7..000000000000
--- a/dev-db/libdbi/files/libdbi-0.8.3-doc-build-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar libdbi-0.8.3.orig/configure.in libdbi-0.8.3/configure.in
---- libdbi-0.8.3.orig/configure.in	2008-10-09 17:09:09.303141877 -0700
-+++ libdbi-0.8.3/configure.in	2008-10-09 17:10:48.100635797 -0700
-@@ -149,7 +149,8 @@
--ac_docs="YES"
-+ac_docs="no"
- AC_ARG_ENABLE(docs,
- 	[  --disable-docs	  do not build and install the documentation.],
--	[  ac_docs="NO" ])
-+	[ ac_docs="$enableval" ],
-+	[ ac_docs="no" ])
- 
--if test "$ac_docs" = "YES"; then
-+if test "$ac_docs" = "yes"; then
- dnl   AC_PATH_PROGS(myjade, openjade jade)
diff --git a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch b/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch
deleted file mode 100644
index 2891a7839002..000000000000
--- a/dev-db/libdbi/files/libdbi-0.8.4-doc-build-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nuar libdbi-0.8.4.orig/configure.in libdbi-0.8.4/configure.in
---- libdbi-0.8.4.orig/configure.in	2012-02-21 08:36:15.560231962 +0000
-+++ libdbi-0.8.4/configure.in	2012-02-21 08:39:07.910615238 +0000
-@@ -147,14 +147,13 @@
- dnl See whether to build the docs
- dnl ==============================
- 
--ac_docs="YES"
-+ac_docs="yes"
- AC_ARG_ENABLE(docs,
- 	[  --disable-docs	  do not build and install the documentation.],
--	[  if test "$enable_docs" = "no"; then
--	      ac_docs="NO"
--	   fi ])
-+	[ ac_docs="$enableval" ],
-+	[ ac_docs="no" ])
- 
--if test "$ac_docs" = "YES"; then
-+if test "$ac_docs" = "yes"; then
- dnl   AC_PATH_PROGS(myjade, openjade jade)
- dnl   if test "x$myjade" != "x"; then
-       docs_subdirs="doc"
diff --git a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch b/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch
deleted file mode 100644
index 4dc286856b6b..000000000000
--- a/dev-db/libdbi/files/libdbi-0.8.4-fix-ac-macro.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libdbi-0.8.4-old/configure.in libdbi-0.8.4/configure.in
---- libdbi-0.8.4-old/configure.in	2013-05-14 01:45:25.595869576 +0000
-+++ libdbi-0.8.4/configure.in	2013-05-14 01:47:09.775467777 +0000
-@@ -3,7 +3,7 @@
- AM_MAINTAINER_MODE
- 
- AM_INIT_AUTOMAKE(libdbi, 0.8.4)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- 
- dnl Library versioning
diff --git a/dev-db/libdbi/libdbi-0.8.3.ebuild b/dev-db/libdbi/libdbi-0.8.3.ebuild
deleted file mode 100644
index 7c7efa9bf42a..000000000000
--- a/dev-db/libdbi/libdbi-0.8.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.3.ebuild,v 1.23 2014/08/10 20:00:32 slyfox Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi.sourceforge.net/"
-LICENSE="LGPL-2.1"
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4
-		virtual/pkgconfig
-		doc? ( app-text/openjade )
-		${RDEPEND}"
-PDEPEND=">=dev-db/libdbi-drivers-0.8.3"
-IUSE="doc"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT=0
-
-src_unpack() {
-	unpack ${A}
-	chown -R portage:portage "${S}"
-	cd "${S}"
-	epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
-	cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
-	epatch "${FILESDIR}"/libdbi-0.8.3-doc-build-fix.patch
-
-	# configure.in has been changed
-	eautoreconf
-}
-
-src_compile() {
-	# should append CFLAGS, not replace them
-	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
-	econf $(use_enable doc docs)
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog README README.osx TODO
-
-	# syslog-ng requires dbi.pc
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins dbi.pc
-}
diff --git a/dev-db/libdbi/libdbi-0.8.4.ebuild b/dev-db/libdbi/libdbi-0.8.4.ebuild
deleted file mode 100644
index be82cf9ae40d..000000000000
--- a/dev-db/libdbi/libdbi-0.8.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.4.ebuild,v 1.14 2014/08/10 20:00:32 slyfox Exp $
-
-EAPI=4
-
-inherit eutils autotools multilib
-
-DESCRIPTION="libdbi is a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://libdbi.sourceforge.net/"
-LICENSE="LGPL-2.1"
-
-IUSE="doc static-libs"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-SLOT=0
-
-DOCS="AUTHORS ChangeLog README README.osx TODO"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	virtual/pkgconfig
-	doc? ( app-text/openjade )
-"
-PDEPEND=">=dev-db/libdbi-drivers-0.8.3" # On purpose, libdbi-drivers 0.8.4 does not exist
-
-src_unpack() {
-	unpack ${A}
-	chown -R portage:portage "${S}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-ac-macro.patch"
-	epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
-	cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
-	epatch "${FILESDIR}"/libdbi-0.8.4-doc-build-fix.patch
-
-	# configure.in has been changed
-	eautoreconf
-	# should append CFLAGS, not replace them
-	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install () {
-	default
-
-	prune_libtool_files --all
-
-	# syslog-ng requires dbi.pc
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins dbi.pc
-}