LICENSE fix from project overlay

Package-Manager: portage-2.1.4_rc7

31 files changed, 112 insertions, 222 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"'
diff --git a/dev-php5/pecl-bbcode/ChangeLog b/dev-php5/pecl-bbcode/ChangeLog
index b4184068578c..bbd8c1b1db18 100644
--- a/dev-php5/pecl-bbcode/ChangeLog
+++ b/dev-php5/pecl-bbcode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-bbcode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-bbcode/ChangeLog,v 1.1 2007/11/15 19:10:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-bbcode/ChangeLog,v 1.2 2007/12/06 01:06:01 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-bbcode-0.10.4.ebuild:
+  LICENSE fix from project overlay
+
+  02 Dec 2007; Jakub Moc <jakub@gentoo.org>
+  pecl-bbcode-0.10.4.ebuild:
+  Fix license
 
 *pecl-bbcode-0.10.4 (15 Nov 2007)
 
diff --git a/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild b/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild
index 84dc91440dad..70abf72f6edf 100644
--- a/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild
+++ b/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild,v 1.1 2007/11/15 19:10:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-bbcode/pecl-bbcode-0.10.4.ebuild,v 1.2 2007/12/06 01:06:01 jokey Exp $
 
 PHP_EXT_NAME="bbcode"
 PHP_EXT_INI="yes"
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~x86"
 
 DESCRIPTION="A quick and efficient BBCode Parsing Library."
-LICENSE="PHP"
+LICENSE="PHP-3.01 BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-crack/ChangeLog b/dev-php5/pecl-crack/ChangeLog
index f61447af15c4..1313b133ece4 100644
--- a/dev-php5/pecl-crack/ChangeLog
+++ b/dev-php5/pecl-crack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-crack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.17 2007/08/20 20:43:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.18 2007/12/06 01:06:34 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-crack-0.4.ebuild:
+  LICENSE fix from project overlay
+
+  02 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-crack-0.4.ebuild:
+  Fix LICENSE
 
   20 Aug 2007; Markus Ullmann <jokey@gentoo.org> pecl-crack-0.4.ebuild:
   Stable on x86 wrt bug #187234
diff --git a/dev-php5/pecl-crack/pecl-crack-0.4.ebuild b/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
index 3796d20f3cd4..4ff8e09df9fd 100644
--- a/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
+++ b/dev-php5/pecl-crack/pecl-crack-0.4.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.4.ebuild,v 1.7 2007/08/20 20:43:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.4.ebuild,v 1.8 2007/12/06 01:06:34 jokey Exp $
 
 PHP_EXT_NAME="crack"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
+DOCS="EXPERIMENTAL"
 
 inherit php-ext-pecl-r1
 
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries."
-LICENSE="PHP"
+LICENSE="PHP-3 CRACKLIB"
 SLOT="0"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
 
 need_php_by_category
 
diff --git a/dev-php5/pecl-dbx/ChangeLog b/dev-php5/pecl-dbx/ChangeLog
index a354445bb500..d2cdb19dc74b 100644
--- a/dev-php5/pecl-dbx/ChangeLog
+++ b/dev-php5/pecl-dbx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-dbx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/ChangeLog,v 1.7 2007/03/17 23:50:25 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/ChangeLog,v 1.8 2007/12/06 01:06:43 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-dbx-1.1.0.ebuild:
+  LICENSE fix from project overlay
+
+  02 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-dbx-1.1.0.ebuild:
+  Fix LICENSE
 
   17 Mar 2007; Luca Longinotti <chtekk@gentoo.org> pecl-dbx-1.1.0.ebuild:
   Cleanup.
diff --git a/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild b/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild
index cf9a2785c210..511b6a50d2d5 100644
--- a/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild
+++ b/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild,v 1.7 2007/03/17 23:50:25 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild,v 1.8 2007/12/06 01:06:43 jokey Exp $
 
 PHP_EXT_NAME="dbx"
 PHP_EXT_INI="yes"
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="The dbx module is a database abstraction layer."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-enchant/ChangeLog b/dev-php5/pecl-enchant/ChangeLog
index 1cd1bb3c87f2..00051d17bfc4 100644
--- a/dev-php5/pecl-enchant/ChangeLog
+++ b/dev-php5/pecl-enchant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-enchant
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-enchant/ChangeLog,v 1.1 2007/11/15 19:11:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-enchant/ChangeLog,v 1.2 2007/12/06 01:08:40 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-enchant-1.0.1.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-enchant-1.0.1.ebuild:
+  Fix LICENSE
 
 *pecl-enchant-1.0.1 (15 Nov 2007)
 
