16 files changed, 6 insertions, 286 deletions
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index a9a1c36e33bc..f9f86d987a2c 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.30 2004/08/03 16:26:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.31 2004/08/06 03:17:14 robbat2 Exp $
+
+  05 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> -php-cgi-4.3.4-r2.ebuild,
+  -php-cgi-4.3.5.ebuild, -php-cgi-4.3.6-r1.ebuild, -php-cgi-4.3.6.ebuild,
+  -php-cgi-4.3.6_rc2.ebuild, -php-cgi-4.3.7-r1.ebuild, -php-cgi-4.3.7.ebuild:
+  The Great PHP ebuild cleanup.
 
   03 Aug 2004; <agriffis@gentoo.org> php-cgi-4.3.8.ebuild:
   stable on ia64 for bug 56295
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2 b/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2
deleted file mode 100644
index 76ff348f5e58..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.4-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.5 b/dev-php/php-cgi/files/digest-php-cgi-4.3.5
deleted file mode 100644
index fbe6856b0a8e..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1
deleted file mode 100644
index 207932e5c9af..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
deleted file mode 100644
index 75255b425993..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
-MD5 3075036987c0582ec3b2ab81db727643 hardened-php-4.3.6-0.1.2.patch.gz 10446
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.7 b/dev-php/php-cgi/files/digest-php-cgi-4.3.7
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1
deleted file mode 100644
index 5e33df889730..000000000000
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.7-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5293fdc909a306a2636e0fafcc79442c php-4.3.7.tar.bz2 3963734
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
-MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
-MD5 85faf5afdf7dfcd0368a290a2e00e7d5 hardened-php-4.3.7-0.1.2.patch.gz 9592
diff --git a/dev-php/php-cgi/files/pear_config.diff b/dev-php/php-cgi/files/pear_config.diff
deleted file mode 100644
index 57761db6ac4a..000000000000
--- a/dev-php/php-cgi/files/pear_config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- pear/PEAR/Config.php	2002/12/22 01:43:20	1.35.2.2
-+++ pear/PEAR/Config.php	2003/01/07 23:12:06	1.41
-
-@@ -142,7 +142,7 @@ if (isset($_ENV['PHP_PEAR_PREFERRED_STAT
- if (isset($_ENV['PHP_PEAR_UMASK'])) {
-     define('PEAR_CONFIG_DEFAULT_UMASK', $_ENV['PHP_PEAR_UMASK']);
- } else {
--    define('PEAR_CONFIG_DEFAULT_UMASK', umask());
-+    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
- }
-
- // Default for cache_ttl
diff --git a/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild b/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild
deleted file mode 100644
index 5ee847a40930..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.4-r2.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-sapi"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.5.ebuild b/dev-php/php-cgi/php-cgi-4.3.5.ebuild
deleted file mode 100644
index 9e0a6c5f5422..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.5.ebuild,v 1.2 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild
deleted file mode 100644
index 2736e7da77cb..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6-r1.ebuild,v 1.3 2004/07/04 08:26:01 kloeri Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6.ebuild b/dev-php/php-cgi/php-cgi-4.3.6.ebuild
deleted file mode 100644
index 3d72ff573ead..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild b/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild
deleted file mode 100644
index 81ae33183799..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6_rc2.ebuild,v 1.4 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-SRC_URI_BASE="http://downloads.php.net/ilia/"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild
deleted file mode 100644
index b7ef779147aa..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.7-r1.ebuild,v 1.5 2004/07/08 04:39:16 weeve Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="x86 sparc alpha ~hppa ppc"
-
-# for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.7-r1"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}
diff --git a/dev-php/php-cgi/php-cgi-4.3.7.ebuild b/dev-php/php-cgi/php-cgi-4.3.7.ebuild
deleted file mode 100644
index 9b859924af50..000000000000
--- a/dev-php/php-cgi/php-cgi-4.3.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.7.ebuild,v 1.3 2004/06/25 01:23:25 agriffis Exp $
-
-PHPSAPI="cgi"
-inherit php-sapi eutils
-
-DESCRIPTION="PHP CGI"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa"
-
-src_compile() {
-	# CLI needed to build stuff
-	myconf="${myconf} \
-		--enable-cgi \
-		--enable-cli \
-		--enable-fastcgi"
-
-	php-sapi_src_compile
-}
-
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php-sapi_src_install
-
-	# rename binary
-	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
-}
-
-pkg_postinst() {
-	php-sapi_pkg_postinst
-	einfo "This is a CGI only build."
-}