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

(Portage version: 2.2_rc88/cvs/Linux x86_64)

6 files changed, 116 insertions, 9 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/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 ) )