dev-libs/apr-util: Bump

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@378 6952d904-891a-0410-993b-d76249ca496b

dev-libs/apr-util/ChangeLog

@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2008; Mario Fetka <mario-fetka@gmx.at> +apr-util-1.2.12.patch,
+  +apr-util-1.3.0-r100.ebuild:
+  Bump
+
   19 Jan 2008; Mario Fetka <mario-fetka@gmx.at>
   +files/apr-util-ebuild-1.2.10-mozldap.patch, +apr-util-1.2.12-r100.ebuild:
   Bump

dev-libs/apr-util/Manifest

@@ -1,48 +1,19 @@
 AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c SHA1 1ee53d4de45c6dbc470ba3c2c408161fb16d1412 SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e
-MD5 f94b943915818150fb655d1fcd5beb07 files/apr-util-1.2.10-mozldap60-2.patch 4251
-RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c files/apr-util-1.2.10-mozldap60-2.patch 4251
-SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e files/apr-util-1.2.10-mozldap60-2.patch 4251
 AUX apr-util-1.2.8-mozldap60-1.patch 1141 RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 SHA1 de18b668862129214e8a101c0ea006398b35fb56 SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee
-MD5 1b69c0ee68c2f100dc9b77a5549c8079 files/apr-util-1.2.8-mozldap60-1.patch 1141
-RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 files/apr-util-1.2.8-mozldap60-1.patch 1141
-SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee files/apr-util-1.2.8-mozldap60-1.patch 1141
 AUX apr-util-ebuild-1.2.10-mozldap.patch 1832 RMD160 d2f28958e1a5b1273e4db0e01e5752ecf0f275ea SHA1 d879f46c7c11cae7db6b82eb5636d164c412fa7b SHA256 948b205764b6c31795f08cdc9a513669482ffe8eea7f1bc83d56090b13f45ed0
-MD5 fbcaebc91876391b4fb7b75ce7006224 files/apr-util-ebuild-1.2.10-mozldap.patch 1832
-RMD160 d2f28958e1a5b1273e4db0e01e5752ecf0f275ea files/apr-util-ebuild-1.2.10-mozldap.patch 1832
-SHA256 948b205764b6c31795f08cdc9a513669482ffe8eea7f1bc83d56090b13f45ed0 files/apr-util-ebuild-1.2.10-mozldap.patch 1832
 DIST apr-1.2.11.tar.gz 1114033 RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 SHA1 bde2c8b6e477752bcac4f387ac0de9671cd15d1a SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff
 DIST apr-1.2.12.tar.gz 1127522 RMD160 912c34e412b42e678288727b811ba35f03d07b6b SHA1 12ebc5ee6bba6b66b75e25ff8326fd2d2ad8f4ff SHA256 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead
 DIST apr-1.2.8.tar.gz 1107189 RMD160 299e1ddb1f7c9b0169a410e120c30abea38557c5 SHA1 b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a SHA256 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
+DIST apr-1.3.0.tar.gz 1145703 RMD160 1b392ce9335f6608102edbba162cc2e9924da6cf SHA1 5cccd027d43e94acf813ca627a3b0984520fe50a SHA256 1bf89994de9758061fdd304d5fe37971d5f2f9e95f587ba847ceb33e67f1d1f0
 DIST apr-util-1.2.10.tar.gz 654083 RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 SHA1 9e136a5492313a0eb3c50154a25da2c99dcabb1b SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47
 DIST apr-util-1.2.12.tar.gz 668292 RMD160 438528fe4d207dc2290de80ccbd2973266853f8a SHA1 7c0d929a3c0b328c257c916408bc2c9d47690fed SHA256 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
 DIST apr-util-1.2.8.tar.gz 646379 RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 SHA1 49260d98b863756974bd83cd28bc39338d4f3a82 SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
+DIST apr-util-1.3.0.tar.gz 746522 RMD160 f8ca262db8bc1d4d7b2a5ad992850d662f6a8241 SHA1 56114a5750cc76e1536bf3e000f9b710de2c70d0 SHA256 ccbbce2c06410a44b93259d7071dc25697c71410666c076feb7d6669960bcd8d
 DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919
 EBUILD apr-util-1.2.10-r99.ebuild 3070 RMD160 34451dfa4838d9434a2f682b58bd4b2fa3a9a94b SHA1 7643c830b012872dc315be6d5daadcbf86067f18 SHA256 3a6b89e665dd1fba7f444698867a082f02bf3da9db89383dd1c9cfbfd9a13a95
