Drop the sqlite2 useflag, keep only sqlite3 around.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 361d537ff988fb03b00d557d895d17024e654799..1bddad6e766764d12f2da5eac218fc25ba884594 100644 (file)
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.163 2011/07/29 20:43:44 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.164 2011/09/09 14:40:50 scarabeus Exp $
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> apr-util-1.3.12.ebuild:
+  Drop the sqlite2 useflag, keep only sqlite3 around.
 
 *apr-util-1.3.12 (29 Jul 2011)
 

diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 7377794aab15b2e4e7af2a39d2e0369197d32ead..ab304c29547864d35e1ed61caede395460232807 100644 (file)
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -5,13 +5,23 @@ AUX apr-util-1.3.12-bdb-5.2.patch 5199 RMD160 ec3395485cc4f88b0bb191f9ef2cbeb491
 DIST apr-util-1.3.11.tar.bz2 607486 RMD160 5b745baf523b99c8fa0501deab4f00d86ca050e5 SHA1 dc71af7684f76d56f06b4fc8763a8606bd861e84 SHA256 13b8446c5ff96ed32293db77689992db18addb1a76d0f6dae29f132dc96dab59
 DIST apr-util-1.3.12.tar.bz2 607646 RMD160 c23f9e8f312edbb4c484c839c071648c79a00140 SHA1 4902165fc5f2f077afbcc7ddf7ebbf61556a1cda SHA256 93976dc2f40d8622c4e9c355f419bb20f2c0dd843ee21a295a092d1c1b950d9c
 EBUILD apr-util-1.3.11.ebuild 2510 RMD160 599ee97079645aef1ef2eeec3707c43ff020aa22 SHA1 e6ccaee867d6183e41a16b7d82518dbb88035e1c SHA256 0cb438b545963fbc89b0305265296ef9d2e512e6e9a270bd97689aa36840f210
-EBUILD apr-util-1.3.12.ebuild 2564 RMD160 411f17d95cde1aae3a7eb9b5e30b6cd2c81e5be3 SHA1 abd0b1b22f1c8cd1e01bf067bf664281f1ef821b SHA256 e3feab85dbdc40952c51c7b1bc31fb38503a04174ec3cd1035cb1df832017beb
-MISC ChangeLog 20951 RMD160 a55ef5ec587640aba7bf7a4892fd9c38bd7398ed SHA1 9b66091092b2fd389a49ada491c28550030601cf SHA256 2b22a60437dffcdb330fd71fe84120be59729b1ffc2c07a0309d0c3535bed2ef
+EBUILD apr-util-1.3.12.ebuild 2463 RMD160 c3d63f49bb089f625bc1f689c1218a9f313182ae SHA1 e5a0391a899bf2d7fab45c2d9ba58a11611716ed SHA256 e3c5f3c8dcbb7652a86dfee868711a66968538277484d18267b54c5f8b8c760c
+MISC ChangeLog 21085 RMD160 3d7a99d70e8a09926e9ddce68fa88c88828fba8b SHA1 c481cecb0871fd4308e83293aa7ea9c38a1304bd SHA256 a824e3e3403e0c2599c2081e45f67e58f7e682c3d9b1ff63974484d4dceef134
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4zG8EACgkQdIssYB9vBoNHjgCeJQubIqrU0Z6hOdcfvx1ovHbI
-rYEAn2g+1xie7M6Y2J4ZyC1JcLQlk3S8
-=jxHg
+iQIcBAEBAgAGBQJOaiWFAAoJEOSiRoyO7jvoQ00QAKdX1HVyeyK/g0UC/wkzW0jJ
+BuC7SuA8rBBwqUmWvXz45Fl52KOfRB69B+kN9g/BYS5rg6Pv0/mYJ9Y+xE3m/N+o
+0eTsBBtrOhSEJ1uGQBY23qWRb5P4KMQFe1WZhcZJphAgfVa1RNE6cVLQwuvlXYxD
+MN2oQsEAESi6p6P+WMMaPvjBkuEVaZ9wZ/fCFdwJ6AWgnki9hr2rH/6RfvBZNwnc
+fw4AsTENRnjUKerUSsVLc2SSufy3XPaTzARi+l+wm9wi5IdJrYR3t4TjgEeJa58d
+Wn/UruM8kzUZsLrh7uDxECkA0jCgwli1BTpeip+yQOjrMsRbdP6nWB6re76GuvJ0
+EXOS1F/g4l93GzJlI2TIYUEyaOfCN4TjZuqjwXmuqGpmcBbfKsbUDFkCjSOlqdqM
+dIeC8i8EXW208sXLm37hbIotwqXFQnM/e8JUSgXFBPVlxlrWvP5x75w/XA2q1KDK
+kZ4jQXjX9t0sHCg92PsowKDJ/x3Tv5UDuHcGvg3Ypnv7WgxCFaKeSk5ZWh2ALvxI
+9zPoX4i8DWej0x5es0YLcwR90jo0iewZAs8M2w3hmlAZIe6ED1FSFgWSTAEagESI
+JuWmdGNZtCQhswRjchwev83xV+6BxdnBShXaJHhAcdIImXPvpo/m6s1HEiQ42D6Z
+3hyt/fC9Q3kVOFmiH2mL
+=hSa9
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/apr-util/apr-util-1.3.12.ebuild b/dev-libs/apr-util/apr-util-1.3.12.ebuild
index 41bc6a6c7b2a9e66b250da9ae9c7870dd880dade..79789c6123e349f02bcb960ada7973426793acd1 100644 (file)
--- a/dev-libs/apr-util/apr-util-1.3.12.ebuild
+++ b/dev-libs/apr-util/apr-util-1.3.12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.12.ebuild,v 1.1 2011/07/29 20:43:44 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.12.ebuild,v 1.2 2011/09/09 14:40:50 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
 # Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
 # APR_PV="${PV}"
