Bug #289519: Fixup for Firebird compile. Bug #256411: Fix for Oracle compile. Bug #254851: USE-default for tinderbox build.

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

5 files changed, 147 insertions, 3 deletions

diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index 149bf98e1240..644395160d91 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/libdbi-drivers
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.48 2009/02/24 17:44:47 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.49 2009/10/26 07:19:33 robbat2 Exp $
+
+*libdbi-drivers-0.8.3-r1 (26 Oct 2009)
+
+  26 Oct 2009; Robin H. Johnson <robbat2@gentoo.org>
+  libdbi-drivers-0.8.3.ebuild, +libdbi-drivers-0.8.3-r1.ebuild,
+  +files/libdbi-drivers-0.8.3-firebird-fix.patch,
+  +files/libdbi-drivers-0.8.3-oracle-build-fix.patch:
+  Bug #289519: Fixup for Firebird compile. Bug #256411: Fix for Oracle
+  compile. Bug #254851: USE-default for tinderbox build.
 
   24 Feb 2009; Raúl Porcel <armin76@gentoo.org>
   libdbi-drivers-0.8.3.ebuild:
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
new file mode 100644
index 000000000000..6a5047466c2b
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-firebird-fix.patch
@@ -0,0 +1,25 @@
+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-oracle-build-fix.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
new file mode 100644
index 000000000000..ad73595a462b
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.8.3-oracle-build-fix.patch
@@ -0,0 +1,12 @@
+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-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..4e6cf09b0af2
--- /dev/null
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 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.1 2009/10/26 07:19:33 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"
+DEPEND=">=dev-db/libdbi-0.8.3
+		mysql? ( virtual/mysql )
+		postgres? ( virtual/postgresql-server )
+		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-drivers/libdbi-drivers-0.8.3.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild
index 597202f1d65a..c99b04d32862 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-2009 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.17 2009/02/24 17:44:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.3.ebuild,v 1.18 2009/10/26 07:19:33 robbat2 Exp $
 
 inherit eutils autotools
 
@@ -27,6 +27,8 @@ 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
 }