[patch] diff -Nau php-5.2.5-r1.ebuild php-5.2.5_p20080206.ebuild

php.diff (text/plain), 2.00 KB, created by Jakub Moc (RETIRED) on 2008-02-10 15:20:39 UTC

--- php-5.2.5-r1.ebuild	2007-12-15 16:05:55.000000000 +0100
+++ php-5.2.5_p20080206.ebuild	2008-02-08 16:35:28.000000000 +0100
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.5-r1.ebuild,v 1.7 2007/12/15 14:44:10 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.5_p20080206.ebuild,v 1.6 2008/02/08 15:35:07 armin76 Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
 IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
@@ -20,8 +20,8 @@
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="1"
-SUHOSIN_PATCH="suhosin-patch-${PV}-0.9.6.2.patch.gz"
+PHP_PATCHSET_REV="0"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
@@ -29,6 +29,12 @@
 
 inherit versionator php5_2-sapi apache-module
 
+SRC_URI="http://gentoo.longitekk.com/${P}.tar.bz2
+	http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2"
+
+# Suhosin patch support
+[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
+
 DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
 
 DEPEND="app-admin/php-toolkit"
@@ -155,6 +161,9 @@
 		fi
 	fi
 
+	sed -re 's:^(PHP_RELEASE_VERSION=).*$:\15:g' -i configure.in
+	PHP_EXTRA_BRANDING="-p${PV/*_p/}"
+
 	# Now let the eclass do the rest and regenerate the configure
 	php5_2-sapi_src_unpack