fix UUID support (bug #320845) and gcc 4.5 support (bug #355171)

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 124 insertions, 4 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index cf7a9a2646fb..67bb08c389ae 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.166 2010/09/19 09:01:59 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.167 2011/02/18 17:02:48 hollow Exp $
+
+*apr-1.4.2-r1 (18 Feb 2011)
+
+  18 Feb 2011; Benedikt Böhm <hollow@gentoo.org> +apr-1.4.2-r1.ebuild,
+  +files/apr_ring_volatile.patch, metadata.xml:
+  fix UUID support (bug #320845) and gcc 4.5 support (bug #355171)
 
   19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> apr-1.4.2.ebuild:
   fix CONFIG_SHELL wrt #335944
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b5c2c45c3436..b687bc5375f6 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,7 +1,9 @@
+AUX apr_ring_volatile.patch 582 RMD160 d448f9dba0b69dff00101ee2cc05654e05577639 SHA1 7bec45ffb00e6807d6ff0c282ad48d952e502a68 SHA256 6a30739ea4188f947ea80b071ff100b9a069d6228168b34f978f24ab51fd266c
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
 DIST apr-1.3.9.tar.bz2 927657 RMD160 e90943275289113771b623c827ab3fb3c18064d8 SHA1 fb19ec11a15db03dcb9211f31012b079a522d1f0 SHA256 5705a393f48ce8652e2b9143668ed208d34e7ce702b28dd497353561a6ed2ce2
 DIST apr-1.4.2.tar.bz2 766793 RMD160 20d4ae082d490432710aad1c4f689e6032a6c921 SHA1 b3ed66c2e7f67c50ae33b5cd85e9f46a93c6e4f8 SHA256 2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391
 EBUILD apr-1.3.9.ebuild 1879 RMD160 c2cf42299838497fc55aa3d31a26fb0d382543a9 SHA1 44fd7b97f2b94cc312e19314ea7c263fa35e8814 SHA256 3682a05d20cce1c1d9dc8d83d118df13d0c7cf7ce24d5b62542418ebb0a90eaf
+EBUILD apr-1.4.2-r1.ebuild 2189 RMD160 443818ec29e7575b53e8fa181b28e28f7cdf78e3 SHA1 2eb3046337fa4a418c7a706575d8aa7be3844b3d SHA256 917590aa5783602c7707be6c89709fbe59ee703f229fd887f72af394b553f5fc
 EBUILD apr-1.4.2.ebuild 1954 RMD160 d392b90d5491aab9414d9c07079f499d8545d8e6 SHA1 e0b6becb65ddca5c5cab15681623e337239c5ce2 SHA256 84d4b47320e18495c5756ae08ca5b43f023fb50f989f58da86b5302690e13412
-MISC ChangeLog 19887 RMD160 274254493866ef2694c401bc8300da29059f3796 SHA1 29a768c714536016fba84e9a0b842377acea0336 SHA256 5d016c8e2ba58c099ab77acdb1149bee0799bb8bf3a47707a5d4232e5a695668
-MISC metadata.xml 406 RMD160 9af45dec0119ed9afc091ef98d47a4dd7fcec2ae SHA1 d16a3b4f5efbf383b034e83f298a6d86ac9fd878 SHA256 bef219a00636140b1d99834ae19afc00b89f4df68068d1937a53c2c8ce51f2b9
+MISC ChangeLog 20104 RMD160 5da4f6d688a080ec9ecc6fa88ec4a395bd07bdea SHA1 e5fbe209be73cc782fb3187a32c7a68bca9bfd35 SHA256 cd1c46242c554d0083b529bc1fc8851ce6a3f512aba26245d34d59259d5f3397
+MISC metadata.xml 453 RMD160 44be42dfd9fe4c26f5655b4a8b78446ae1c073e7 SHA1 d7378602457f126b8448744b2f965853b4a17188 SHA256 c089c114bb8c838899abeb5c1f1c19a495039b30e106363c14e5de83b7e9a1f4
diff --git a/dev-libs/apr/apr-1.4.2-r1.ebuild b/dev-libs/apr/apr-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..3a5a46eef3da
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.2-r1.ebuild,v 1.1 2011/02/18 17:02:48 hollow Exp $
+
+EAPI="2"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime 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="doc older-kernels-compatibility +urandom +uuid elibc_FreeBSD"
+RESTRICT="test"
+
+RDEPEND="
+	uuid? (
+		!elibc_FreeBSD? (
+			|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
+		)
+	)
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# Ensure that system libtool is used.
+	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
+	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
+
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	epatch "${FILESDIR}/config.layout.patch"
+	epatch "${FILESDIR}/apr_ring_volatile.patch"
+}
+
+src_configure() {
+	local myconf
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	use uuid || export apr_cv_osuuid=no
+
+	if use urandom; then
+		myconf+=" --with-devrandom=/dev/urandom"
+	else
+		myconf+=" --with-devrandom=/dev/random"
+	fi
+
+	CONFIG_SHELL=/bin/bash \
+	econf --enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+
+	rm -f libtool
+}
+
+src_compile() {
+	emake -j1 || 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 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)/apr.exp"
+}
diff --git a/dev-libs/apr/files/apr_ring_volatile.patch b/dev-libs/apr/files/apr_ring_volatile.patch
new file mode 100644
index 000000000000..85e3c47ed5be
--- /dev/null
+++ b/dev-libs/apr/files/apr_ring_volatile.patch
@@ -0,0 +1,22 @@
+diff -crB apr-1.4.2-orig/include/apr_ring.h apr-1.4.2/include/apr_ring.h
+*** apr-1.4.2-orig/include/apr_ring.h	2011-02-16 14:00:19.326000089 +0300
+--- apr-1.4.2/include/apr_ring.h	2011-02-16 14:02:42.378000091 +0300
+***************
+*** 90,97 ****
+   */
+  #define APR_RING_HEAD(head, elem)					\
+      struct head {							\
+! 	struct elem *next;						\
+! 	struct elem *prev;						\
+      }
+  
+  /**
+--- 90,97 ----
+   */
+  #define APR_RING_HEAD(head, elem)					\
+      struct head {							\
+! 	struct elem * volatile next;					\
+! 	struct elem * volatile prev;					\
+      }
+  
+  /**
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 5435cb0a2a47..7a90328af9c1 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -8,5 +8,6 @@
 <use>
   <flag name='older-kernels-compatibility'>Enable binary compatibility with older kernels</flag>
   <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
+  <flag name='uuid'>Enable UUID support</flag>
 </use>
 </pkgmetadata>