cleanup, version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 18 insertions, 307 deletions

diff --git a/dev-php5/pecl-apc/ChangeLog b/dev-php5/pecl-apc/ChangeLog
index 68925344b427..96942982e3c5 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.55 2010/07/29 08:28:15 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.56 2010/09/13 13:54:55 mabi Exp $
+
+*pecl-apc-3.1.4 (13 Sep 2010)
+
+  13 Sep 2010; Matti Bickel <mabi@gentoo.org> -pecl-apc-3.0.16-r1.ebuild,
+  -pecl-apc-3.0.17.ebuild, -pecl-apc-3.0.18.ebuild,
+  -pecl-apc-3.0.18-r1.ebuild, -pecl-apc-3.1.3_p1.ebuild,
+  +pecl-apc-3.1.4.ebuild:
+  cleanup, version bump
 
 *pecl-apc-3.1.3_p1-r1 (29 Jul 2010)
 
diff --git a/dev-php5/pecl-apc/Manifest b/dev-php5/pecl-apc/Manifest
index d4c1349a6962..eafe5dc57c1b 100644
--- a/dev-php5/pecl-apc/Manifest
+++ b/dev-php5/pecl-apc/Manifest
@@ -1,16 +1,10 @@
 AUX pecl-apc-3.0.16-CVE-2008-1488.patch 733 RMD160 ab533f369c22eb0ef12fc1e62e28981ba762fa6f SHA1 7b6962260cdcf4f940e99994b423f5c282268c19 SHA256 4d2dc22c1b2f2fe89848b2167605af2d5d0cab906de306ac29ace9319aed2e0c
 AUX pecl-apc-3.0.16-apc_set_signals.patch 317 RMD160 a154278cfd09e36dff07b2f29bff48d1df06e625 SHA1 fd4c340ea746b26be0e74465fe19e890ff0e968f SHA256 99ef89e19effcff193791910ce376e9b284c8f8048407e86f81d6746656db95c
-DIST APC-3.0.16.tgz 114298 RMD160 76f5eaefcf1d664d7ffafd7a9a101495c7b862d6 SHA1 26eb0580acb76632d7657868f5b103fd3bb91c02 SHA256 466b847fb9754076525d6dc0f33483972f2b97b14bdea73787f4f32e6b6f465b
-DIST APC-3.0.17.tgz 116058 RMD160 f3b549b107d2846c85b7e979a321f905c6a77924 SHA1 ef968194e4bda0eb45897c8975e16d24c8151a6b SHA256 75273bb55a0f81ea38ca8cfa8de58515c568d977d78d5d31fa5cb926337febf5
-DIST APC-3.0.18.tgz 115957 RMD160 aa1b47c6647e555ef09af28ed7877f8c72dcbf83 SHA1 3f3ad4b5920e659749bb826c70695a45dc30adc7 SHA256 e3e191909e696bc826cb70d86d24ac5e83a71c843f20e53034cf4f52ba9228b0
 DIST APC-3.0.19.tgz 115735 RMD160 79c00d0e44eee268e8fc8ec8b66f1c4f5239320d SHA1 58d90ab757e606c878be3449a738016a08061dfd SHA256 a02677a7884361d64fbf3745c402f2a6ff313e817b0d0a2010acb64cd05247b0
 DIST APC-3.1.3p1.tgz 142277 RMD160 b7d359b68697adc8a7fe06c41ddaf804a55c911d SHA1 aed228105250f7d7f1deb57abb2770f1e19c2e49 SHA256 9e4e3163baf697bf0fba7bc3993f112c375f0ab2b40bba325d7109999ae4d28d
