Rev bumps which specify which random device node (hard masked in case they cause breakage).

(Portage version: 2.0.51.19)

6 files changed, 170 insertions, 11 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index ad2023fa7a0d..982f35858ed4 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2005/03/14 00:29:18 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.24 2005/03/14 01:12:00 beu Exp $
+
+*apr-0.9.6-r2 (14 Mar 2005)
+
+  14 Mar 2005; Elfyn McBratney <beu@gentoo.org> +apr-0.9.5-r2.ebuild,
+  +apr-0.9.6-r2.ebuild:
+  Rev bumps which specify which random device node (--with-devrandom) to use.
+  These two are hard masked in case this changes breaks stuff.
 
   14 Mar 2005; Elfyn McBratney <beu@gentoo.org> apr-0.9.5-r1.ebuild,
   apr-0.9.5.ebuild:
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index bed7adc54433..1f58550c9bab 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 b914b726852fc05742c784f4c1c23c7c apr-0.9.5-r2.ebuild 2286
 MD5 08e1228f59832df6e47a110203e80897 ChangeLog 2637
 MD5 aadbec5bc76c5f1060218e1625157190 apr-0.9.6-r1.ebuild 2237
 MD5 86a4c96972b87a34fd0b2159e9f336cf apr-0.9.5-r1.ebuild 2237
 MD5 a9e11dd361abd1efb067c9003fab657a apr-0.9.5.ebuild 2176
+MD5 c2ed5644cf34d1bbbb28fab96bfed7e9 apr-0.9.6-r2.ebuild 2286
 MD5 068e4d83429849cbae32d8194086efb2 apr-0.9.6.ebuild 2176
+MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r2 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5-r1 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r1 62
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6 62
+MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r2 62
 MD5 a90539853bca24e2f0e77192d41e5a01 files/digest-apr-0.9.5 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNNrpjUHll2nfF60RAiYwAJ4ychs313c0Dw4qMl+P9HxpIprZnACfXoWJ
-HIywUUe2tQaZIw60hPjMo/Y=
-=eLqW
------END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-0.9.5-r2.ebuild b/dev-libs/apr/apr-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..0364c182b8aa
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.5-r2.ebuild
@@ -0,0 +1,78 @@
+# 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.5-r2.ebuild,v 1.1 2005/03/14 01:12:00 beu Exp $
+
+inherit flag-o-matic
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+RESTRICT="test"
+
+DEPEND=""
+
+# this function shall maybe go into flag-o-matic.eclass
+lfs-flags() {
+	echo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+}
+
+# returns true, if LFS is supported (and supposed to be bugfree ;) by current system
+supports-lfs() {
+	# sparc has issues with 64bit IO
+	use sparc && return 1
+
+	# for some reason (I do not know who wrote this) we do not want LFS on glibc-2.2
+	# maybe it's broken then
+
+	has_version '>=sys-libs/glibc-2.3*' && return 0
+	has_version '=sys-libs/glibc-2.2*'  && return 1
+	return 0
+}
+
+set_filter_flags() {
+	CFLAGS="${CFLAGS/  / }"
+
+	supports-lfs && append-lfs-flags || filter-lfs-flags
+}
+
+src_compile() {
+	set_filter_flags
+
+	myconf="--datadir=/usr/share/apr-0"
+
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} --enable-threads"
+	myconf="${myconf} --enable-nonportable-atomics"
+	myconf="${myconf} --with-devrandom=/dev/random"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	set_filter_flags
+
+	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
+
+	# fix apr-config to reflect LFS
+	supports-lfs && \
+		sed -i -e "s:CPPFLAGS=\"\\(.*\\)\":CPPFLAGS=\"\\1 `lfs-flags`\":" ${D}/usr/bin/apr-config
+
+	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/apr-0.9.6-r2.ebuild b/dev-libs/apr/apr-0.9.6-r2.ebuild
new file mode 100644
index 000000000000..26aed6a915d5
--- /dev/null
+++ b/dev-libs/apr/apr-0.9.6-r2.ebuild
@@ -0,0 +1,78 @@
+# 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-r2.ebuild,v 1.1 2005/03/14 01:12:00 beu Exp $
+
+inherit flag-o-matic
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+RESTRICT="test"
+
+DEPEND=""
+
+# this function shall maybe go into flag-o-matic.eclass
+lfs-flags() {
+	echo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+}
+
+# returns true, if LFS is supported (and supposed to be bugfree ;) by current system
+supports-lfs() {
+	# sparc has issues with 64bit IO
+	use sparc && return 1
+
+	# for some reason (I do not know who wrote this) we do not want LFS on glibc-2.2
+	# maybe it's broken then
+
+	has_version '>=sys-libs/glibc-2.3*' && return 0
+	has_version '=sys-libs/glibc-2.2*'  && return 1
+	return 0
+}
+
+set_filter_flags() {
+	CFLAGS="${CFLAGS/  / }"
+
+	supports-lfs && append-lfs-flags || filter-lfs-flags
+}
+
+src_compile() {
+	set_filter_flags
+
+	myconf="--datadir=/usr/share/apr-0"
+
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} --enable-threads"
+	myconf="${myconf} --enable-nonportable-atomics"
+	myconf="${myconf} --with-devrandom=/dev/random"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	set_filter_flags
+
+	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
+
+	# fix apr-config to reflect LFS
+	supports-lfs && \
+		sed -i -e "s:CPPFLAGS=\"\\(.*\\)\":CPPFLAGS=\"\\1 `lfs-flags`\":" ${D}/usr/bin/apr-config
+
+	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.5-r2 b/dev-libs/apr/files/digest-apr-0.9.5-r2
new file mode 100644
index 000000000000..8e1b6255ac36
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.5-r2
@@ -0,0 +1 @@
+MD5 f764a8f23c9ae58ca4726f2716a100e7 apr-0.9.5.tar.gz 1021307
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r2 b/dev-libs/apr/files/digest-apr-0.9.6-r2
new file mode 100644
index 000000000000..06838c2f0f27
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-0.9.6-r2
@@ -0,0 +1 @@
+MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231