-MD5 b73dcab0779844fbe5928b0c76a8c22f apr-util-1.2.10-r99.ebuild 3070
-RMD160 34451dfa4838d9434a2f682b58bd4b2fa3a9a94b apr-util-1.2.10-r99.ebuild 3070
-SHA256 3a6b89e665dd1fba7f444698867a082f02bf3da9db89383dd1c9cfbfd9a13a95 apr-util-1.2.10-r99.ebuild 3070
 EBUILD apr-util-1.2.12-r100.ebuild 2845 RMD160 3574cc8b165acbcbc9b728cf79955cd3ffde9288 SHA1 0041f4b2dd5be2e6b57731c65ae678c8d59f2d8c SHA256 711aa0ff217bcf0a83ef8b992232d966dfffe639c29e71223f4d8a9d7df31fa0
-MD5 d9132d4a037b78c7c3916e4bc6490fb4 apr-util-1.2.12-r100.ebuild 2845
-RMD160 3574cc8b165acbcbc9b728cf79955cd3ffde9288 apr-util-1.2.12-r100.ebuild 2845
-SHA256 711aa0ff217bcf0a83ef8b992232d966dfffe639c29e71223f4d8a9d7df31fa0 apr-util-1.2.12-r100.ebuild 2845
 EBUILD apr-util-1.2.8-r99.ebuild 2390 RMD160 9bde7988e3a1de338050948518cf3987504e2bd6 SHA1 a26ed400b3f131b360e6bc91125bd3f078590fea SHA256 3159e97ff85978446dba74848ac7b85a477586ec1fc78a8da977eede653e2221
-MD5 a16a127e1f4d4de3534c852a7e8da474 apr-util-1.2.8-r99.ebuild 2390
+EBUILD apr-util-1.3.0-r100.ebuild 2844 RMD160 f76ee1b2036917970d3aed1952c9f76532e6cf0d SHA1 7794bd529c31eaef0cdbfab7e3b19441ad4329e2 SHA256 b690e67ffe8d1e65166b72af4e2703f2080190f629027bb002e6054af25cd17a
-RMD160 9bde7988e3a1de338050948518cf3987504e2bd6 apr-util-1.2.8-r99.ebuild 2390
+MISC ChangeLog 448 RMD160 52411a8851c97d07702761498cedff8c6600485a SHA1 cc811eb201c5805e58857e865021d597a518dde3 SHA256 0d7471e0dff08fe2db373ac6dc6944442d78e2acb8641c5bd0404b4a9b02fbd0
-SHA256 3159e97ff85978446dba74848ac7b85a477586ec1fc78a8da977eede653e2221 apr-util-1.2.8-r99.ebuild 2390
+MISC apr-util-1.2.12.patch 1956 RMD160 5a8c51326ce5910d6b0cc44870bb35ec125e0b5c SHA1 1c178321abe694d3dc9aa8aea842653c8cac8c34 SHA256 451df1c18c9a2bfdc7be521a18e09549c5680f317a6d11575037bbc0bbbfcb21
-MISC ChangeLog 337 RMD160 a5bdf36d213ed4d64a070cfb0a3e31ef94dfa20a SHA1 cd90ab6bcb8e4bfb04e6851d34920d25c030b447 SHA256 9aab164cf99f352cbeb51a2c2d37e62f125bd1a16f0617be7c47eb750abbe2c0
-MD5 cf45996c56f560c10a68106aa2ca2297 ChangeLog 337
-RMD160 a5bdf36d213ed4d64a070cfb0a3e31ef94dfa20a ChangeLog 337
-SHA256 9aab164cf99f352cbeb51a2c2d37e62f125bd1a16f0617be7c47eb750abbe2c0 ChangeLog 337
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
-MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
-RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
-SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 f67aba6d96594bf1faa4b5ff8f45aa29 files/digest-apr-util-1.2.10-r99 717
-RMD160 9d96fa70dd8c8cb92149a713d0f790ca2b03b156 files/digest-apr-util-1.2.10-r99 717
-SHA256 b10027b2194f7bdbd55d5acf3199840ed09da8dad35100d36fbe1664b8d9cede files/digest-apr-util-1.2.10-r99 717
-MD5 b11a32c67b0f943f0b3b73b9db4a32ed files/digest-apr-util-1.2.12-r100 482
-RMD160 206c773f17d3993889ea603f93c3e224f2d2416f files/digest-apr-util-1.2.12-r100 482
-SHA256 0c8781f111aed19f682e7a804f954776fc0728a06bc141cd5c4d506601551ea7 files/digest-apr-util-1.2.12-r100 482
-MD5 a370b4eedd72b270820f53bdaad70cd7 files/digest-apr-util-1.2.8-r99 711
-RMD160 307be2c9b20be5df35eb35bdd0a9de35ead82a88 files/digest-apr-util-1.2.8-r99 711
-SHA256 9a4af4640885ebd660f0ba90f3b00c03b7c7ec7fc2adc44e95d803e9868bcf09 files/digest-apr-util-1.2.8-r99 711

dev-libs/apr-util/apr-util-1.2.12.patch