-EBUILD pecl-apc-3.0.16-r1.ebuild 2337 RMD160 1f6feb404f66e8cf126d0bf8aa09b9ffb868f54b SHA1 49bc2411c236861c73f72b4fff69c63bbe9419e1 SHA256 ffd7bb12f3c969f2ecb0e728b8fa4a27d7e246d6a3abe9fd5e56ea20b1797c93
-EBUILD pecl-apc-3.0.17.ebuild 2067 RMD160 75360b1ad2f1a4b9a2e730e359169cd3ddcc2281 SHA1 9de394dea8d7c6bf2c9b4075010861ffb95cea1c SHA256 0ea54b3000aab3cacf751435e073fdd71b125360d65e62b7a814056797074202
-EBUILD pecl-apc-3.0.18-r1.ebuild 2665 RMD160 7f8044ab4ecb0819fdd1003070f6198f9a940e4d SHA1 e6929b5328cd1686123f549d92044323664bc094 SHA256 77cab8b6e72a908ab15decfb1c8f8bbb8f4eaf1aaee7c4a652c3a233bdc65c9f
-EBUILD pecl-apc-3.0.18.ebuild 2067 RMD160 b0314bf162f949d9dc4d7ec180950503e89d3409 SHA1 38fa8a5dcd333f713b9bec9df068aed09370c529 SHA256 c4dc3094ed426c96875b8da5603b73f4b75cecd9aa7f9eb2e4825a37dc8a87af
+DIST APC-3.1.4.tgz 147408 RMD160 c02ce7bf05eccfea15ea71178733778c6400a3be SHA1 53d8442e8b7e3804537d14e5776962cfdc5ae4d8 SHA256 5016ed62daafbf721312e58fe7c8ac81f61b8c3b951d9c9d0c221c3acfdc5d49
 EBUILD pecl-apc-3.0.19.ebuild 2658 RMD160 c7ae3f75c6dff03fa6578dc889af1a3848ad4ba9 SHA1 a5fc112c5ffb2ad8ec75b71badfbce459b51ea39 SHA256 507839b9d161bf8db67bb422216fd52e1b54de2cf903eb29e79e195348e1f596
 EBUILD pecl-apc-3.1.3_p1-r1.ebuild 2575 RMD160 a05578e3fe955cd3a8d0c94c642fe619df830203 SHA1 4ba270b24fdd8cda68792255e04ade286d2df0db SHA256 f452855031f8724506e9739b07552c4491e8c3cb79be66c40adbf9b9e1d1599d