diff --git a/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild b/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild
index e9262e993c69..a62fa1e0af11 100644
--- a/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild
+++ b/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild,v 1.1 2007/11/15 19:11:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-enchant/pecl-enchant-1.0.1.ebuild,v 1.2 2007/12/06 01:08:40 jokey Exp $
 
 PHP_EXT_NAME="enchant"
 PHP_EXT_INI="yes"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~x86"
 
 DESCRIPTION="PHP bindings for the Enchant spellchecking wrapper library."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-fileinfo/ChangeLog b/dev-php5/pecl-fileinfo/ChangeLog
index 13e07f7bb04f..ef89de533865 100644
--- a/dev-php5/pecl-fileinfo/ChangeLog
+++ b/dev-php5/pecl-fileinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-fileinfo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/ChangeLog,v 1.21 2007/09/06 16:04:49 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/ChangeLog,v 1.22 2007/12/06 01:07:20 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-fileinfo-1.0.4.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-fileinfo-1.0.4.ebuild:
+  Fix LICENSE
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
   -pecl-fileinfo-1.0.3.ebuild:
diff --git a/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild b/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild
index bea16d769a21..c7f866598bd9 100644
--- a/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild
+++ b/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild,v 1.6 2007/06/01 17:11:58 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.4.ebuild,v 1.7 2007/12/06 01:07:20 jokey Exp $
 
 PHP_EXT_NAME="fileinfo"
 PHP_EXT_PECL_PKG="Fileinfo"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 
 DESCRIPTION="libmagic bindings for PHP."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-geoip/ChangeLog b/dev-php5/pecl-geoip/ChangeLog
index 9839102d1713..c537bde38593 100644
--- a/dev-php5/pecl-geoip/ChangeLog
+++ b/dev-php5/pecl-geoip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-geoip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-geoip/ChangeLog,v 1.2 2007/11/29 23:46:13 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-geoip/ChangeLog,v 1.3 2007/12/06 01:07:37 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> -pecl-geoip-1.0.1.ebuild,
+  pecl-geoip-1.0.2.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-geoip-1.0.2.ebuild:
+  Fix LICENSE
 
 *pecl-geoip-1.0.2 (29 Nov 2007)
 
diff --git a/dev-php5/pecl-geoip/files/digest-pecl-geoip-1.0.1 b/dev-php5/pecl-geoip/files/digest-pecl-geoip-1.0.1
deleted file mode 100644
index 66017e5a3b2e..000000000000
--- a/dev-php5/pecl-geoip/files/digest-pecl-geoip-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fee50e727824cdd4e6354b326fe349e0 geoip-1.0.1.tgz 7541
-RMD160 587a9fb58f429cfaf2e76c12cd13d0538e8b0176 geoip-1.0.1.tgz 7541
-SHA256 1f130f04be04683f27792b9d88ac54e376b0aa5628e17e16a864f135cdce8d8f geoip-1.0.1.tgz 7541
diff --git a/dev-php5/pecl-geoip/pecl-geoip-1.0.1.ebuild b/dev-php5/pecl-geoip/pecl-geoip-1.0.1.ebuild
deleted file mode 100644
index a753b055c31f..000000000000
--- a/dev-php5/pecl-geoip/pecl-geoip-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +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-geoip/pecl-geoip-1.0.1.ebuild,v 1.1 2007/08/30 13:02:22 jokey Exp $
-
-PHP_EXT_NAME="geoip"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/geoip-1.4.0"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-src_install() {
-	php-ext-pecl-r1_src_install
-	dodoc-php README ChangeLog
-}
diff --git a/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild b/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild
index bb05c15c1c81..da2ab1c7c0be 100644
--- a/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild
+++ b/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild,v 1.1 2007/11/29 23:46:13 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-geoip/pecl-geoip-1.0.2.ebuild,v 1.2 2007/12/06 01:07:37 jokey Exp $
 
 PHP_EXT_NAME="geoip"
 PHP_EXT_INI="yes"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-htscanner/ChangeLog b/dev-php5/pecl-htscanner/ChangeLog
