Bug #329033: postgres virtual migration converted this to depending on -server instead of -base. Fix up, with a revbump also redoing RDEPEND vs DEPEND.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

7 files changed, 122 insertions, 14 deletions

diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index 2ec34c6d3f9f..11ad7f77862f 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/libdbi-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.50 2010/06/17 21:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.51 2010/09/28 17:22:52 robbat2 Exp $
+
+*libdbi-drivers-0.8.3-r2 (28 Sep 2010)
+
+  28 Sep 2010; Robin H. Johnson <robbat2@gentoo.org>
+  libdbi-drivers-0.8.1-r1.ebuild, libdbi-drivers-0.8.1-r2.ebuild,
+  libdbi-drivers-0.8.3.ebuild, libdbi-drivers-0.8.3-r1.ebuild,
+  +libdbi-drivers-0.8.3-r2.ebuild:
+  Bug #329033: postgres virtual migration converted this to depending on
+  -server instead of -base. Fix up, with a revbump also redoing RDEPEND vs
+  DEPEND.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   libdbi-drivers-0.8.1-r1.ebuild, libdbi-drivers-0.8.1-r2.ebuild,
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 3d0fd982b830..c5b0e960741d 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -4,9 +4,10 @@ AUX libdbi-drivers-0.8.3-firebird-fix.patch 1374 RMD160 d1f668148ef988f48d80d6d2
 AUX libdbi-drivers-0.8.3-oracle-build-fix.patch 485 RMD160 c8d9e941318a4cbdbcc9ddc5c5f52be5e566b114 SHA1 4c6af4561041e10c5fdb00e21ded55d923cbb84e SHA256 67d088a16f91f77a377eeae1fe8d1fa30540fcf5beb0566d1146fe56cbbd3dec
 DIST libdbi-drivers-0.8.1.tar.gz 1147446 RMD160 280c5ea3a8a2b7029865d4fc48064620d9db2e38 SHA1 82c00d3f4d86a88d57cc1b58163182c5db09d990 SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd
 DIST libdbi-drivers-0.8.3-1.tar.gz 1534420 RMD160 e0aa9e67f6560fb44018b1d35d90d4ac21b48597 SHA1 599fbab115419e8fc88b3b31a38031584ee213b5 SHA256 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