@@ -0,0 +1,58 @@
+--- /usr/portage/dev-libs/apr-util/apr-util-1.2.12.ebuild	2008-06-01 14:06:34.000000000 +0200
++++ apr-util-1.3.0-r100.ebuild	2008-01-19 19:41:41.000000000 +0100
+@@ -12,24 +12,37 @@
+ LICENSE="Apache-2.0"
+ SLOT="1"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+-IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
++IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
+ RESTRICT="test"
+ 
+-RDEPEND="dev-libs/expat
++DEPEND="dev-libs/expat
+ 	>=dev-libs/apr-${PV}
+ 	berkdb? ( =sys-libs/db-4* )
++	doc? ( app-doc/doxygen )
+ 	gdbm? ( sys-libs/gdbm )
+ 	ldap? ( =net-nds/openldap-2* )
++	mozldap? ( =dev-libs/mozldap-6*
++		   =dev-libs/nspr-4*
++		   =dev-libs/nss-3* )
+ 	mysql? ( =virtual/mysql-5* )
+-	postgres? ( virtual/postgresql-base )
++	postgres? ( dev-db/libpq )
+ 	sqlite? ( =dev-db/sqlite-2* )
+ 	sqlite3? ( =dev-db/sqlite-3* )"
+-DEPEND="${RDEPEND}
+-	doc? ( app-doc/doxygen )"
++
++pkg_setup() {
++        if use ldap && use mozldap ; then
++                eerror "you cant activate ldap & mozldap at the same time "
++                eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
++                eerror "\"etc/portage/package.use\" ;p"
++                die "ldap and mozldap USE conflict"
++        fi
++}
+ 
+ src_unpack() {
+ 	unpack ${A}
+ 	cd "${S}"
++	
++	epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
+ 
+ 	./buildconf --with-apr=../apr-${PV} || die "buildconf failed"
+ 	elibtoolize || die "elibtoolize failed"
+@@ -40,6 +53,12 @@
+ 
+ 	use ldap && myconf="${myconf} --with-ldap"
+ 
++	use mozldap && myconf="${myconf} --with-ldap \
++					 --with-ldap-include=/usr/include/mozldap/ \
++					 --with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
++					 --with-nss-lib=/usr/$(get_libdir)/nss/ \
++					 --with-nspr-lib=/usr/$(get_libdir)/nspr"
++
+ 	if use berkdb; then
+ 		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+ 		dbver="$(db_ver_to_slot "$dbver")"

dev-libs/apr-util/apr-util-1.3.0-r100.ebuild

@@ -0,0 +1,101 @@
+# Copyright 1999-2008 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.0.ebuild,v 1.1 2008/06/11 19:14:22 hollow Exp $
+
+inherit autotools eutils flag-o-matic libtool db-use
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.gz
+	mirror://apache/apr/apr-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	>=dev-libs/apr-${PV}
+	berkdb? ( =sys-libs/db-4* )
+	doc? ( app-doc/doxygen )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )
+	mozldap? ( =dev-libs/mozldap-6*
+		   =dev-libs/nspr-4*
+		   =dev-libs/nss-3* )
+	mysql? ( =virtual/mysql-5* )
+	postgres? ( dev-db/libpq )
+	sqlite? ( =dev-db/sqlite-2* )
+	sqlite3? ( =dev-db/sqlite-3* )"
+
+pkg_setup() {
+        if use ldap && use mozldap ; then
+                eerror "you cant activate ldap & mozldap at the same time "
+                eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
+                eerror "\"etc/portage/package.use\" ;p"
+                die "ldap and mozldap USE conflict"
+        fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	
+	epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
+
+	./buildconf --with-apr=../apr-${PV} || die "buildconf failed"
+	elibtoolize || die "elibtoolize failed"
+}
+
+src_compile() {
+	local myconf=""
+
+	use ldap && myconf="${myconf} --with-ldap"
+
+	use mozldap && myconf="${myconf} --with-ldap \
+					 --with-ldap-include=/usr/include/mozldap/ \
+					 --with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
+					 --with-nss-lib=/usr/$(get_libdir)/nss/ \
+					 --with-nspr-lib=/usr/$(get_libdir)/nspr"
+
+	if use berkdb; then
+		dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
+		dbver="$(db_ver_to_slot "$dbver")"
+		dbver="${dbver/\./}"
+		myconf="${myconf} --with-dbm=db${dbver}
+		--with-berkeley-db=$(db_includedir):/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	econf --datadir=/usr/share/apr-util-1 \
+		--with-apr=/usr \
+		--with-expat=/usr \
+		$(use_with gdbm) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite2) \
+		$(use_with sqlite3) \
+		${myconf}
+
+	emake || die "emake failed!"
+
+	if use doc; then
+		emake dox || die "emake dox failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc CHANGES NOTICE
+
+	if use doc; then
+		dohtml 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 kill it
+	rm "${D}"/usr/$(get_libdir)/aprutil.exp
+}