[gentoo-commits] dev/lordvan:master commit in: dev-db/libzdb/

["Thomas Raschbacher" <lordvan@gentoo.org>]

commit:     940584e77772316fe5876e650654315014f9d7f7
Author:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 19:36:55 2012 +0000
Commit:     Thomas Raschbacher <lordvan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 19:36:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/lordvan.git;a=commit;h=940584e7

update

---
 dev-db/libzdb/ChangeLog            |    7 ++-
 dev-db/libzdb/Manifest             |    4 +-
 dev-db/libzdb/libzdb-2.10.3.ebuild |  110 ++++++++++++++++++++++++++---------
 dev-db/libzdb/metadata.xml         |    3 -
 4 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/dev-db/libzdb/ChangeLog b/dev-db/libzdb/ChangeLog
index 009eb28..a2812aa 100644
--- a/dev-db/libzdb/ChangeLog
+++ b/dev-db/libzdb/ChangeLog
@@ -1,3 +1,8 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# ChangeLog for dev-db/libzdb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+
+  10 Jun 2012; <lordvan@gentoo.org> libzdb-2.10.3.ebuild, metadata.xml:
+  using parts from ebuild from bug #251063 by Johan Bergström
+  <bugs@bergstroem.nu>
+

diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index ae6297a..d25cbaa 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -1,4 +1,4 @@
 DIST libzdb-2.10.3.tar.gz 600834 RMD160 2cf65d92918328e67e84060dd35c29ae3be38aac SHA1 c32a444312b572415c1ca49f1bf9eb4398f9339d SHA256 8716d2cb3563478228f33de43e89857b3d190576be36a1f490dc245ffe60f959
-EBUILD libzdb-2.10.3.ebuild 1293 RMD160 37c22861eb60cfda07f0c16196f43bcae2e21c1e SHA1 92424f9703d4f7110f8dbb7ff45aa3337a4f68ba SHA256 cd4967026e8b2e312618d176d57f01eaea9f5b136956889bbfc47bf9850474e5
+EBUILD libzdb-2.10.3.ebuild 2064 RMD160 a17edc82cd039fe4711b7815b2e61c65cef81621 SHA1 d69240e42a6870b1e552908f6d66f913a987b590 SHA256 62ee8f1cd2513f486d9d093ffe0831002bf623aed368a95f84aa228b945e4e46
 MISC ChangeLog 125 RMD160 33398507482a907355435f379e0d8e13e3d3314b SHA1 f2417f420030236ab56cca59df179114b1213c47 SHA256 a668507e99769b34a293a386118f0bef821f70a8cd3c196d9cdf2f9777364cdc
-MISC metadata.xml 300 RMD160 781722844f01878ee05797ed8c29966ccff0fa62 SHA1 a2e961587595d678641aeb82c25389a2677e099a SHA256 6bbe3cc33be24180719ba61b9a79ed7a0c40a829baf9cbe1d881443571d07481
+MISC metadata.xml 225 RMD160 281fb20ded6c063a9fdc266bf255233cae6ddd71 SHA1 5ec9df97bdc3a6de17905dd000bc5e47f7e3e7c4 SHA256 2fc398b00dba79b9268048e3ba91d0fa96012273d4d26622d2af4ae45d668a10

diff --git a/dev-db/libzdb/libzdb-2.10.3.ebuild b/dev-db/libzdb/libzdb-2.10.3.ebuild
index 67210a5..22d26b9 100644
--- a/dev-db/libzdb/libzdb-2.10.3.ebuild
+++ b/dev-db/libzdb/libzdb-2.10.3.ebuild
@@ -1,41 +1,93 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI=4
 
-inherit eutils
-DESCRIPTION="This is a sample skeleton ebuild file"
-HOMEPAGE="http://tildeslash.com/libzdb/"
-SRC_URI="http://tildeslash.com/${PN}/dist/${P}.tar.gz"
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A thread safe high level multi-database connection pool library"
+HOMEPAGE="http://www.tildeslash.com/libzdb/"
+SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 amd64"
-# Disabling oracle interface for now as I am not sure as to which client lib is needed
-# and I have no system to test this on
-#oci8 )"
-IUSE="postgres mysql +sqlite openssl" #oci8
+KEYWORDS="~x86 ~amd64"
+IUSE="debug doc mysql postgres +sqlite ssl static-libs"
 REQUIRED_USE=" || ( postgres mysql sqlite )"
-DEPEND="postgres? ( >=dev-db/postgresql-base-8.0 )
-	mysql? ( >=virtual/mysql-4.1 )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	openssl? ( dev-libs/openssl )"
 
-RDEPEND="${DEPEND}"
-#S=${WORKDIR}/${P}
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite[unlock-notify] )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/libtool
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
+}
 
 src_configure() {
-#  REQUIRED_USE should take care of this
-#    if ! use postgres && ! use mysql && ! use sqlite && ! use oci8; then
-#	die "Need to have at least one Database backend enabled"
-#    fi
-#if --enable-protected gives trouble with gcc 3.x please let me know
-# should we enable --enable-optimized ?
-# should we support --enable-sqliteunlock ? required SQLite >= 3.6.12
+	## TODO: check what --enable-optimized actually does
+	## TODO: find someone with oracle db to add oci8 support
+	myconf=""
+	if  [[ $(gcc-version) < 4.1 ]];then
+		myconf="${myconf} --disable-protected"
+	else
+		myconf="${myconf} --enable-protected"
+	fi
+
+	if ( use sqlite ); then
+		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
+		if has_version 'dev-db/sqlite[unlock-notify]'; then
+			myconf="${myconf} --enable-sqliteunlock"
+		fi
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use postgres; then
+		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
+	else
+		myconf="${myconf} --without-postgresql"
+	fi
+
 	econf \
-		--enable-protected \
-		$(use_with postgres postgresql) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_enable openssl)
-#		$(use_with oci8 oci)
+		$(use_enable debug profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl) \
+		--without-oci \
+		${myconf}
+}
+
+src_compile() {
+	default_src_compile
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the --disable-static flag only skips .a
+	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
+
+	dodoc AUTHORS CHANGES README
+	if use doc;then
+		dohtml -r "${S}/doc/api-docs"/*
+	fi
+}
+
+src_test() {
+	emake verify
 }

diff --git a/dev-db/libzdb/metadata.xml b/dev-db/libzdb/metadata.xml
index 8c882c3..14490a9 100644
--- a/dev-db/libzdb/metadata.xml
+++ b/dev-db/libzdb/metadata.xml
@@ -5,7 +5,4 @@
 <maintainer>
 	<email>lordvan@gentoo.org</email>
 </maintainer>
-<use>
-	<flag name="openssl">Enable SSL support using OpenSSL</flag>
-</use>
 </pkgmetadata>