diff options
| author |   Michael Stewart <vericgar@gentoo.org> | 2006-01-05 05:01:13 +0000 |
|---|---|---|
| committer | Michael Stewart <vericgar@gentoo.org> | 2006-01-05 05:01:13 +0000 |
| commit | 964d2bd26926048e10bf17af22a8522322e80ee9 (patch) | |
| tree | d6c81611819de44a4c18aa4a496ba13c26e3aa18 /dev-libs/apr-util | |
| parent | Version bump for Bertrand Jacquin. (diff) | |
| download | gentoo-2-964d2bd26926048e10bf17af22a8522322e80ee9.tar.gz gentoo-2-964d2bd26926048e10bf17af22a8522322e80ee9.tar.bz2 gentoo-2-964d2bd26926048e10bf17af22a8522322e80ee9.zip | |
Correctly honor our USE-flags. Fixes bug 116980
(Portage version: 2.0.53)
Diffstat (limited to 'dev-libs/apr-util')
| -rw-r--r-- | dev-libs/apr-util/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/apr-util/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/apr-util/apr-util-0.9.7.ebuild | 34 |
3 files changed, 26 insertions, 25 deletions
diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 634a390ea8bc..dde929a6c5be 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/apr-util -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.36 2005/10/22 21:07:32 vericgar Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.37 2006/01/05 05:01:13 vericgar Exp $ + + 05 Jan 2006; Michael Stewart <vericgar@gentoo.org> apr-util-0.9.7.ebuild: + Correctly honor our USE-flags. Fixes bug 116980 *apr-util-0.9.7 (22 Oct 2005) diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index db1af2936532..719ca4bf8676 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -1,9 +1,9 @@ -MD5 dd7a1e553266c5f63acbc12744899f4a apr-util-0.9.7.ebuild 1958 MD5 12fbb66a73743778706897a2942babd9 ChangeLog 4651 -MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226 -MD5 eb1e072b34afd26a02d5673d81dd0046 apr-util-1.1.2.ebuild 1910 MD5 069b36180a4df1925f6d6b7ab8eed362 apr-util-0.9.6-r2.ebuild 2036 -MD5 6bf0076ded392d07180f520a63f5cb66 files/digest-apr-util-0.9.7 66 -MD5 c46881efc10b92ab7b6189cdc9070929 files/digest-apr-util-1.1.2 66 +MD5 7e442f507d9197bf343128249fb78ad1 apr-util-0.9.7.ebuild 1870 +MD5 eb1e072b34afd26a02d5673d81dd0046 apr-util-1.1.2.ebuild 1910 MD5 5c39070c5a30db4f82b9373cadee4c45 files/apr-util-0.9.x-161086:161087.patch 4671 MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r2 66 +MD5 6bf0076ded392d07180f520a63f5cb66 files/digest-apr-util-0.9.7 66 +MD5 c46881efc10b92ab7b6189cdc9070929 files/digest-apr-util-1.1.2 66 +MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226 diff --git a/dev-libs/apr-util/apr-util-0.9.7.ebuild b/dev-libs/apr-util/apr-util-0.9.7.ebuild index f4a86a4cf29e..a5f5e62a220a 100644 --- a/dev-libs/apr-util/apr-util-0.9.7.ebuild +++ b/dev-libs/apr-util/apr-util-0.9.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.7.ebuild,v 1.1 2005/10/22 21:07:32 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.7.ebuild,v 1.2 2006/01/05 05:01:13 vericgar Exp $ inherit eutils @@ -16,38 +16,36 @@ RESTRICT="test" DEPEND="dev-libs/expat ~dev-libs/apr-0.9.7 - berkdb? ( sys-libs/db ) + berkdb? ( =sys-libs/db-4* ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* )" -src_unpack() { - unpack ${A} || die "unpack" +src_compile() { - cd ${S} || die -} + elibtoolize || die "elibtoolize failed" -src_compile() { local myconf="" - if use ldap; then - myconf="${myconf} --with-ldap" - fi + + use ldap && myconf="${myconf} --with-ldap" + myconf="${myconf} $(use_with gdbm)" if use berkdb; then - if has_version '=sys-libs/db-4.2*'; then + if has_version '=sys-libs/db-4.3*'; then + myconf="${myconf} --with-dbm=db43 + --with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)" + elif has_version '=sys-libs/db-4.2*'; then myconf="${myconf} --with-dbm=db42 --with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)" elif has_version '=sys-libs/db-4*'; then myconf="${myconf} --with-dbm=db4 --with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)" - elif has_version '=sys-libs/db-3*'; then - myconf="${myconf} --with-dbm=db3 - --with-berkeley-db=/usr/include/db3:/usr/$(get_libdir)" - elif has_version '=sys-libs/db-2'; then - myconf="${myconf} --with-dbm=db2 - --with-berkely-db=/usr/include/db2:/usr/$(get_libdir)" fi + else + myconf="${myconf} --without-berkeley-db" fi + echo "DEBUG: myconf: ${myconf}" + econf \ --datadir=/usr/share/apr-util-0 \ --with-apr=/usr \ |