Fix from project overlay

Package-Manager: portage-2.1.4_rc14

4 files changed, 46 insertions, 16 deletions

diff --git a/dev-php5/pecl-apc/ChangeLog b/dev-php5/pecl-apc/ChangeLog
index 8b43b5026191..d85d9a503d82 100644
--- a/dev-php5/pecl-apc/ChangeLog
+++ b/dev-php5/pecl-apc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php5/pecl-apc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.32 2007/12/27 19:55:41 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.33 2008/01/05 18:04:07 jokey Exp $
+
+  05 Jan 2008; Markus Ullmann <jokey@gentoo.org>
+  +files/pecl-apc-3.0.16-apc_set_signals.patch, pecl-apc-3.0.16.ebuild:
+  Fix from project overlay
+
+  04 Jan 2008; Jakub Moc <jakub@gentoo.org>
+  +files/pecl-apc-3.0.16-apc_set_signals.patch, pecl-apc-3.0.16.ebuild:
+  Add patch for Bug 204224
 
 *pecl-apc-3.0.16 (27 Dec 2007)
 
diff --git a/dev-php5/pecl-apc/Manifest b/dev-php5/pecl-apc/Manifest
index dd0ca98b221c..e794faef1ade 100644
--- a/dev-php5/pecl-apc/Manifest
+++ b/dev-php5/pecl-apc/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pecl-apc-3.0.16-apc_set_signals.patch 317 RMD160 a154278cfd09e36dff07b2f29bff48d1df06e625 SHA1 fd4c340ea746b26be0e74465fe19e890ff0e968f SHA256 99ef89e19effcff193791910ce376e9b284c8f8048407e86f81d6746656db95c
+MD5 01de539a3da0f3dc80b0ed9f2123348d files/pecl-apc-3.0.16-apc_set_signals.patch 317
+RMD160 a154278cfd09e36dff07b2f29bff48d1df06e625 files/pecl-apc-3.0.16-apc_set_signals.patch 317
+SHA256 99ef89e19effcff193791910ce376e9b284c8f8048407e86f81d6746656db95c files/pecl-apc-3.0.16-apc_set_signals.patch 317
 DIST APC-3.0.12p2.tgz 94809 RMD160 d88c75a348a51b0f0e379704dee5e1edc9fbf8ae SHA1 79476e6071ff5eead2d1e7cc92ed614ef2fd7f67 SHA256 a663f65a8207c930efbd8a1dda9e90bf4cd76166d8534771824f80e98081b297
 DIST APC-3.0.15.tgz 112056 RMD160 ede098ca1411dd14f29da9d12795807e4c9dffcb SHA1 a54254728967de4adc4a57f0a6dd74bd92b6dcbe SHA256 1c475a84d12db2a45f1489a48f375d77854ae2c1d6626db3e812ccc04461911a
 DIST APC-3.0.16.tgz 114298 RMD160 76f5eaefcf1d664d7ffafd7a9a101495c7b862d6 SHA1 26eb0580acb76632d7657868f5b103fd3bb91c02 SHA256 466b847fb9754076525d6dc0f33483972f2b97b14bdea73787f4f32e6b6f465b
@@ -12,14 +16,14 @@ EBUILD pecl-apc-3.0.15.ebuild 2058 RMD160 c54fecc86934563d36c92204276d6137b99b34
 MD5 fc2a7c92a22699d3d0a7f8b5a1c9542c pecl-apc-3.0.15.ebuild 2058
 RMD160 c54fecc86934563d36c92204276d6137b99b348d pecl-apc-3.0.15.ebuild 2058
 SHA256 15366ce2d11bed53ea7008d412f7d0c82cc58244a980b024cdac820f742d895b pecl-apc-3.0.15.ebuild 2058
