LICENSE fix from project overlay

(Portage version: 2.1.4_rc7)

6 files changed, 17 insertions, 36 deletions

diff --git a/dev-php5/pecl-memcache/ChangeLog b/dev-php5/pecl-memcache/ChangeLog
index 0a3f72804fee..cb710f53e1ff 100644
--- a/dev-php5/pecl-memcache/ChangeLog
+++ b/dev-php5/pecl-memcache/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php5/pecl-memcache
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/ChangeLog,v 1.19 2007/11/29 23:51:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/ChangeLog,v 1.20 2007/12/06 01:19:01 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> pecl-memcache-2.0.4.ebuild,
+  -pecl-memcache-2.1.2.ebuild, pecl-memcache-2.2.1.ebuild,
+  pecl-memcache-3.0.0.ebuild:
+  LICENSE fix from project overlay
+
+  03 Dec 2007; Jakub Moc <jakub@gentoo.org>
+  pecl-memcache-2.0.4.ebuild, pecl-memcache-2.2.1.ebuild,
+  pecl-memcache-3.0.0.ebuild:
+  Fix LICENSE
 
 *pecl-memcache-3.0.0 (29 Nov 2007)
 
diff --git a/dev-php5/pecl-memcache/files/digest-pecl-memcache-2.1.2 b/dev-php5/pecl-memcache/files/digest-pecl-memcache-2.1.2
deleted file mode 100644
index fd2cedef793d..000000000000
--- a/dev-php5/pecl-memcache/files/digest-pecl-memcache-2.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfde0918360f3909a242c3211604ad46 memcache-2.1.2.tgz 22285
-RMD160 b6831e67d7bb6457bc5a8b90734604babd8b1343 memcache-2.1.2.tgz 22285
-SHA256 6f1a349f66f4401ff581ac46d09b11c1a6a2e4190ba55ed5fd1f9088fe891244 memcache-2.1.2.tgz 22285
diff --git a/dev-php5/pecl-memcache/pecl-memcache-2.0.4.ebuild b/dev-php5/pecl-memcache/pecl-memcache-2.0.4.ebuild
index dde07d22353d..a1cc80e14966 100644
--- a/dev-php5/pecl-memcache/pecl-memcache-2.0.4.ebuild
+++ b/dev-php5/pecl-memcache/pecl-memcache-2.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-memcache/pecl-memcache-2.0.4.ebuild,v 1.2 2007/03/18 00:19:43 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/pecl-memcache-2.0.4.ebuild,v 1.3 2007/12/06 01:19:01 jokey Exp $
 
 PHP_EXT_NAME="memcache"
 PHP_EXT_INI="yes"
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 hppa ~ppc ~ppc64 sparc ~x86"
 
 DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-memcache/pecl-memcache-2.1.2.ebuild b/dev-php5/pecl-memcache/pecl-memcache-2.1.2.ebuild
deleted file mode 100644
index 69b46eb20797..000000000000
--- a/dev-php5/pecl-memcache/pecl-memcache-2.1.2.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-memcache/pecl-memcache-2.1.2.ebuild,v 1.1 2007/08/20 21:09:59 jokey Exp $
-
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-src_compile() {
-	my_conf="--enable-memcache --with-zlib-dir=/usr"
-	php-ext-pecl-r1_src_compile
-}
diff --git a/dev-php5/pecl-memcache/pecl-memcache-2.2.1.ebuild b/dev-php5/pecl-memcache/pecl-memcache-2.2.1.ebuild
index 89335f05608e..487ca3f62ae3 100644
--- a/dev-php5/pecl-memcache/pecl-memcache-2.2.1.ebuild
+++ b/dev-php5/pecl-memcache/pecl-memcache-2.2.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-memcache/pecl-memcache-2.2.1.ebuild,v 1.1 2007/11/15 19:15:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/pecl-memcache-2.2.1.ebuild,v 1.2 2007/12/06 01:19:01 jokey Exp $
 
 PHP_EXT_NAME="memcache"
 PHP_EXT_INI="yes"
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r1
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php5/pecl-memcache/pecl-memcache-3.0.0.ebuild b/dev-php5/pecl-memcache/pecl-memcache-3.0.0.ebuild
index d3aa6dfdf2e3..88f4e11fd367 100644
--- a/dev-php5/pecl-memcache/pecl-memcache-3.0.0.ebuild
+++ b/dev-php5/pecl-memcache/pecl-memcache-3.0.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-memcache/pecl-memcache-3.0.0.ebuild,v 1.1 2007/11/29 23:51:03 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/pecl-memcache-3.0.0.ebuild,v 1.2 2007/12/06 01:19:01 jokey Exp $
 
 PHP_EXT_NAME="memcache"
 PHP_EXT_INI="yes"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1 php-ext-base-r1
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP"
+LICENSE="PHP-3"
 SLOT="0"
 IUSE=""