fix #188485

Package-Manager: portage-2.1.3.7

3 files changed, 26 insertions, 14 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index 10135c67c1b4..19e8a945363a 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.96 2007/09/08 20:06:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.97 2007/09/09 07:14:48 hollow Exp $
+
+  09 Sep 2007; Benedikt Böhm <hollow@gentoo.org> apr-util-1.2.10.ebuild:
+  fix #188485
 
 *apr-util-1.2.10 (08 Sep 2007)
 
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index a5685ca56c7e..6ad94f78fba2 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -28,10 +28,10 @@ EBUILD apr-util-0.9.13.ebuild 2044 RMD160 c48d4f631c75dfccd73250615379d8d056b852
 MD5 d100cc02c9f6af3ab98038817c64bd22 apr-util-0.9.13.ebuild 2044
 RMD160 c48d4f631c75dfccd73250615379d8d056b8523d apr-util-0.9.13.ebuild 2044
 SHA256 361685efa8dac8b66f776b6fe905fb0d2515d2ea4b12931159205544a41722a6 apr-util-0.9.13.ebuild 2044
-EBUILD apr-util-1.2.10.ebuild 2206 RMD160 4e52fca37ef7963b1c1e60cbf0188ce25e6723bd SHA1 70bbaa59230fec069639cc60e0555175c175ef78 SHA256 733f8a64ca03d0ea715eed4e727423b08ca55009cea51de4a15a385cf0ac0467
-MD5 99fbfe425f749709a43f36075f790be4 apr-util-1.2.10.ebuild 2206
-RMD160 4e52fca37ef7963b1c1e60cbf0188ce25e6723bd apr-util-1.2.10.ebuild 2206
-SHA256 733f8a64ca03d0ea715eed4e727423b08ca55009cea51de4a15a385cf0ac0467 apr-util-1.2.10.ebuild 2206
+EBUILD apr-util-1.2.10.ebuild 2351 RMD160 8a070720510d693a5e5452b135d39d8f3c1f1d7e SHA1 9ee3f83d37d2f5f88a2ec303a5757102440ea51b SHA256 f167a2f1cad6b186507d17bf4b1d5be4bf9a3f784bfe07ecd7a0d144ab9a3ff6
+MD5 f12767ab68df65b6cc2af0c34265c804 apr-util-1.2.10.ebuild 2351
+RMD160 8a070720510d693a5e5452b135d39d8f3c1f1d7e apr-util-1.2.10.ebuild 2351
+SHA256 f167a2f1cad6b186507d17bf4b1d5be4bf9a3f784bfe07ecd7a0d144ab9a3ff6 apr-util-1.2.10.ebuild 2351
 EBUILD apr-util-1.2.8-r1.ebuild 2186 RMD160 b2a997a8d612552174891e892dd05a6aede75b52 SHA1 6c1421d5f541ce3b1704e2919349c3115da99f72 SHA256 a84d0f169f7ef818b0a502dc94bfdde8dc3d4a76e8592b004d2ebf307e214e47
 MD5 c330c6464d269b8c5c6aff58e850eb0a apr-util-1.2.8-r1.ebuild 2186
 RMD160 b2a997a8d612552174891e892dd05a6aede75b52 apr-util-1.2.8-r1.ebuild 2186
@@ -40,10 +40,10 @@ EBUILD apr-util-1.2.8.ebuild 1851 RMD160 ee4dad63cf225a5af084bf9d4e019f6b71155e8
 MD5 cc4ee40706b1a4e48c48352f411fc481 apr-util-1.2.8.ebuild 1851
 RMD160 ee4dad63cf225a5af084bf9d4e019f6b71155e8d apr-util-1.2.8.ebuild 1851
 SHA256 7c89f3ca966c454e3e4e37fcf2db42032d4618a2254ced51f8ec922d1629868d apr-util-1.2.8.ebuild 1851
-MISC ChangeLog 12487 RMD160 f0aa9cf22fb973826d568347aa13b3bb6d4c4911 SHA1 d09b1bc1d58a346f99f6934566b509d3e3039696 SHA256 4cc880917a481076aed5773440a33a5d94e89381cfeaa4cec2129754f4e282e5
-MD5 1f118dff98228320cc3e9ec6bfd5214f ChangeLog 12487
-RMD160 f0aa9cf22fb973826d568347aa13b3bb6d4c4911 ChangeLog 12487
-SHA256 4cc880917a481076aed5773440a33a5d94e89381cfeaa4cec2129754f4e282e5 ChangeLog 12487
+MISC ChangeLog 12576 RMD160 773ceeeb7a97487a5435ec6b10434b9cead81332 SHA1 b56da1abea2f2fd035418b2c7f958bca0ac177ff SHA256 21dbcdc122552b2de634d99445ed7a0634b30d0e7d476c2b2fa87ca9fd79ffbb
+MD5 56e54b6bc7a6bfcf574b0bc9d38c5b5c ChangeLog 12576
+RMD160 773ceeeb7a97487a5435ec6b10434b9cead81332 ChangeLog 12576
+SHA256 21dbcdc122552b2de634d99445ed7a0634b30d0e7d476c2b2fa87ca9fd79ffbb ChangeLog 12576
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
@@ -69,7 +69,7 @@ SHA256 9a4af4640885ebd660f0ba90f3b00c03b7c7ec7fc2adc44e95d803e9868bcf09 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG4wDcmPFBzbX68WERAugkAKCYv39gs3JL/+MSdsKunll0yrvwHwCgjrXE
-qPHWlO29qveFtar+Y6X4nt0=
-=UjXt
+iD8DBQFG451ymPFBzbX68WERAmuKAJ4vWHedHtUsGtUV9ibNfIQgaxgT2wCdH5vt
+ZK19+isK4Bqp4XLei1jik28=
+=jE/h
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr-util/apr-util-1.2.10.ebuild b/dev-libs/apr-util/apr-util-1.2.10.ebuild
index b5bb10d64629..0bb7af6b69bd 100644
--- a/dev-libs/apr-util/apr-util-1.2.10.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.10.ebuild,v 1.1 2007/09/08 20:06:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.10.ebuild,v 1.2 2007/09/09 07:14:48 hollow Exp $
 
 inherit autotools eutils flag-o-matic libtool db-use
 
@@ -16,12 +16,13 @@ SRC_URI="mirror://apache/apr/${P}.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 gdbm ldap mysql postgres sqlite sqlite3"
+IUSE="berkdb doc gdbm ldap 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* )
 	mysql? ( =virtual/mysql-5* )
@@ -68,6 +69,10 @@ src_compile() {
 		${myconf} || die "econf failed!"
 
 	emake || die "emake failed!"
+
+	if use doc; then
+		emake dox || die "make dox failed"
+	fi
 }
 
 src_install() {
@@ -75,6 +80,10 @@ src_install() {
 
 	dodoc CHANGES NOTICE
 
+	if use doc; then
+		dohtml docs/dox/html/* || die
+	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