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

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

4 files changed, 82 insertions, 9 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/Manifest b/dev-db/opendbx/Manifest
index 234181e56ce6..9c320c2539df 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -5,16 +5,18 @@ DIST opendbx-1.2.4.tar.gz 483674 RMD160 c7fe5af0de4784e28daca0c6eaf5b95a5ff94c06
 DIST opendbx-1.2.6.tar.gz 487528 RMD160 19e832dd560f732f16f2bd76e493bcc479c96342 SHA1 4a485cf487609e9dcc4c9ff40c2b894e05a067a6 SHA256 99367a4d150964112f6deec4f929f18fcf5076fae220cc7c133fc6d99060b8d5
 DIST opendbx-1.3.11.tar.gz 565008 RMD160 acea3fc4fc89dca5fcba4e4ed7bd85c2753f13aa SHA1 d870ac365df98ecfbc5b14bc8f3b45c9c50e8ad5 SHA256 9837dfeed1db73c357ecd4b96ed5a397405d1ed512a9aca6a42b8ee4ce6f3831
 DIST opendbx-1.4.0.tar.gz 581269 RMD160 d10ff4e4bd8de2422d14d13c405455b85e32363c SHA1 9fe28d7797e1b927f9f782decbc286e87a7a863b SHA256 329db9c4705e452e076487a152e81ca9a21ba7462738632919cd84bffd086edf
+DIST opendbx-1.4.4.tar.gz 581564 RMD160 58e4a838fad9ef494856a2109155b2291ee00efc SHA1 b8eca2b6ab51469b0ec2bb71a03360d1f7dee607 SHA256 7a9f2b67e34d09a6e0e7274dbb847507c3c796bd224b8b789baacd490a0587dd
 EBUILD opendbx-1.2.4.ebuild 1875 RMD160 8ec42c99ddcd9c6eb358d265ef0e46bb3f8fa73a SHA1 5c71df19671eee563440dea666f201a809952ee1 SHA256 f2e271679d2456d9a97a4f5959915c498b6238b3ba2993f0e33b97ef74ce270d
 EBUILD opendbx-1.2.6.ebuild 1877 RMD160 672a8628d67007cdd3a0197cd7ae85fb13f6e039 SHA1 a035493559182cb97c60a7c9f5103e92306ece39 SHA256 8590f009727d55c77e6bea9cb3b3295e5a240e013f7555a35086ae1f9e0759f7
 EBUILD opendbx-1.3.11.ebuild 1882 RMD160 49423cd96201c5ba58220d090cb985d0d6cdbcda SHA1 4ea1b15f8dbbf1f80f5ae113bc1964e023f61202 SHA256 80cfe6dc895d6bb9154075268b50951b44d561ae6407410a2005ee558699dfdf
-EBUILD opendbx-1.4.0.ebuild 1894 RMD160 91a76663561324cf7eac5557a1c862423d3e1e92 SHA1 6d44a9543f27bddc9c6852fffa1463bb2ac82ecc SHA256 aee21ee7eb3127149df43d1dab10efc06b571e4575fd9423a0467d14add0f3db
-MISC ChangeLog 3842 RMD160 1ccb82d818ba09defdbba6d13f1375aad32f19eb SHA1 aba0dd74ac27c0192c89f4a6653abfbc7b33e212 SHA256 fce2cee711a1d16ca6f3095447feaad64f7f386a8a9f88fdacf6375531ec66d2
+EBUILD opendbx-1.4.0.ebuild 1915 RMD160 158292d16e9d3aa7f390cc06b223443a54887a85 SHA1 e8f47132c2846dbf817ff8a7d059eb64b5c3630e SHA256 92f79364484d795549bf7e8c91406677286f0a8b4c748e34d0a65ffa6b09f5f7
+EBUILD opendbx-1.4.4.ebuild 1863 RMD160 25691da8a515448d827304597a6af00a9f0c4eb3 SHA1 3cdf6e65aaa13668a3d03bb85eb22eaa13d17a48 SHA256 a25b9e0ca7329bd8d5f2f6a32c339c6c67a0ae8d9a9df7eb03306114feca42ee
+MISC ChangeLog 4127 RMD160 a0ff433b6a6c1e2840997fe69749f20b5f9cb140 SHA1 8516ad05cf9d26c016cebc0a8e562d708e26b95a SHA256 befa5aabf703c19322b5c975b7dd5b944a80e3ef6572f38da4fb0dcae3d25b1a
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAknHsi4ACgkQI1lqEGTUzyTl/ACeL0VTs+thNfKoJMJOAQcEmmlX
-Y0EAoJToup92lx2MZlpVQZwQGs0pzjGJ
-=azjX
+iEYEARECAAYFAkr+irEACgkQI1lqEGTUzyREiQCgyG15aixOYYLNaRcI/P5FuO30
+zb4AoLC2vfR5d5cK8ts67W5h8jSrrN/C
+=PTqq
 -----END PGP SIGNATURE-----
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
+}