Added support for using /dev/urandom instead of /dev/random if the urandom USE-flag...

Package-Manager: portage-2.0.51.22-r2

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 67820a514ef3147546d4e0685553bed61f5b93ad..330d6b840a00abb80812243e7f473f6e5f8525df 100644 (file)
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.36 2005/09/17 00:35:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.37 2005/09/18 00:12:14 vericgar Exp $
+
+*apr-0.9.6-r4 (17 Sep 2005)
+
+  17 Sep 2005; Michael Stewart <vericgar@gentoo.org> +apr-0.9.6-r4.ebuild:
+  Added support for using /dev/urandom instead of /dev/random if the urandom
+  USE-flag is set. Fixes bug 102587
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> apr-0.9.6-r3.ebuild:
   Mark 0.9.6-r3 stable on ia64

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index cec927544b725099e26fc136f6e5834912f1ff5c..67730b9499f9d0f353e0c447e958f116c6fd84d2 100644 (file)
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,20 +1,22 @@
+MD5 c43b8c435287e9be6211d4f8c204bcf7 ChangeLog 4734
+MD5 a783e0b165baa456f4d6e88711fc8d99 apr-1.1.1.ebuild 2016
+MD5 44abd8be5878d05a9d0eb27233aea7ce apr-0.9.5.ebuild 2185
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 c588cab7a28630a378d7adfc76986b1a ChangeLog 4516
-MD5 5fc2ae7d29f5e743817535ed28b2de2d apr-0.9.6-r2.ebuild 2344
 MD5 068e4d83429849cbae32d8194086efb2 apr-0.9.6.ebuild 2176
 MD5 86a4c96972b87a34fd0b2159e9f336cf apr-0.9.5-r1.ebuild 2237
-MD5 e2a286a4645fc50371ce6c2fbdef6a7a apr-0.9.6-r3.ebuild 1538
-MD5 44abd8be5878d05a9d0eb27233aea7ce apr-0.9.5.ebuild 2185
-MD5 c949c5d1ead25fc80f948329f8f33372 apr-0.9.5-r3.ebuild 1531
-MD5 2e4a61ffb43df4b4f63ac0317a3660a9 apr-0.9.5-r2.ebuild 2344
-MD5 a783e0b165baa456f4d6e88711fc8d99 apr-1.1.1.ebuild 2016
 MD5 aadbec5bc76c5f1060218e1625157190 apr-0.9.6-r1.ebuild 2237
+MD5 2e4a61ffb43df4b4f63ac0317a3660a9 apr-0.9.5-r2.ebuild 2344
+MD5 5fc2ae7d29f5e743817535ed28b2de2d apr-0.9.6-r2.ebuild 2344
+MD5 c949c5d1ead25fc80f948329f8f33372 apr-0.9.5-r3.ebuild 1531
+MD5 e2a286a4645fc50371ce6c2fbdef6a7a apr-0.9.6-r3.ebuild 1538
+MD5 47ccb435ac5051c45c74454fa8efb217 apr-0.9.6-r4.ebuild 1725
+MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5 62
+MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r1 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r1 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r2 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r2 62
 MD5 7a3bbbaa94fd0f5b9f33afc40db8f618 files/digest-apr-1.1.1 62
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r1 62
-MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r1 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r3 62
-MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r3 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r4 62

diff --git a/dev-libs/apr/apr-0.9.6-r4.ebuild b/dev-libs/apr/apr-0.9.6-r4.ebuild
new file mode 100644 (file)
index 0000000..c3704db
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.6-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.6-r4.ebuild,v 1.1 2005/09/18 00:12:14 vericgar Exp $
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 urandom"
+RESTRICT="test"
+
+DEPEND=""
+
+src_compile() {
+       elibtoolize || die "elibtoolize failed"
+
+       myconf="--datadir=/usr/share/apr-0"
+
+       myconf="${myconf} $(use_enable ipv6)"
+       myconf="${myconf} --enable-threads"
+       myconf="${myconf} --enable-nonportable-atomics"
+       if use urandom; then
+               einfo "Using /dev/urandom as random device"
+               myconf="${myconf} --with-devrandom=/dev/urandom"
+       else
+               einfo "Using /dev/random as random device"
+               myconf="${myconf} --with-devrandom=/dev/random"
+       fi
+
+       econf ${myconf} || die
+       emake || die
+}
+
+src_install() {
+       make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die
+
+       # bogus values pointing at /var/tmp/portage
+       sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config
+       sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config
+
+       sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
+       sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk
+
+       cp -p build/*.awk ${D}/usr/share/apr-0/build
+       cp -p build/*.sh ${D}/usr/share/apr-0/build
+       cp -p build/*.pl ${D}/usr/share/apr-0/build
+
+       dodoc CHANGES LICENSE NOTICE
+}

diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r4 b/dev-libs/apr/files/digest-apr-0.9.6-r4
new file mode 100644 (file)
index 0000000..06838c2
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.6-r4
@@ -0,0 +1 @@
+MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231