From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SdnxB-00013w-Bo for garchives@archives.gentoo.org; Sun, 10 Jun 2012 19:37:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8A84E0369; Sun, 10 Jun 2012 19:37:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 898AFE0369 for ; Sun, 10 Jun 2012 19:37:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C55BB1B4011 for ; Sun, 10 Jun 2012 19:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3309FE542E for ; Sun, 10 Jun 2012 19:37:21 +0000 (UTC) From: "Thomas Raschbacher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Raschbacher" Message-ID: <1339357015.940584e77772316fe5876e650654315014f9d7f7.lordvan@gentoo> Subject: [gentoo-commits] dev/lordvan:master commit in: dev-db/libzdb/ X-VCS-Repository: dev/lordvan X-VCS-Files: dev-db/libzdb/ChangeLog dev-db/libzdb/Manifest dev-db/libzdb/libzdb-2.10.3.ebuild dev-db/libzdb/metadata.xml X-VCS-Directories: dev-db/libzdb/ X-VCS-Committer: lordvan X-VCS-Committer-Name: Thomas Raschbacher X-VCS-Revision: 940584e77772316fe5876e650654315014f9d7f7 X-VCS-Branch: master Date: Sun, 10 Jun 2012 19:37:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aba3173e-0a97-46f5-84d4-33f49c20debe X-Archives-Hash: d5ce106168ca74b91331102b5ef790f2 commit: 940584e77772316fe5876e650654315014f9d7f7 Author: Thomas Raschbacher gentoo org> AuthorDate: Sun Jun 10 19:36:55 2012 +0000 Commit: Thomas Raschbacher gentoo org> CommitDate: Sun Jun 10 19:36:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/lordvan.git;a=3D= commit;h=3D940584e7 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 / +# ChangeLog for dev-db/libzdb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + + 10 Jun 2012; libzdb-2.10.3.ebuild, metadata.xml: + using parts from ebuild from bug #251063 by Johan Bergstr=C3=B6m + + 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 2cf65d92918328e67e84060dd35c29ae= 3be38aac SHA1 c32a444312b572415c1ca49f1bf9eb4398f9339d SHA256 8716d2cb356= 3478228f33de43e89857b3d190576be36a1f490dc245ffe60f959 -EBUILD libzdb-2.10.3.ebuild 1293 RMD160 37c22861eb60cfda07f0c16196f43bca= e2e21c1e SHA1 92424f9703d4f7110f8dbb7ff45aa3337a4f68ba SHA256 cd4967026e8= b2e312618d176d57f01eaea9f5b136956889bbfc47bf9850474e5 +EBUILD libzdb-2.10.3.ebuild 2064 RMD160 a17edc82cd039fe4711b7815b2e61c65= cef81621 SHA1 d69240e42a6870b1e552908f6d66f913a987b590 SHA256 62ee8f1cd25= 13f486d9d093ffe0831002bf623aed368a95f84aa228b945e4e46 MISC ChangeLog 125 RMD160 33398507482a907355435f379e0d8e13e3d3314b SHA1 = f2417f420030236ab56cca59df179114b1213c47 SHA256 a668507e99769b34a293a3861= 18f0bef821f70a8cd3c196d9cdf2f9777364cdc -MISC metadata.xml 300 RMD160 781722844f01878ee05797ed8c29966ccff0fa62 SH= A1 a2e961587595d678641aeb82c25389a2677e099a SHA256 6bbe3cc33be24180719ba6= 1b9a79ed7a0c40a829baf9cbe1d881443571d07481 +MISC metadata.xml 225 RMD160 281fb20ded6c063a9fdc266bf255233cae6ddd71 SH= A1 5ec9df97bdc3a6de17905dd000bc5e47f7e3e7c4 SHA256 2fc398b00dba79b9268048= e3ba91d0fa96012273d4d26622d2af4ae45d668a10 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=3D4 =20 -inherit eutils -DESCRIPTION=3D"This is a sample skeleton ebuild file" -HOMEPAGE=3D"http://tildeslash.com/libzdb/" -SRC_URI=3D"http://tildeslash.com/${PN}/dist/${P}.tar.gz" +EAPI=3D"4" + +inherit eutils toolchain-funcs + +DESCRIPTION=3D"A thread safe high level multi-database connection pool l= ibrary" +HOMEPAGE=3D"http://www.tildeslash.com/libzdb/" +SRC_URI=3D"http://www.tildeslash.com/${PN}/dist/${P}.tar.gz" + LICENSE=3D"GPL-3" SLOT=3D"0" -KEYWORDS=3D"~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=3D"postgres mysql +sqlite openssl" #oci8 +KEYWORDS=3D"~x86 ~amd64" +IUSE=3D"debug doc mysql postgres +sqlite ssl static-libs" REQUIRED_USE=3D" || ( postgres mysql sqlite )" -DEPEND=3D"postgres? ( >=3Ddev-db/postgresql-base-8.0 ) - mysql? ( >=3Dvirtual/mysql-4.1 ) - sqlite? ( >=3Ddev-db/sqlite-3.0 ) - openssl? ( dev-libs/openssl )" =20 -RDEPEND=3D"${DEPEND}" -#S=3D${WORKDIR}/${P} +RDEPEND=3D"mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( dev-db/sqlite[unlock-notify] ) + ssl? ( dev-libs/openssl )" +DEPEND=3D"${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 +} =20 src_configure() { -# REQUIRED_USE should take care of this -# if ! use postgres && ! use mysql && ! use sqlite && ! use oci8; the= n -# 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 >=3D 3.6.12 + ## TODO: check what --enable-optimized actually does + ## TODO: find someone with oracle db to add oci8 support + myconf=3D"" + if [[ $(gcc-version) < 4.1 ]];then + myconf=3D"${myconf} --disable-protected" + else + myconf=3D"${myconf} --enable-protected" + fi + + if ( use sqlite ); then + myconf=3D"${myconf} --with-sqlite=3D${EPREFIX}/usr/" + if has_version 'dev-db/sqlite[unlock-notify]'; then + myconf=3D"${myconf} --enable-sqliteunlock" + fi + else + myconf=3D"${myconf} --without-sqlite" + fi + + if use mysql; then + myconf=3D"${myconf} --with-mysql=3D${EPREFIX}/usr/bin/mysql_config" + else + myconf=3D"${myconf} --without-mysql" + fi + + if use postgres; then + myconf=3D"${myconf} --with-postgresql=3D${EPREFIX}/usr/bin/pg_config" + else + myconf=3D"${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=3D"${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 @@ lordvan@gentoo.org - - Enable SSL support using OpenSSL -