From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OXLxp-0006NM-P4 for garchives@archives.gentoo.org; Fri, 09 Jul 2010 22:22:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB9EAE0B38; Fri, 9 Jul 2010 22:22:31 +0000 (UTC) Received: from earth.farbfinsternis.net (earth.farbfinsternis.net [87.118.98.117]) by pigeon.gentoo.org (Postfix) with ESMTP id B0EFBE0B2D for ; Fri, 9 Jul 2010 22:22:14 +0000 (UTC) Received: from [192.168.178.26] (p4FD5463A.dip0.t-ipconnect.de [79.213.70.58]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by earth.farbfinsternis.net (Postfix) with ESMTPSA id 10B26878004 for ; Sat, 10 Jul 2010 00:29:21 +0200 (CEST) Message-ID: <4C37A114.9070604@gentoo.org> Date: Sat, 10 Jul 2010 00:22:12 +0200 From: Matti Bickel User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Lightning/1.0b1 Thunderbird/3.0.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] RFC: remove php4 from depend.php and others X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigAEB3F7BFEBB9BDA3F0BB8C2F" X-Archives-Salt: e7b3c8b2-9bb9-4bc2-bdf0-65b85a78cc4f X-Archives-Hash: e49086b492f8b67c9620f2af6d22e0b2 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigAEB3F7BFEBB9BDA3F0BB8C2F Content-Type: multipart/mixed; boundary="------------040905070704070007050001" This is a multi-part message in MIME format. --------------040905070704070007050001 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, yet another patch from Ole in a bid to rid the php eclasses from some long forgotten code. The patches should be self-explanatory - just rip out everything related to dev-php4 :) Comments welcome. All the work will go into our overlay (slotting branch: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/php.git;a=3Dtree;h=3Drefs= /heads/slotting;hb=3Dslotting) before migration to the tree. --------------040905070704070007050001 Content-Type: text/x-patch; name="02_remov_php4_from_depend.php.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="02_remov_php4_from_depend.php.patch" diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass index 681e6dd..c194449 100644 --- a/eclass/depend.php.eclass +++ b/eclass/depend.php.eclass @@ -18,57 +18,6 @@ =20 inherit eutils phpconfutils =20 -# PHP4-only depend functions - -# @FUNCTION: need_php4_cli -# @DESCRIPTION: -# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild req= uires PHP4 -# with cli SAPI. -need_php4_cli() { - DEPEND=3D"${DEPEND} =3Ddev-lang/php-4*[cli]" - RDEPEND=3D"${RDEPEND} =3Ddev-lang//php-4*[cli]" - PHP_VERSION=3D"4" -} - -# @FUNCTION: need_php4_httpd -# @DESCRIPTION: -# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild req= uires PHP4 -# with either cgi or apache2 SAPI. -need_php4_httpd() { - DEPEND=3D"${DEPEND} =3Dvirtual/httpd-php-4*" - RDEPEND=3D"${RDEPEND} =3Dvirtual/httpd-php-4*" - PHP_VERSION=3D"4" -} - -# @FUNCTION: need_php4 -# @DESCRIPTION: -# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild req= uires PHP4 -# (with any SAPI). -need_php4() { - DEPEND=3D"${DEPEND} =3Ddev-lang/php-4*" - RDEPEND=3D"${RDEPEND} =3Ddev-lang/php-4*" - PHP_VERSION=3D"4" - PHP_SHARED_CAT=3D"php4" -} - -# common settings go in here -uses_php4() { - # cache this - libdir=3D$(get_libdir) - - PHPIZE=3D"/usr/${libdir}/php4/bin/phpize" - PHPCONFIG=3D"/usr/${libdir}/php4/bin/php-config" - PHPCLI=3D"/usr/${libdir}/php4/bin/php" - PHPCGI=3D"/usr/${libdir}/php4/bin/php-cgi" - PHP_PKG=3D"$(best_version =3Ddev-lang/php-4*)" - PHPPREFIX=3D"/usr/${libdir}/php4" - EXT_DIR=3D"$(${PHPCONFIG} --extension-dir 2>/dev/null)" - - einfo - einfo "Using ${PHP_PKG}" - einfo -} - # PHP5-only depend functions =20 # @FUNCTION: need_php5_cli @@ -158,7 +107,6 @@ need_php() { need_php_by_category() { case "${CATEGORY}" in dev-php) need_php ;; - dev-php4) need_php4 ;; dev-php5) need_php5 ;; *) die "Version of PHP required by packages in category ${CATEGORY} un= known" esac @@ -174,8 +122,6 @@ has_php() { # Detect which PHP version we have installed if has_version '=3Ddev-lang/php-5*' ; then PHP_VERSION=3D"5" - elif has_version '=3Ddev-lang/php-4*' ; then - PHP_VERSION=3D"4" else die "Unable to find an installed dev-lang/php package" fi @@ -396,17 +342,6 @@ has_concurrentmodphp() { require_pdo() { has_php =20 - # Do we have PHP5 installed? - if [[ "${PHP_VERSION}" =3D=3D "4" ]] ; then - eerror - eerror "This package requires PDO." - eerror "PDO is only available for PHP 5." - eerror "You must install >=3Ddev-lang/php-5.1 with USE=3D\"pdo\"." - eerror "pdo USE flags turned on." - eerror - die "PHP 5 not installed" - fi - # Was PHP5 compiled with internal PDO support? if built_with_use =3D${PHP_PKG} pdo || phpconfutils_built_with_use =3D$= {PHP_PKG} pdo ; then return @@ -436,15 +371,6 @@ require_php_cli() { =20 local PHP_PACKAGE_FOUND=3D"" =20 - # Detect which PHP version we have installed - if has_version '=3Ddev-lang/php-4*' ; then - PHP_PACKAGE_FOUND=3D"1" - pkg=3D"$(best_version '=3Ddev-lang/php-4*')" - if built_with_use =3D${pkg} cli || phpconfutils_built_with_use =3D${pk= g} cli ; then - PHP_VERSION=3D"4" - fi - fi - if has_version '=3Ddev-lang/php-5*' ; then PHP_PACKAGE_FOUND=3D"1" pkg=3D"$(best_version '=3Ddev-lang/php-5*')" @@ -480,15 +406,6 @@ require_php_cgi() { =20 local PHP_PACKAGE_FOUND=3D"" =20 - # Detect which PHP version we have installed - if has_version '=3Ddev-lang/php-4*' ; then - PHP_PACKAGE_FOUND=3D"1" - pkg=3D"$(best_version '=3Ddev-lang/php-4*')" - if built_with_use =3D${pkg} cgi || phpconfutils_built_with_use =3D${pk= g} cgi ; then - PHP_VERSION=3D"4" - fi - fi - if has_version '=3Ddev-lang/php-5*' ; then PHP_PACKAGE_FOUND=3D"1" pkg=3D"$(best_version '=3Ddev-lang/php-5*')" @@ -522,13 +439,6 @@ require_sqlite() { return fi =20 - # Do we have pecl-sqlite installed for PHP4? - if [[ "${PHP_VERSION}" =3D=3D "4" ]] ; then - if has_version 'dev-php4/pecl-sqlite' ; then - return - fi - fi - # If we get here, then we don't have any SQLite support for PHP install= ed eerror eerror "No SQLite extension for PHP found." --------------040905070704070007050001 Content-Type: text/x-patch; name="03_removed_all_traces_of_php4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="03_removed_all_traces_of_php4.patch" diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclas= s index 5c58dce..f5fdd7f 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -33,17 +33,7 @@ php-pear-lib-r1_src_install() { addpredict /var/lib/net-snmp/ addpredict /session_mm_cli0.sem =20 - case "${CATEGORY}" in - dev-php) - if has_version '=3Ddev-lang/php-5*' ; then - PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" - else - PHP_BIN=3D"/usr/$(get_libdir)/php4/bin/php" - fi ;; - dev-php4) PHP_BIN=3D"/usr/$(get_libdir)/php4/bin/php" ;; - dev-php5) PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" ;; - *) die "Version of PHP required by packages in category ${CATEGORY} un= known" - esac + PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" =20 cd "${S}" =20 diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index f1b1c55..d1bb86f 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -60,17 +60,7 @@ php-pear-r1_src_install() { addpredict /var/lib/net-snmp/ addpredict /session_mm_cli0.sem =20 - case "${CATEGORY}" in - dev-php) - if has_version '=3Ddev-lang/php-5*' ; then - PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" - else - PHP_BIN=3D"/usr/$(get_libdir)/php4/bin/php" - fi ;; - dev-php4) PHP_BIN=3D"/usr/$(get_libdir)/php4/bin/php" ;; - dev-php5) PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" ;; - *) die "Version of PHP required by packages in category ${CATEGORY} un= known" - esac + PHP_BIN=3D"/usr/$(get_libdir)/php5/bin/php" =20 cd "${S}" =20 --------------040905070704070007050001-- --------------enigAEB3F7BFEBB9BDA3F0BB8C2F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkw3oRQACgkQfNMcoUhJ7GwzSACgoXYBNBV2hDANYNbUzuKhqmPW IZAAniz+bZBE63j6FsnLdVgNfiIVIakG =iSIp -----END PGP SIGNATURE----- --------------enigAEB3F7BFEBB9BDA3F0BB8C2F--