-EBUILD pecl-apc-3.0.16.ebuild 2061 RMD160 2b94385a8ad049b12088e1a5d1380c8498be6771 SHA1 a009b90eb4ae25bb53bf55b21eca446d85277199 SHA256 1813259bf5ea301fca465de97f720c4fab6598d7592513d54b3b0252406b6325
-MD5 de440b729c5beb462686a6e421e04f37 pecl-apc-3.0.16.ebuild 2061
-RMD160 2b94385a8ad049b12088e1a5d1380c8498be6771 pecl-apc-3.0.16.ebuild 2061
-SHA256 1813259bf5ea301fca465de97f720c4fab6598d7592513d54b3b0252406b6325 pecl-apc-3.0.16.ebuild 2061
-MISC ChangeLog 4462 RMD160 9d32a42c7ab589752c05301e8504ba5d8b384417 SHA1 b4203a8698aee8511afe18953559c15f1af68c39 SHA256 cfbbfe2a74cde33ad6eeefbce3b5de90dbc6179d4057947bc230e975f58b8a0e
-MD5 83441fc887022229f81dfc417777b846 ChangeLog 4462
-RMD160 9d32a42c7ab589752c05301e8504ba5d8b384417 ChangeLog 4462
-SHA256 cfbbfe2a74cde33ad6eeefbce3b5de90dbc6179d4057947bc230e975f58b8a0e ChangeLog 4462
+EBUILD pecl-apc-3.0.16.ebuild 2216 RMD160 b84e02c3bf23b2f8b9a0601f217b0c07e0964b37 SHA1 4e8b93eaa7954c75577436b1510e94b2dbe6379b SHA256 aac748e913bb9b4f7abda2e6aefb85a2dc2426662e7f993a2b52f09f5b9e3843
+MD5 fa35a78cd253bf8539ef6373266af57e pecl-apc-3.0.16.ebuild 2216
+RMD160 b84e02c3bf23b2f8b9a0601f217b0c07e0964b37 pecl-apc-3.0.16.ebuild 2216
+SHA256 aac748e913bb9b4f7abda2e6aefb85a2dc2426662e7f993a2b52f09f5b9e3843 pecl-apc-3.0.16.ebuild 2216
+MISC ChangeLog 4755 RMD160 70b36e5ba2725b54928e46133d9baa5111f76ea5 SHA1 22e462ff648946b36bd696c1a7f8649a9abe467a SHA256 eeea5a02d2f309e8c379109875a047356f06e9a0fd0f464a3151928af235d88a
+MD5 3a6d2cc470efa09e50456fb91cafe27c ChangeLog 4755
+RMD160 70b36e5ba2725b54928e46133d9baa5111f76ea5 ChangeLog 4755
+SHA256 eeea5a02d2f309e8c379109875a047356f06e9a0fd0f464a3151928af235d88a ChangeLog 4755
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -36,7 +40,7 @@ SHA256 7a807c254eb21dfe2d035767e3bd07e58ea91ae676ecc1e636f53d156bef1397 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd0A0cACgkQz974XjDVpbnGXQCeO1m2QBWHp3nvx7c1f6Yx660x
-HdcAoMbhsrTuFL0YT/RjrpX57RWOoN7w
-=LUZ2
+iEYEARECAAYFAkd/xqAACgkQz974XjDVpblQ1QCgjZ94X01PSZycgAVwOuNNlT4f
+13IAn1JBeOJhZ5WHoVcvWT1JgkMDcPEH
+=5GAl
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch b/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
new file mode 100644
index 000000000000..0e12918a24ff
--- /dev/null
+++ b/dev-php5/pecl-apc/files/pecl-apc-3.0.16-apc_set_signals.patch
@@ -0,0 +1,11 @@
+--- APC-3.0.16/php_apc.c.orig      2007-12-26 23:51:32.000000000 +0100
++++ APC-3.0.16/php_apc.c       2008-01-04 23:34:30.000000000 +0100
+@@ -300,7 +300,7 @@
+         apc_request_init(TSRMLS_C);
+ 
+ #if HAVE_SIGACTION
+-        apc_set_signals();
++        apc_set_signals(TSRMLS_C);
+ #endif
+     }
+     return SUCCESS;
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
index c83956846081..88364891d3b6 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild,v 1.1 2007/12/27 19:55:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.16.ebuild,v 1.2 2008/01/05 18:04:07 jokey Exp $
 
 PHP_EXT_NAME="apc"
 PHP_EXT_PECL_PKG="APC"
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
 
-inherit php-ext-pecl-r1 confutils
+inherit php-ext-pecl-r1 confutils eutils
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -27,6 +27,13 @@ pkg_setup() {
 	require_php_sapi_from cgi apache2
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# http://pecl.php.net/bugs/bug.php?id=12777, Bug 204224
+	epatch "${FILESDIR}"/${P}-apc_set_signals.patch
+}
+
 src_compile() {
 	has_php