index 26994dee212b..2fedc5889627 100644
--- a/dev-php5/pecl-htscanner/ChangeLog
+++ b/dev-php5/pecl-htscanner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-htscanner
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-htscanner/ChangeLog,v 1.2 2007/11/30 00:30:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-htscanner/ChangeLog,v 1.3 2007/12/06 01:08:00 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  pecl-htscanner-0.8.1.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-htscanner-0.8.1.ebuild:
+  Fix LICENSE
 
   30 Nov 2007; Markus Ullmann <jokey@gentoo.org>
   pecl-htscanner-0.8.1.ebuild:
diff --git a/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild b/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild
index d05d16e32234..33f0f718ccb2 100644
--- a/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild
+++ b/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild,v 1.2 2007/11/30 00:30:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-htscanner/pecl-htscanner-0.8.1.ebuild,v 1.3 2007/12/06 01:08:00 jokey Exp $
 
 PHP_EXT_NAME="htscanner"
 PHP_EXT_INI="yes"
@@ -13,7 +13,7 @@ inherit php-ext-pecl-r1 eutils depend.php php-ext-base-r1
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Enables .htaccess options for php-scripts running as cgi."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-http/ChangeLog b/dev-php5/pecl-http/ChangeLog
index 3e11b2533ee0..c6c71e592e95 100644
--- a/dev-php5/pecl-http/ChangeLog
+++ b/dev-php5/pecl-http/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-http
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-http/ChangeLog,v 1.9 2007/11/29 23:49:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-http/ChangeLog,v 1.10 2007/12/06 01:09:29 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> -pecl-http-1.5.6.ebuild,
+  pecl-http-1.6.0.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-http-1.6.0.ebuild:
+  Fix LICENSE
 
 *pecl-http-1.6.0 (29 Nov 2007)
 
diff --git a/dev-php5/pecl-http/files/digest-pecl-http-1.5.6 b/dev-php5/pecl-http/files/digest-pecl-http-1.5.6
deleted file mode 100644
index 337e7e045a03..000000000000
--- a/dev-php5/pecl-http/files/digest-pecl-http-1.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26115e3b845e8ae66a8ba33c9c5c2626 pecl_http-1.5.6.tgz 168420
-RMD160 9398bb62b1b3defcaadda5215efd555ba1f4331e pecl_http-1.5.6.tgz 168420
-SHA256 f40a4cc77e42e8ff57d90875e90e1145c8389311c2ea759615c825a755c0e2f6 pecl_http-1.5.6.tgz 168420
diff --git a/dev-php5/pecl-http/pecl-http-1.5.6.ebuild b/dev-php5/pecl-http/pecl-http-1.5.6.ebuild
deleted file mode 100644
index f77f6dbf90bc..000000000000
--- a/dev-php5/pecl-http/pecl-http-1.5.6.ebuild
+++ /dev/null
@@ -1,40 +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-http/pecl-http-1.5.6.ebuild,v 1.1 2007/10/10 20:56:45 anant Exp $
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="docs/examples/tutorial.txt"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP."
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="net-misc/curl
-		sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-src_compile() {
-	my_conf="--enable-http \
-			--with-http-curl-requests \
-			--with-http-zlib-compression"
-
-	php-ext-pecl-r1_src_compile
-}
-
-pkg_postinst() {
-	has_php
-	if ! built_with_use --missing true =${PHP_PKG} hash iconv session spl ; then
-		elog "${PN} can optionally use hash, iconv, session and spl features."
-		elog "If you want those, recompile ${PHP_PKG} with those flags in USE."
-	fi
-}
diff --git a/dev-php5/pecl-http/pecl-http-1.6.0.ebuild b/dev-php5/pecl-http/pecl-http-1.6.0.ebuild
index c5703f87ddb4..8eaf3a206e7d 100644
--- a/dev-php5/pecl-http/pecl-http-1.6.0.ebuild
+++ b/dev-php5/pecl-http/pecl-http-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-http/pecl-http-1.6.0.ebuild,v 1.1 2007/11/29 23:49:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-http/pecl-http-1.6.0.ebuild,v 1.2 2007/12/06 01:09:29 jokey Exp $
 
 PHP_EXT_NAME="http"
 PHP_EXT_PECL_PKG="pecl_http"
