LICENSE fix from project overlay

(Portage version: 2.1.4_rc7)

5 files changed, 15 insertions, 77 deletions

diff --git a/dev-php5/pecl-apc/ChangeLog b/dev-php5/pecl-apc/ChangeLog
index b385252c601e..aa373b126c88 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.30 2007/11/12 10:44:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.31 2007/12/06 01:05:47 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-apc-3.0.12_p2.ebuild,
+  -pecl-apc-3.0.14.ebuild, pecl-apc-3.0.15.ebuild:
+  LICENSE fix from project overlay
+
+  02 Dec 2007; Jakub Moc <jakub@gentoo.org>
+  pecl-apc-3.0.12_p2.ebuild, pecl-apc-3.0.15.ebuild:
+  Fix LICENSE, install more docs
 
   12 Nov 2007; Raúl Porcel <armin76@gentoo.org> pecl-apc-3.0.15.ebuild:
   sparc stable wrt #198566
diff --git a/dev-php5/pecl-apc/files/digest-pecl-apc-3.0.14 b/dev-php5/pecl-apc/files/digest-pecl-apc-3.0.14
deleted file mode 100644
index 415ca2aa9d49..000000000000
--- a/dev-php5/pecl-apc/files/digest-pecl-apc-3.0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f452f936239b6107d3e2e5cda4f4bda APC-3.0.14.tgz 108511
-RMD160 59c76ae8ae4aa237d118e0860c42f11e416751d1 APC-3.0.14.tgz 108511
-SHA256 f05195d163983a8f36336e622e6008bfecd4643d7c5613a6e4a8b07ed735e050 APC-3.0.14.tgz 108511
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.12_p2.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.12_p2.ebuild
index f1733e34b1c5..a38a3e4b9de5 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.0.12_p2.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.0.12_p2.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2007 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.12_p2.ebuild,v 1.11 2007/05/12 14:30:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.12_p2.ebuild,v 1.12 2007/12/06 01:05:47 jokey 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
 
 KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP"
+LICENSE="PHP-3.01"
 SLOT="0"
 IUSE="mmap"
 
@@ -47,7 +48,6 @@ src_compile() {
 
 src_install() {
 	php-ext-pecl-r1_src_install
-	dodoc-php CHANGELOG INSTALL LICENSE NOTICE
 
 	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
 	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.14.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.14.ebuild
deleted file mode 100644
index c516aacf4115..000000000000
--- a/dev-php5/pecl-apc/pecl-apc-3.0.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 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.14.ebuild,v 1.1 2007/06/30 17:23:32 voxus Exp $
-
-PHP_EXT_NAME="apc"
-PHP_EXT_PECL_PKG="APC"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1 confutils
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP"
-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_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
-	dodoc-php CHANGELOG INSTALL LICENSE NOTICE
-
-	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.15.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.15.ebuild
index a6f04dabc303..6e4d31fe17e9 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.0.15.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.0.15.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2007 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.15.ebuild,v 1.4 2007/11/12 10:44:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.15.ebuild,v 1.5 2007/12/06 01:05:47 jokey 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
 
 KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
 
 DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code."
-LICENSE="PHP"
+LICENSE="PHP-3.01"
 SLOT="0"
 IUSE="mmap"
 
@@ -38,7 +39,6 @@ src_compile() {
 
 src_install() {
 	php-ext-pecl-r1_src_install
-	dodoc-php CHANGELOG INSTALL LICENSE NOTICE
 
 	php-ext-base-r1_addtoinifiles "apc.enabled" '"1"'
 	php-ext-base-r1_addtoinifiles "apc.shm_segments" '"1"'