-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX apr-util-1.3.12-bdb-5.2.patch 5199 RMD160 ec3395485cc4f88b0bb191f9ef2cbeb49159606c SHA1 bb990d5d6e74eff65fef22e110792489e683dc7b SHA256 81339f327727775bb88a4530a620b0fd1f94d3fc4c0e65a810931acb638b7913
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
-MISC ChangeLog 20754 RMD160 72d75430ec44e18af4450bff6dcbd808b501c453 SHA1 879fd02764ca731cd4749f107ee28fd4557241cd SHA256 2cd3455916630c4b2a9411ad64e959193ac2e30ccae2b626856e5c2d456d027f
+EBUILD apr-util-1.3.12.ebuild 2564 RMD160 411f17d95cde1aae3a7eb9b5e30b6cd2c81e5be3 SHA1 abd0b1b22f1c8cd1e01bf067bf664281f1ef821b SHA256 e3feab85dbdc40952c51c7b1bc31fb38503a04174ec3cd1035cb1df832017beb
+MISC ChangeLog 20951 RMD160 a55ef5ec587640aba7bf7a4892fd9c38bd7398ed SHA1 9b66091092b2fd389a49ada491c28550030601cf SHA256 2b22a60437dffcdb330fd71fe84120be59729b1ffc2c07a0309d0c3535bed2ef
MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iQIcBAEBAgAGBQJNzuwQAAoJEE70JXb4HvNV6FUP/1GfdmPHbGO0xdJGIfSIMTqc
-N0MkI2B4zF/7/BqjOxleVfReP0RGSzsL3qSd+BZC6OBMfeJ0DvhEacu4Uc1rtNFm
-pCxf4pwrcW7YPCcpFU54FhOl6YXDPgitDAFthB6nONC6HN/A0jQcsDIraTAzJjY2
-PVnAnRLyP/70x/VCsHbsIXtKl/s0mBUjmG04oCMmJckXM8IaMZApx1ck7S0VcQe3
-GgDhz2DnFjs//QN24EMFQ2lnbGd6OER/Vey5fpEn1uxM/V1uM0pHTXtfGDuONYWJ
-QJU1kP4LA4QfifKy2BAU5NSEqpcFnzV2UGVssWFgoOtjRhxXVetPvciYqe0ge7ZQ
-xgbKCDaxbQGcch5TzUMYOWLaLBXXVIgVI3H4KbEvhoxaC8bzUAZOCppKqWb3wJZK
-+bESW6XjIvdLQtGWxslMwVMS2jolqcS1/E3hQVJmEDugelMwUzLzYPbjJ9mbExDg
-9U7uyfRBZTU7XPd60wew5GnbAgjeMLIxtMLYkq0W8BTfh9lM6Qube0aEewHODW6s
-3EgSUldgX4T3GdWK9KrcmozPJJYt62/pgWgPAk7p+HjeymHFo+BaT7IIYuD6C7PF
-nZayggKhD/uQ1TCKA7Bbeelx+nUpjr4P+UCgcs8l9J0gE6FWP0tGre/96go3GRFB
-95SAYOL7yvGcl7FTzThP
-=EdGg
+iEYEARECAAYFAk4zG8EACgkQdIssYB9vBoNHjgCeJQubIqrU0Z6hOdcfvx1ovHbI
+rYEAn2g+1xie7M6Y2J4ZyC1JcLQlk3S8
+=jxHg
-----END PGP SIGNATURE-----
--- /dev/null
+# 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 $
+
+EAPI="3"
+
+# 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"
+
+inherit autotools db-use eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+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"
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+ >=dev-libs/apr-${APR_PV}:1
+ berkdb? ( >=sys-libs/db-4 )
+ freetds? ( dev-db/freetds )
+ gdbm? ( sys-libs/gdbm )
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( =virtual/mysql-5* )
+ odbc? ( dev-db/unixODBC )
+ postgres? ( dev-db/postgresql-base )
+ sqlite? ( dev-db/sqlite:0 )
+ sqlite3? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-bdb-5.2.patch"
+ eautoreconf
+
+ elibtoolize
+}
+
+src_configure() {
+ local myconf
+
+ if use berkdb; then
+ local db_version
+ db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+ db_version="$(db_ver_to_slot "${db_version}")"
+ db_version="${db_version/\./}"
+ myconf+=" --with-dbm=db${db_version} --with-berkeley-db=$(db_includedir 2> /dev/null):/usr/$(get_libdir)"
+ else
+ myconf+=" --without-berkeley-db"
+ fi
+
+ econf --datadir=/usr/share/apr-util-1 \
+ --with-apr=/usr \
+ --with-expat=/usr \
+ $(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) \
+ ${myconf}
+}
+
+src_compile() {
+ emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+
+ if use doc; then
+ emake dox || die "emake dox failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ find "${ED}" -name "*.la" -print0 | xargs -0 rm -f
+ find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -print0 | xargs -0 rm -f
+
+ dodoc CHANGES NOTICE README
+
+ if use doc; then
+ dohtml -r docs/dox/html/* || die "dohtml failed"
+ fi
+
+ # 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"
+}
--- /dev/null
+--- build/dbm.m4
++++ build/dbm.m4
+@@ -579,6 +579,25 @@
+ apu_db_version=5
+ fi
+ ])
++dnl
++dnl APU_CHECK_DB52: is DB5.2 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN([APU_CHECK_DB52], [
++ places=$1
++ if test -z "$places"; then
++ places="std /usr/local/BerkeleyDB.5.2 /boot/home/config"
++ fi
++ APU_CHECK_BERKELEY_DB("5", "2", "-1",
++ "$places",
++ "db52/db.h db5/db.h db.h",
++ "db-5.2 db5-5.2 db52 db5 db"
++ )
++ if test "$apu_have_db" = "1"; then
++ apu_db_version=5
++ fi
++])
+
+ AC_DEFUN([APU_CHECK_DB], [
+ requested=$1
+@@ -681,6 +700,12 @@
+ AC_MSG_ERROR(Berkeley db5 not found)
+ fi
+ ;;
++ db52)
++ APU_CHECK_DB52("$check_places")
++ if test "$apu_db_version" != "5"; then
++ AC_MSG_ERROR(Berkeley db5 not found)
++ fi
++ ;;
+ default)
+ APU_CHECK_DB_ALL("$check_places")
+ ;;
+@@ -688,40 +713,43 @@
+ ])
+
+ dnl
+-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1.
+ dnl
+ AC_DEFUN([APU_CHECK_DB_ALL], [
+ all_places=$1
+
+- APU_CHECK_DB51("$all_places")
++ APU_CHECK_DB52("$all_places")
+ if test "$apu_db_version" != "5"; then
+- APU_CHECK_DB50("$all_places")
++ APU_CHECK_DB51("$all_places")
+ if test "$apu_db_version" != "5"; then
+- APU_CHECK_DB48("$all_places")
+- if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB47("$all_places")
++ APU_CHECK_DB50("$all_places")
++ if test "$apu_db_version" != "5"; then
++ APU_CHECK_DB48("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB46("$all_places")
++ APU_CHECK_DB47("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB45("$all_places")
++ APU_CHECK_DB46("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB44("$all_places")
++ APU_CHECK_DB45("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB43("$all_places")
++ APU_CHECK_DB44("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB42("$all_places")
++ APU_CHECK_DB43("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB41("$all_places")
++ APU_CHECK_DB42("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB4("$all_places")
++ APU_CHECK_DB41("$all_places")
+ if test "$apu_db_version" != "4"; then
+- APU_CHECK_DB3("$all_places")
+- if test "$apu_db_version" != "3"; then
+- APU_CHECK_DB2("$all_places")
+- if test "$apu_db_version" != "2"; then
+- APU_CHECK_DB1("$all_places")
+- if test "$apu_db_version" != "1"; then
+- APU_CHECK_DB185("$all_places")
++ APU_CHECK_DB4("$all_places")
++ if test "$apu_db_version" != "4"; then
++ APU_CHECK_DB3("$all_places")
++ if test "$apu_db_version" != "3"; then
++ APU_CHECK_DB2("$all_places")
++ if test "$apu_db_version" != "2"; then
++ APU_CHECK_DB1("$all_places")
++ if test "$apu_db_version" != "1"; then
++ APU_CHECK_DB185("$all_places")
++ fi
+ fi
+ fi
+ fi
+@@ -763,11 +791,11 @@
+ apu_db_version=0
+
+ AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
+- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])],
+ [
+ if test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52])
+ fi
+ requested="$withval"
+ ], [
+@@ -978,6 +1006,10 @@
+ apu_use_db=1
+ apu_default_dbm=db5
+ ;;
++ db52)
++ apu_use_db=1
++ apu_default_dbm=db5
++ ;;
+ default)
+ dnl ### use more sophisticated DBMs for the default?
+ apu_default_dbm="sdbm (default)"
+@@ -985,7 +1017,7 @@
+ ;;
+ *)
+ AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
+- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51])
++ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52])
+ ;;
+ esac
+
projects / gentoo.git / commitdiff