summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/pecl-apc/ChangeLog6
-rw-r--r--dev-php/pecl-apc/pecl-apc-3.1.13.ebuild13
-rw-r--r--dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild11
3 files changed, 22 insertions, 8 deletions
diff --git a/dev-php/pecl-apc/ChangeLog b/dev-php/pecl-apc/ChangeLog
index d5704c548eb2..b16f02a0d60c 100644
--- a/dev-php/pecl-apc/ChangeLog
+++ b/dev-php/pecl-apc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php/pecl-apc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/ChangeLog,v 1.16 2013/03/02 15:26:49 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/ChangeLog,v 1.17 2013/04/09 08:49:14 olemarkus Exp $
+
+ 09 Apr 2013; Ole Markus With <olemarkus@gentoo.org> pecl-apc-3.1.13.ebuild,
+ pecl-apc-3.1.9-r2.ebuild:
+ Add blocker on incompatible cache installations
02 Mar 2013; Ole Markus With <olemarkus@gentoo.org> -pecl-apc-3.1.14.ebuild:
Version was pulled from upstream
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
index a09bc0ebede4..d475da4cb515 100644
--- a/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
+++ b/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild,v 1.1 2012/09/04 12:29:31 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild,v 1.2 2013/04/09 08:49:14 olemarkus Exp $
EAPI=4
@@ -12,7 +12,7 @@ DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
PHP_EXT_INIFILE="${PN}.ini"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-5 php5-3 php5-4"
inherit php-ext-pecl-r2 confutils eutils
@@ -23,7 +23,12 @@ LICENSE="PHP-3.01"
SLOT="0"
IUSE="mmap"
-DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+DEPEND="
+ !dev-php/eaccelerator
+ !dev-php/xcache
+ !dev-php/pecl-apcu
+ !dev-php/pecl-zendopcache
+ dev-lang/php[-opcache(-)]"
RDEPEND="${DEPEND}"
LOCKS="pthreadmutex pthreadrw spinlock semaphore"
diff --git a/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild b/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
index 12175bd54911..5d79ea758fd1 100644
--- a/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
+++ b/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild,v 1.7 2012/09/04 12:29:31 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild,v 1.8 2013/04/09 08:49:14 olemarkus Exp $
EAPI=4
@@ -21,7 +21,12 @@ LICENSE="PHP-3.01"
SLOT="0"
IUSE="mmap"
-DEPEND="!dev-php/eaccelerator !dev-php/xcache"
+DEPEND="
+ !dev-php/eaccelerator
+ !dev-php/xcache
+ !dev-php/pecl-apcu
+ !dev-php/pecl-zendopcache
+ dev-lang/php[-opcache(-)]"
RDEPEND="${DEPEND}"
LOCKS="pthreadmutex pthreadrw spinlock semaphore"