Add "cloexec" USE flag (bug #280648).

Package-Manager: portage-13972-svn/cvs/Linux x86_64

4 files changed, 20 insertions, 16 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 3918e872cae4..0aff6396e4d4 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.135 2009/08/07 16:29:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.136 2009/08/10 03:30:46 arfrever Exp $
+
+  10 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  apr-1.3.8.ebuild, metadata.xml:
+  Add "cloexec" USE flag (bug #280648).
 
   07 Aug 2009; Christian Faulhammer <fauli@gentoo.org> apr-1.3.8.ebuild:
   revert stable keyword for x86
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 015af2ecdb75..46aab980185e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
 DIST apr-1.3.5.tar.gz 1162875 RMD160 d66d5f80b710c448dd35c575987f5acd6eab6f6d SHA1 127dc26598afeb86139707e65d222c00caae926a SHA256 f047422b39a5e5d933d598bd9fca2a1184e1506e4cd66364a990c7f2cd76960d
 DIST apr-1.3.6.tar.gz 1163776 RMD160 08f11723e94ee6ea643d741bba4df3081e4f1a72 SHA1 49805851338e22161b70453693a39a7e2d812f77 SHA256 362b238cab7d19fdafbfd1df8cdc2bd2d49f3d5a3a5e194e05fb5a7bc55378d9
@@ -9,13 +6,6 @@ DIST apr-1.3.8.tar.gz 1164963 RMD160 f45e1eaac6984e1207305f97c969d7adf806914b SH
 EBUILD apr-1.3.5.ebuild 1685 RMD160 69e8e92e787c2ce3528641884fb9a032cfa4737e SHA1 0c26ab5c369f071695c3004325d142f65da5c584 SHA256 c5de1050fe4db66c4398ad32347e366350d2f2227fb28b40a7fea4b367962755
 EBUILD apr-1.3.6.ebuild 1698 RMD160 e0f3c635dfc66d05cb0f49b4ae8814b0bcbdef4b SHA1 ac774833bbc2cf55dc6ee52c2e0cb4c73bdcbb42 SHA256 5209aa97f86fd74aa29f222f1bdf47f9ba5e5ad6f87fd21f978d85ae0e01abc2
 EBUILD apr-1.3.7.ebuild 1698 RMD160 452df29347208ac9006b22178f07f7182842b72e SHA1 b3fc54361536302ca64af2a8f13b7e1a91f0a209 SHA256 b807d217c85b91a0caf92c0c7bf2c3c415a8b9581089cdaf9c7f028664d41b09
-EBUILD apr-1.3.8.ebuild 1694 RMD160 34c79cec76aac6a0ad190bd09ba31c3ede30ff81 SHA1 b8dd9aedc7d5250a002577d1327e0b84980213bc SHA256 88529dcceefaeed862425b733f7f142eff5c6f139d9d6aae379ac0a4d242e2e3
-MISC ChangeLog 16343 RMD160 dd7acb8ef48f5249a65bb7ee72dc27d2aa72a2be SHA1 91647a476e8eb78ea4b511ef3e570fedea4d07dc SHA256 eb17e11658059e1e58575fab61dd3b4311e8fc13a3cc4242fb9c032ecffbad69
-MISC metadata.xml 309 RMD160 416a52a9bb93c4e9ef8e3cf185504d1ef96b8e2a SHA1 9e0bb36e068db1ce9fdc6e1938304a922c5ea7fc SHA256 4850cde4bf33912a1b8609d2ab298a46ee34eb3e4e19e3b0ddfccdd3f0d9a44f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp8Vm8ACgkQNQqtfCuFneM1bACfUsK49UDd5iTbRjDIWAahfR04
-47QAn0RJJvRLhVg3Y4j/yFxGZpf6tpEs
-=M5DH
------END PGP SIGNATURE-----
+EBUILD apr-1.3.8.ebuild 1882 RMD160 5982a264fe103e1fcd353f0258e3b1b3330e021e SHA1 0bd8d3cfced8f11db6be541d2b6e6d3eeb0014b9 SHA256 210f6f9540992c01fcff737d2c9381b41369c115f19d2d2395748894dc31e5e7
+MISC ChangeLog 16494 RMD160 20bfa5ec2a9b4f99030eedd140f7897e5fe55cd2 SHA1 b33ab64cd17a89877128658a8afe01efccb2d6c6 SHA256 53b097d3d54f719490332f7f2ebffea2eaad5148f3611d1371561e0e2002107c
+MISC metadata.xml 364 RMD160 5911294d2ae8108d31d5cf1fa7574d7cdc7c331e SHA1 c95eaa2fb4b4fa3306f198a4f5c9dba838311b16 SHA256 153398c2164365fa699157dfe07a639edb10a6169054be0cda458f1109885709
diff --git a/dev-libs/apr/apr-1.3.8.ebuild b/dev-libs/apr/apr-1.3.8.ebuild
index cb656b1f07fc..0d11f9b685ee 100644
--- a/dev-libs/apr/apr-1.3.8.ebuild
+++ b/dev-libs/apr/apr-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.4 2009/08/07 16:29:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.3.8.ebuild,v 1.5 2009/08/10 03:30:46 arfrever Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ 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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc +urandom"
+IUSE="+cloexec debug doc +urandom"
 RESTRICT="test"
 
 DEPEND="doc? ( app-doc/doxygen )"
@@ -29,6 +29,11 @@ src_prepare() {
 src_configure() {
 	local myconf
 
+	if ! use cloexec; then
+		export apr_cv_sock_cloexec="no"
+		export apr_cv_epoll_create1="no"
+	fi
+
 	if use debug; then
 		myconf+=" --enable-maintainer-mode --enable-pool-debug=all"
 	fi
@@ -48,6 +53,10 @@ src_configure() {
 	sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk
 	sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config
 	rm -f libtool
+
+	if ! use cloexec; then
+		unset apr_cv_sock_cloexec apr_cv_epoll_create1
+	fi
 }
 
 src_compile() {
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 74dc6ff67c84..55b5530ed153 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -6,6 +6,7 @@
   <email>apache-bugs@gentoo.org</email>
 </maintainer>
 <use>
+  <flag name='cloexec'>Support for SOCK_CLOEXEC</flag>
   <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
 </use>
 </pkgmetadata>