@@ -13,7 +13,7 @@ inherit php-ext-pecl-r1 php-ext-base-r1
 KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Extended HTTP Support for PHP."
-LICENSE="BSD"
+LICENSE="BSD-2 MIT"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-imagick/ChangeLog b/dev-php5/pecl-imagick/ChangeLog
index a98bc60fd266..56b10126fd78 100644
--- a/dev-php5/pecl-imagick/ChangeLog
+++ b/dev-php5/pecl-imagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-imagick
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/ChangeLog,v 1.12 2007/10/28 11:57:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/ChangeLog,v 1.13 2007/12/06 01:11:10 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-imagick-2.0.1.ebuild:
+  Fix LICENSE
 
 *pecl-imagick-2.0.1 (28 Oct 2007)
 
diff --git a/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild b/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild
index 9d0173c26e69..92861380b6a9 100644
--- a/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild
+++ b/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild,v 1.1 2007/10/28 11:57:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/pecl-imagick-2.0.1.ebuild,v 1.2 2007/12/06 01:11:10 jokey Exp $
 
 PHP_EXT_NAME="imagick"
 PHP_EXT_INI="yes"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="PHP wrapper for the ImageMagick library."
-LICENSE="PHP"
+LICENSE="PHP-3.01"
 SLOT="0"
 IUSE="examples"
 
@@ -20,3 +20,4 @@ DEPEND=">=media-gfx/imagemagick-6.2.4"
 RDEPEND="${DEPEND}"
 
 need_php_by_category
+my_conf="--with-imagick=/usr"
diff --git a/dev-php5/pecl-mailparse/ChangeLog b/dev-php5/pecl-mailparse/ChangeLog
index 63a1d9d561a3..efcbd866a216 100644
--- a/dev-php5/pecl-mailparse/ChangeLog
+++ b/dev-php5/pecl-mailparse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-mailparse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.13 2007/11/15 19:13:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.14 2007/12/06 01:12:02 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  -pecl-mailparse-2.1.1-r1.ebuild, pecl-mailparse-2.1.2.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org> pecl-mailparse-2.1.2.ebuild:
+  Fix LICENSE
 
 *pecl-mailparse-2.1.2 (15 Nov 2007)
 
diff --git a/dev-php5/pecl-mailparse/files/digest-pecl-mailparse-2.1.1-r1 b/dev-php5/pecl-mailparse/files/digest-pecl-mailparse-2.1.1-r1
deleted file mode 100644
index 7e959a55cfb4..000000000000
--- a/dev-php5/pecl-mailparse/files/digest-pecl-mailparse-2.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14c058d79f1f6c01aa53273565bd4a54 mailparse-2.1.1.tgz 35883
-RMD160 6b8452301b53167dea9bbdca3c46889c52ada474 mailparse-2.1.1.tgz 35883
-SHA256 c7bcccf079c70dfd76c07074bae3653d3c7ab64441ab888bf5a5e334f83ad206 mailparse-2.1.1.tgz 35883
diff --git a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1-r1.ebuild b/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1-r1.ebuild
deleted file mode 100644
index 35904e11b5c1..000000000000
--- a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,39 +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-mailparse/pecl-mailparse-2.1.1-r1.ebuild,v 1.1 2007/09/04 18:41:28 jokey Exp $
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-DOCS="README"
-inherit php-ext-pecl-r1
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages."
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-need_php_by_category
-
-pkg_setup() {
-	has_php
-	require_php_with_use unicode
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch against segfaults
-	epatch "${FILESDIR}/cvs-mailparse.c-fix.diff"
-	epatch "${FILESDIR}/mailparse-c-64bit-segfault.diff" # PECL Bug #7722
-
-	# PECL bug #9624
-	epatch "${FILESDIR}/mailparse_mime-rfc2231.diff"
-}
diff --git a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild b/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild
index cf135bdb1535..d2d13c1a9074 100644
--- a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild
+++ b/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild,v 1.1 2007/11/15 19:13:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/pecl-mailparse-2.1.2.ebuild,v 1.2 2007/12/06 01:12:02 jokey Exp $
 
 PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages."
-LICENSE="PHP"
+LICENSE="PHP-2.02"
 SLOT="0"
 IUSE=""