-EBUILD libdbi-drivers-0.8.1-r1.ebuild 2207 RMD160 c88dd79632da09d37d3a4b5c6d1dd726d07c5ffe SHA1 708f685084659d6ea8055508230437859dca3e61 SHA256 a015911bfdb7ab470794998edecee6a0c97882c0267f055a26a6078e39b073e6
-EBUILD libdbi-drivers-0.8.1-r2.ebuild 2604 RMD160 5438dea7ef3e0b57fdfd4f62bdc0496c5329922b SHA1 ac102bfee2fe2ffdd46f356b31084a345fbf8c94 SHA256 e8e99fccc50346ebe17b1e8a840307ca343555c02e8b56a6069f209de10d0064
-EBUILD libdbi-drivers-0.8.3-r1.ebuild 2925 RMD160 352bb1ccca5622440e116f93c615ed5b7699c923 SHA1 d4d7b19b806497f5943fd4efb2a71d9c4672c424 SHA256 683289e9a7018ed247adb39d6b4b65329994da7b26ec4e82fadbb55d1ea42e61
-EBUILD libdbi-drivers-0.8.3.ebuild 2904 RMD160 f9b64fded00a78f917739ebbd085bfcdf41c0747 SHA1 26d4fc6f84262e76e7eca250155390f969877f6d SHA256 f4a7ba5b5d4f0b4a28391694f983d3f8ecbcda3c78e3a36b87361f2c16f7c1cc
-MISC ChangeLog 7243 RMD160 14e635cbcd1ce628d167af27796d850314652fd5 SHA1 cfa9710793ab306f9ae861875fa11ee02cf89799 SHA256 f6a3956399c306c425207491c9e860d243e7ac5840246f7e8c197e9d73017419
+EBUILD libdbi-drivers-0.8.1-r1.ebuild 2205 RMD160 b931062588e7826a31f0d414c39b6ef2b430bedd SHA1 f75878cbd92aed36dd4b3f578a8ed1538fd8620c SHA256 e3c0cbf40cd105eb6b07d44eb32feb78157f9d2a944ec17502a139920ab0c74d
+EBUILD libdbi-drivers-0.8.1-r2.ebuild 2602 RMD160 33794a135d40f33b9b92ff962f17b460baaf4bbe SHA1 73517f0de801adaab0889e532e80a33011a84d0e SHA256 62624f7ac8dca1e1e9a8a9232515e4c1d4460df2690420165c91979f444c1ddb
+EBUILD libdbi-drivers-0.8.3-r1.ebuild 2923 RMD160 ffbab8e44d775f466219e917f52ed12f3d37bc7c SHA1 57aecccbec98231be58df3121abdfb2ac5cb3d94 SHA256 b7e52dd52cd7eca2352f08ac9e229d0fc39fe4372e9ee728f3cdad181a0f2086
+EBUILD libdbi-drivers-0.8.3-r2.ebuild 2944 RMD160 0d1ecbc71d09e58b5bd3906887d53fbc9815d9dd SHA1 8d35db0e0894c6c10a51a7fd4d5383480789bcbd SHA256 ac1e16230fc46695ec3c9cdfcda8d52712b316a56d04245550830d2ec90a993f
+EBUILD libdbi-drivers-0.8.3.ebuild 2902 RMD160 ccf519ff2786e9be8bd35263b6c0289b6c39413b SHA1 c7c1a4375cc0e94fe292bd0517957f32ba820655 SHA256 28eddda938a27d6190e03f065f332bbc913af8b7d6bf79a94189f1d7b3af9b55
+MISC ChangeLog 7659 RMD160 14f26506e2f94e125c3fc293e9ae165851af864e SHA1 a037a6600ee7c7f6aae3496a2b3cae172c0e7ae8 SHA256 9a4fc9afccc965f6d7831cf640f4c588566ffb0428fd43dd6949aaa668ac98ca
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
index 12f81a2e4573..0ee2f5913f1e 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1-r1.ebuild,v 1.12 2010/06/17 21:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild,v 1.13 2010/09/28 17:22:52 robbat2 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND=">=dev-db/libdbi-0.8.0
 		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-server )
+		postgres? ( dev-db/postgresql-base )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
 		firebird? ( dev-db/firebird )"
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
index ba3f23dbc45e..4c5164cdf005 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1-r2.ebuild,v 1.8 2010/06/17 21:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r2.ebuild,v 1.9 2010/09/28 17:22:52 robbat2 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND=">=dev-db/libdbi-0.8.0
 		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-server )
+		postgres? ( dev-db/postgresql-base )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
 		!bindist? ( firebird? ( dev-db/firebird ) )"
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
index 915e6c334c54..3eb40f4a316e 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.2 2010/06/17 21:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild,v 1.3 2010/09/28 17:22:52 robbat2 Exp $
 
 EAPI=1
 inherit eutils autotools
@@ -14,7 +14,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND=">=dev-db/libdbi-0.8.3
 		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-server )
+		postgres? ( dev-db/postgresql-base )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
 		!bindist? ( firebird? ( dev-db/firebird ) )
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
new file mode 100644
index 000000000000..46e66d36f775
--- /dev/null
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 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.1 2010/09/28 17:22:52 robbat2 Exp $
+
+EAPI=1
+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"
+RDEPEND=">=dev-db/libdbi-0.8.3
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base )
+		sqlite? ( <dev-db/sqlite-3 )
+		sqlite3? ( >=dev-db/sqlite-3 )
+		!bindist? ( firebird? ( dev-db/firebird ) )"
+DEPEND="${RDEPEND}
+		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-drivers/libdbi-drivers-0.8.3.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
index 65d73b412af0..99e5e3e1d9f5 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.19 2010/06/17 21:28:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild,v 1.20 2010/09/28 17:22:52 robbat2 Exp $
 
 inherit eutils autotools
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND=">=dev-db/libdbi-0.8.3
 		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-server )
+		postgres? ( dev-db/postgresql-base )
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( >=dev-db/sqlite-3 )
 		!bindist? ( firebird? ( dev-db/firebird ) )