-EBUILD pecl-apc-3.1.3_p1.ebuild 2662 RMD160 0613433dd85a0c52622f0f1d97711c21daf65e54 SHA1 ecd8abe8e9a0e2bb9617e6037936513f572c5cdb SHA256 eb9181c2bb6e1259fbc0a2feef61407daefe5013a8569d8590e5cd9d7b855861
-MISC ChangeLog 8011 RMD160 c75eee289426633010c77e4a96bb194e9ad0f629 SHA1 9f9ce18a759fef256000dda106e99528a24085ed SHA256 95f4c175f3de1fc1af6b0d5d0b9d3d053f9a724672629c76e7d37198d25fc461
+EBUILD pecl-apc-3.1.4.ebuild 2569 RMD160 c5a59286a278fa36a77b628ee04feac86bd0c57e SHA1 0f224436a31416afdd97d9ed8f5a39b7509ad063 SHA256 7d47431bd3867621959e2f1f99c74fe4be9c7ac71552894a57ad04067a03da76
+MISC ChangeLog 8276 RMD160 a9a97b952aaa7859214efa70c3e901a8ca1ee920 SHA1 90774ca2959f581af5ce58cdfe1d165ac03f28cd SHA256 82a41fbb6c441c67326328019aae0bf9df480078fbc520618baecb773fc33bb9
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.16-r1.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.16-r1.ebuild
deleted file mode 100644
index c2032379be0f..000000000000
--- a/dev-php5/pecl-apc/pecl-apc-3.0.16-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.7 2009/11/03 17:33:08 armin76 Exp $
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-inherit php-ext-pecl-r1 confutils eutils
-
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="mmap"
-
-DEPEND="!dev-php5/eaccelerator !dev-php5/xcache"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-pkg_setup() {
-	has_php
-	require_php_sapi_from cgi apache2
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch for CVE-2008-1488, Bug 214576
-	epatch "${FILESDIR}"/${P}-CVE-2008-1488.patch
-	# http://pecl.php.net/bugs/bug.php?id=12777, Bug 204224
-	epatch "${FILESDIR}"/${P}-apc_set_signals.patch
-
-	php-ext-source-r1_phpize
-}
-
-src_compile() {
-	has_php
-
-	my_conf="--enable-apc"
-	enable_extension_enable "apc-mmap" "mmap" 0
-	enable_extension_with_built_with =${PHP_PKG} apache2 apxs /usr/sbin/apxs2 "optimisation for apache2"
-
-	php-ext-pecl-r1_src_compile
-}
-
-src_install() {
-	php-ext-pecl-r1_src_install
-
-	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_size" '"30"'
-	php-ext-base-r1_addtoinifiles "apc.optimization" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.num_files_hint" '"1024"'
-	php-ext-base-r1_addtoinifiles "apc.ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.user_ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.gc_ttl" '"3600"'
-	php-ext-base-r1_addtoinifiles "apc.cache_by_default" '"1"'
-	php-ext-base-r1_addtoinifiles ";apc.mmap_file_mask" '"/tmp/apcphp5.XXXXXX"'
-	php-ext-base-r1_addtoinifiles "apc.file_update_protection" '"2"'
-	php-ext-base-r1_addtoinifiles "apc.enable_cli" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.max_file_size" '"1M"'
-	php-ext-base-r1_addtoinifiles "apc.stat" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.write_lock" '"1"'
-
-	dodir "${PHP_EXT_SHARED_DIR}"
-	insinto "${PHP_EXT_SHARED_DIR}"
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of PECL-APC was"
-	elog "installed into ${ROOT}usr/share/php5/apc/."
-}
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.17.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.17.ebuild
deleted file mode 100644
index 9e3498549f10..000000000000
--- a/dev-php5/pecl-apc/pecl-apc-3.0.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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.17.ebuild,v 1.4 2009/11/03 17:33:08 armin76 Exp $
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-inherit php-ext-pecl-r1 confutils eutils
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="mmap"
-
-DEPEND="!dev-php5/eaccelerator !dev-php5/xcache"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-pkg_setup() {
-	require_php_sapi_from cgi apache2
-}
-
-src_compile() {
-	has_php
-
-	my_conf="--enable-apc"
-	enable_extension_enable "apc-mmap" "mmap" 0
-	enable_extension_with_built_with =${PHP_PKG} apache2 apxs /usr/sbin/apxs2 "optimisation for apache2"
-
-	php-ext-pecl-r1_src_compile
-}
-
-src_install() {
-	php-ext-pecl-r1_src_install
-
-	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_size" '"30"'
-	php-ext-base-r1_addtoinifiles "apc.optimization" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.num_files_hint" '"1024"'
-	php-ext-base-r1_addtoinifiles "apc.ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.user_ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.gc_ttl" '"3600"'
-	php-ext-base-r1_addtoinifiles "apc.cache_by_default" '"1"'
-	php-ext-base-r1_addtoinifiles ";apc.mmap_file_mask" '"/tmp/apcphp5.XXXXXX"'
-	php-ext-base-r1_addtoinifiles "apc.file_update_protection" '"2"'
-	php-ext-base-r1_addtoinifiles "apc.enable_cli" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.max_file_size" '"1M"'
-	php-ext-base-r1_addtoinifiles "apc.stat" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.write_lock" '"1"'
-
-	dodir "${PHP_EXT_SHARED_DIR}"
-	insinto "${PHP_EXT_SHARED_DIR}"
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of PECL-APC was"
-	elog "installed into ${ROOT}usr/share/php5/apc/."
-}
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.18-r1.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.18-r1.ebuild
deleted file mode 100644
index e0be35f950c8..000000000000
--- a/dev-php5/pecl-apc/pecl-apc-3.0.18-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 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.18-r1.ebuild,v 1.2 2009/11/03 17:33:08 armin76 Exp $
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-inherit php-ext-pecl-r1 confutils eutils
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="mmap"
-
-DEPEND="!dev-php5/eaccelerator !dev-php5/xcache"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-pkg_setup() {
-	require_php_sapi_from cgi apache2
-}
-
-src_compile() {
-	has_php
-
-	my_conf="--enable-apc"
-	enable_extension_enable "apc-mmap" "mmap" 0
-	enable_extension_with_built_with =${PHP_PKG} apache2 apxs /usr/sbin/apxs2 "optimisation for apache2"
-
-	php-ext-pecl-r1_src_compile
-}
-
-src_install() {
-	php-ext-pecl-r1_src_install
-
-	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_size" '"30"'
-	php-ext-base-r1_addtoinifiles "apc.num_files_hint" '"1024"'
-	php-ext-base-r1_addtoinifiles "apc.ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.user_ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.gc_ttl" '"3600"'
-	php-ext-base-r1_addtoinifiles "apc.cache_by_default" '"1"'
-	php-ext-base-r1_addtoinifiles ";apc.filters" '""'
-	php-ext-base-r1_addtoinifiles ";apc.mmap_file_mask" '"/tmp/apcphp5.XXXXXX"'
-	php-ext-base-r1_addtoinifiles "apc.slam_defense" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.file_update_protection" '"2"'
-	php-ext-base-r1_addtoinifiles "apc.enable_cli" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.max_file_size" '"1M"'
-	php-ext-base-r1_addtoinifiles "apc.stat" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.write_lock" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.report_autofilter" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.include_once_override" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.rfc1867" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.rfc1867_prefix" '"upload_"'
-	php-ext-base-r1_addtoinifiles "apc.rfc1867_name" '"APC_UPLOAD_PROGRESS"'
-	php-ext-base-r1_addtoinifiles "apc.rfc1867_freq" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.localcache" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.localcache.size" '"512"'
-	php-ext-base-r1_addtoinifiles "apc.coredump_unmap" '"0"'
-
-	dodir "${PHP_EXT_SHARED_DIR}"
-	insinto "${PHP_EXT_SHARED_DIR}"
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of PECL-APC was"
-	elog "installed into ${ROOT}usr/share/php5/apc/."
-}
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.18.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.18.ebuild
deleted file mode 100644
index 3f03ccec89e0..000000000000
--- a/dev-php5/pecl-apc/pecl-apc-3.0.18.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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.18.ebuild,v 1.2 2009/11/03 17:33:08 armin76 Exp $
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-inherit php-ext-pecl-r1 confutils eutils
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="mmap"
-
-DEPEND="!dev-php5/eaccelerator !dev-php5/xcache"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-pkg_setup() {
-	require_php_sapi_from cgi apache2
-}
-
-src_compile() {
-	has_php
-
-	my_conf="--enable-apc"
-	enable_extension_enable "apc-mmap" "mmap" 0
-	enable_extension_with_built_with =${PHP_PKG} apache2 apxs /usr/sbin/apxs2 "optimisation for apache2"
-
-	php-ext-pecl-r1_src_compile
-}
-
-src_install() {
-	php-ext-pecl-r1_src_install
-
-	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.shm_size" '"30"'
-	php-ext-base-r1_addtoinifiles "apc.optimization" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.num_files_hint" '"1024"'
-	php-ext-base-r1_addtoinifiles "apc.ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.user_ttl" '"7200"'
-	php-ext-base-r1_addtoinifiles "apc.gc_ttl" '"3600"'
-	php-ext-base-r1_addtoinifiles "apc.cache_by_default" '"1"'
-	php-ext-base-r1_addtoinifiles ";apc.mmap_file_mask" '"/tmp/apcphp5.XXXXXX"'
-	php-ext-base-r1_addtoinifiles "apc.file_update_protection" '"2"'
-	php-ext-base-r1_addtoinifiles "apc.enable_cli" '"0"'
-	php-ext-base-r1_addtoinifiles "apc.max_file_size" '"1M"'
-	php-ext-base-r1_addtoinifiles "apc.stat" '"1"'
-	php-ext-base-r1_addtoinifiles "apc.write_lock" '"1"'
-
-	dodir "${PHP_EXT_SHARED_DIR}"
-	insinto "${PHP_EXT_SHARED_DIR}"
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of PECL-APC was"
-	elog "installed into ${ROOT}usr/share/php5/apc/."
-}
diff --git a/dev-php5/pecl-apc/pecl-apc-3.1.3_p1.ebuild b/dev-php5/pecl-apc/pecl-apc-3.1.4.ebuild
index c9420a596764..3b8239249f75 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.1.3_p1.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.1.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.1.3_p1.ebuild,v 1.1 2009/12/02 19:02:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.1.4.ebuild,v 1.1 2010/09/13 13:54:55 mabi Exp $
+
+EAPI=2
 
 PHP_EXT_NAME="apc"
 PHP_EXT_PECL_PKG="APC"
@@ -17,21 +19,15 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE="mmap"
 
-DEPEND="!dev-php5/eaccelerator !dev-php5/xcache"
+DEPEND="!dev-php5/eaccelerator !dev-php5/xcache
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )"
 RDEPEND="${DEPEND}"
 
 need_php_by_category
 
-pkg_setup() {
-	require_php_sapi_from cgi apache2
-}
-
 src_compile() {
-	has_php
-
 	my_conf="--enable-apc"
 	enable_extension_enable "apc-mmap" "mmap" 0
-	enable_extension_with_built_with =${PHP_PKG} apache2 apxs /usr/sbin/apxs2 "optimisation for apache2"
 
 	php-ext-pecl-r1_src_compile
 }