-APR_PV="1.4.4"
+APR_PV="1.4.5"
 
 inherit autotools db-use eutils libtool multilib
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3"
+IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite"
 RESTRICT="test"
 
 RDEPEND="dev-libs/expat
@@ -29,11 +29,12 @@ RDEPEND="dev-libs/expat
        mysql? ( =virtual/mysql-5* )
        odbc? ( dev-db/unixODBC )
        postgres? ( dev-db/postgresql-base )
-       sqlite? ( dev-db/sqlite:0 )
-       sqlite3? ( dev-db/sqlite:3 )"
+       sqlite? ( dev-db/sqlite:3 )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
+DOCS=( CHANGES NOTICE README )
+
 src_prepare() {
        epatch "${FILESDIR}/${P}-bdb-5.2.patch"
        eautoreconf
@@ -54,17 +55,18 @@ src_configure() {
                myconf+=" --without-berkeley-db"
        fi
 
-       econf --datadir=/usr/share/apr-util-1 \
+       econf \
+               --datadir=/usr/share/apr-util-1 \
                --with-apr=/usr \
                --with-expat=/usr \
+               --without-sqlite2 \
                $(use_with freetds) \
                $(use_with gdbm) \
                $(use_with ldap) \
                $(use_with mysql) \
                $(use_with odbc) \
                $(use_with postgres pgsql) \
-               $(use_with sqlite sqlite2) \
-               $(use_with sqlite3) \
+               $(use_with sqlite sqlite3) \
                ${myconf}
 }
 
@@ -77,12 +79,12 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       default
 
-       find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
-       find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -print0 | xargs -0 rm -f
+       # --disable-static does not work
+       find "${ED}" -name "*.a" -exec rm -f {} +
 
-       dodoc CHANGES NOTICE README
+       find "${ED}" -name '*.la' -exec rm -f {} +
 
        if use doc; then
                dohtml -r docs/dox/html/* || die "dohtml failed"
@@ -90,5 +92,5 @@ src_install() {
 
        # This file is only used on AIX systems, which Gentoo is not,
        # and causes collisions between the SLOTs, so remove it.
-       rm -f "${D}usr/$(get_libdir)/aprutil.exp"
+       rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
 }