Version bump. Correctly split src_configure() and src_compile().

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

3 files changed, 74 insertions, 3 deletions

diff --git a/dev-db/opendbx/ChangeLog b/dev-db/opendbx/ChangeLog
index 2b6ff30752d3..d4d439e89b8c 100644
--- a/dev-db/opendbx/ChangeLog
+++ b/dev-db/opendbx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/opendbx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.25 2009/03/23 16:00:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/ChangeLog,v 1.26 2009/11/14 10:47:06 swegener Exp $
+
+  14 Nov 2009; Sven Wegener <swegener@gentoo.org> opendbx-1.4.0.ebuild,
+  +opendbx-1.4.4.ebuild:
+  Version bump. Correctly split src_configure() and src_compile().
+
+*opendbx-1.4.4 (14 Nov 2009)
+
+  14 Nov 2009; Sven Wegener <swegener@gentoo.org> +opendbx-1.4.4.ebuild:
+  Version bump.
 
 *opendbx-1.4.0 (23 Mar 2009)
 
diff --git a/dev-db/opendbx/opendbx-1.4.0.ebuild b/dev-db/opendbx/opendbx-1.4.0.ebuild
index 0e9db9b27948..c2f62d4fe49f 100644
--- a/dev-db/opendbx/opendbx-1.4.0.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.0.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/opendbx/opendbx-1.4.0.ebuild,v 1.1 2009/03/23 16:00:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.0.ebuild,v 1.2 2009/11/14 10:47:06 swegener Exp $
 
 EAPI="2"
 
@@ -40,7 +40,7 @@ pkg_setup() {
 	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
 }
 
-src_compile() {
+src_configure() {
 	local backends=""
 
 	use !bindist && use firebird && backends="${backends} firebird"
@@ -51,6 +51,9 @@ src_compile() {
 	use sqlite3 && backends="${backends} sqlite3"
 
 	econf --with-backends="${backends}" || die "econf failed"
+}
+
+src_compile() {
 	emake -j1 || die "emake failed"
 }
 
diff --git a/dev-db/opendbx/opendbx-1.4.4.ebuild b/dev-db/opendbx/opendbx-1.4.4.ebuild
new file mode 100644
index 000000000000..995d4e259e68
--- /dev/null
+++ b/dev-db/opendbx/opendbx-1.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/opendbx/opendbx-1.4.4.ebuild,v 1.1 2009/11/14 10:47:06 swegener Exp $
+
+EAPI="2"
+
+inherit flag-o-matic
+
+DESCRIPTION="OpenDBX - A database abstraction layer"
+HOMEPAGE="http://www.linuxnetworks.de/doc/index.php/OpenDBX"
+SRC_URI="http://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist firebird +mysql oracle postgres sqlite sqlite3"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( <dev-db/sqlite-3 )
+	sqlite3? ( =dev-db/sqlite-3* )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	!bindist? ( firebird? ( dev-db/firebird ) )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! ( use !bindist && use firebird || use mysql || use oracle || use postgres || use sqlite || use sqlite3 )
+	then
+		ewarn "You should enable at least one of the following USE flags:"
+		ewarn "firebird, mysql, oracle, postgres, sqlite or sqlite3"
+	fi
+
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
+	then
+		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
+	fi
+
+	use mysql && append-cppflags -I/usr/include/mysql
+	use firebird && append-cppflags -I/opt/firebird/include
+	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+}
+
+src_configure() {
+	local backends=""
+
+	use !bindist && use firebird && backends="${backends} firebird"
+	use mysql && backends="${backends} mysql"
+	use oracle && backends="${backends} oracle"
+	use postgres && backends="${backends} pgsql"
+	use sqlite && backends="${backends} sqlite"
+	use sqlite3 && backends="${backends} sqlite3"
+
+	econf --with-backends="${backends}" || die "econf failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}