Patch no longer needed, fixed UPSTREAM.

(Portage version: 2.0.51.22-r1)

6 files changed, 18 insertions, 15 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index d15e24a80e16..3956afca3934 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.238 2005/06/13 19:32:13 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.239 2005/06/15 03:57:46 sebastian Exp $
+
+  15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  mod_php-4.4.0_rc1.ebuild:
+  Patch no longer needed, fixed UPSTREAM.
 
 *mod_php-4.4.0_rc1 (13 Jun 2005)
 
diff --git a/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild b/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild
index cc16b582125a..8fbb644ca232 100644
--- a/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild,v 1.1 2005/06/13 19:32:13 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild,v 1.2 2005/06/15 03:57:46 sebastian Exp $
 
 SRC_URI_BASE="http://qa.php.net/~derick"
 IUSE="${IUSE} apache2"
@@ -90,9 +90,6 @@ src_unpack() {
 	# second revision as the apache2 stuff was resolved upstream
 	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
 
-	# Bug 88756
-	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
-
 	# Bug 88795
 	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
 
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 6083869ebcb3..c2761dd68cc0 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.74 2005/06/13 19:32:58 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.75 2005/06/15 03:56:16 sebastian Exp $
+
+  15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  php-cgi-4.4.0_rc1.ebuild:
+  Patch no longer needed, fixed UPSTREAM.
 
 *php-cgi-4.4.0_rc1 (13 Jun 2005)
 
diff --git a/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild b/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild
index 4f9690b67d4f..727b167f65d7 100644
--- a/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild
+++ b/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.0_rc1.ebuild,v 1.1 2005/06/13 19:32:58 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild,v 1.2 2005/06/15 03:56:16 sebastian Exp $
 
 SRC_URI_BASE="http://qa.php.net/~derick"
 PHPSAPI="cgi"
@@ -18,9 +18,6 @@ PROVIDE="${PROVIDE} virtual/httpd-php"
 src_unpack() {
 	php-sapi_src_unpack
 
-	# Bug 88756
-	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
-
 	# Bug 88795
 	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
 }
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 82b4fb442f35..98105cd698b1 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.166 2005/06/13 19:31:09 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.167 2005/06/15 03:54:40 sebastian Exp $
+
+  15 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  php-4.4.0_rc1.ebuild:
+  Patch no longer needed, fixed UPSTREAM.
 
 *php-4.4.0_rc1 (13 Jun 2005)
 
diff --git a/dev-php/php/php-4.4.0_rc1.ebuild b/dev-php/php/php-4.4.0_rc1.ebuild
index f99c81e7451e..f3d8971f88d8 100644
--- a/dev-php/php/php-4.4.0_rc1.ebuild
+++ b/dev-php/php/php-4.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.4.0_rc1.ebuild,v 1.1 2005/06/13 19:31:09 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.4.0_rc1.ebuild,v 1.2 2005/06/15 03:54:40 sebastian Exp $
 
 PHPSAPI="cli"
 SRC_URI_BASE="http://qa.php.net/~derick"
@@ -15,9 +15,6 @@ src_unpack() {
 	php-sapi_src_unpack
 	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
 
-	# Bug 88756
-	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
-
 	# Bug 88795
 	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
 }