summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-08-08 20:32:23 +0000
committerMatti Bickel <mabi@gentoo.org>2010-08-08 20:32:23 +0000
commit4976d8043b1cf869387b6de6ad31f80af1fd41af (patch)
tree9489a257661639a216e0ca0dfd3a0b1181eccdad /dev-lang
parentnetbeans-6.9.1: updated list of bundled runtime jars (diff)
downloadhistorical-4976d8043b1cf869387b6de6ad31f80af1fd41af.tar.gz
historical-4976d8043b1cf869387b6de6ad31f80af1fd41af.tar.bz2
historical-4976d8043b1cf869387b6de6ad31f80af1fd41af.zip
fix QA warnings
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/ChangeLog11
-rw-r--r--dev-lang/php/Manifest12
-rw-r--r--dev-lang/php/files/eblits/src_compile-v1.eblit39
-rw-r--r--dev-lang/php/files/eblits/src_configure-v1.eblit36
-rw-r--r--dev-lang/php/files/eblits/src_install-v1.eblit12
-rw-r--r--dev-lang/php/php-5.3.3-r1.ebuild (renamed from dev-lang/php/php-5.3.3.ebuild)12
6 files changed, 71 insertions, 51 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index fbde0f649c25..783f9ac3a80d 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.401 2010/08/03 08:58:17 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.402 2010/08/08 20:32:23 mabi Exp $
+
+*php-5.3.3-r1 (08 Aug 2010)
+
+ 08 Aug 2010; Matti Bickel <mabi@gentoo.org>
+ files/eblits/src_compile-v1.eblit, -php-5.3.3.ebuild,
+ files/eblits/src_configure-v1.eblit, files/eblits/src_install-v1.eblit,
+ +php-5.3.3-r1.ebuild:
+ fix QA warnings by building each SAPI in its own dir, add patch to fix bug
+ #327589 (thanks to Martin von Gagern)
03 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild:
added missing mhash in IUSE
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index e983ce83c7e5..cb132ed8a68a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,10 +6,10 @@ AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7a
AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
-AUX eblits/src_compile-v1.eblit 1897 RMD160 45aa94bdf920a567ab9002309f6afbed8ba13abb SHA1 83c7fce59355d4bc7684bcfad975a147426f7911 SHA256 0fe6bfd4734f0dfe0bf420b09a5e19698490a8441c1ee20d7446bcceee480336
-AUX eblits/src_configure-v1.eblit 10019 RMD160 32f9cf226742689ed0ddf8c2fe87fa3233f83071 SHA1 2e027b84a318452068dcee0a1d1934d1b4b14e03 SHA256 540e9e770a8039aa4b40f9f915cb839e7f2ed8c05a06b9cf87f41253f0ccb5bc
+AUX eblits/src_compile-v1.eblit 1183 RMD160 23aca3186c9bdefb7f9d81cb6eb3018b55d1b923 SHA1 f63650c6404e71197a5bedab071d227375b0e7c3 SHA256 172c24da709ae5d57a1da19b1f34bf965212a7df1af9cd62e3c6847131a34afc
+AUX eblits/src_configure-v1.eblit 10840 RMD160 c6954d814f3a7b6b0854e2f075d73a497dcd0178 SHA1 6575fbe4bca7df9968079ab1a6825b57ac248dd5 SHA256 53d37939f5c0a4382a09f454b6a25d2953c8b93dc59e5fc349497faafb58c909
AUX eblits/src_configure-v52.eblit 9725 RMD160 42a1fa556a93e49ba2d15bb4404d08fb15782f74 SHA1 3ae459cf8575364a3870a66e18216d1dc49a7858 SHA256 11dc18f439dadcec9a09dd9c06a68ad6a689b9623cea6d1858565ed881b29699
-AUX eblits/src_install-v1.eblit 4646 RMD160 a40aedb029c506a0c64ce06c35ef685bd1a221ca SHA1 b216ddebf29708afcc83d82613c0045fdc659873 SHA256 72e7971a0a8f8509aae275691580dd65fe9ab688fdf884a3c9f54fac77a03f3d
+AUX eblits/src_install-v1.eblit 4870 RMD160 aff83ea5bf18fb455c353471a0c0838abdf2eaf7 SHA1 77b79ace90c9afe51ef0b05cdbce5c803e772fbe SHA256 9a62aa89b2dbd264231a5b7c4dc3297a3fda33f557d367ca79893b038dcee87b
AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
@@ -24,7 +24,7 @@ DIST php-5.3.3.tar.bz2 10662227 RMD160 9edb51663feac9b787f8382012893f1ac98fec6a
DIST php-patchset-5.2.13-r0.tar.bz2 10207 RMD160 b367c17742553fcfbf4cb1b76f8dd4aae9f08cf8 SHA1 20b60e3aef34d0b558f0c896c6981957490b2ba9 SHA256 c71dad65178186786393164a0cb4f056b85f0e00579da3dc2dbe5b863ec4262b
DIST php-patchset-5.2.14-r0.tar.bz2 10414 RMD160 ce0d1dca4aaed5cd31bacd83e71711f4f2f4804d SHA1 2a0f77e69842481c9bb62960ddb9e35bfe8a5ab0 SHA256 3de5685514ff65fbaec71c4df93f14a0bb6b66de91b242d083e23329bf5c4bee
DIST php-patchset-5.3.2-r1.tar.bz2 9702 RMD160 40cdb57493dc44640cf0b9ab545d0206e24e2316 SHA1 c60b29edb9cc28658b8da63a82800cd90eef12d4 SHA256 5c75dd05000c90e55a11295ead6aae5aea238001d852c14cb821abd2730aef67
-DIST php-patchset-5.3.3-r1.tar.bz2 9315 RMD160 965f4a5c2d122be2efd81f69a2357778e1906b09 SHA1 a09146d0f9ee4d3904c62281f1e359fe19f2cfae SHA256 4c7588d2a2c36d30d0a47a097faf6648c9e975e5daab25c3cfcf6de3902e06b3
+DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665867d216 SHA1 6f582a41c3f8b9c73677124a631cee3c4390e3f1 SHA256 aa331a07d00eb92a6a4d1ba937377e17ec4e3fa099c4295f4ccb5602ee583ae7
DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935 SHA1 e2faf8db2d7facbd44cee2f737ce87732835d341 SHA256 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184
DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
DIST suhosin-patch-5.3.2-0.9.9.1.patch.gz 40847 RMD160 64d8b7ec2ec91fd7a43b0cd95c0aa0df5b666768 SHA1 c48d3f24341d3b0214ca3e980320b23864aa93ba SHA256 a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2
@@ -32,6 +32,6 @@ DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e49
EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d
EBUILD php-5.2.14.ebuild 9072 RMD160 431a359b11f6eea093810d4c75c91a60b81244c7 SHA1 43f10aaf4fc98cf0b5112d461b52aab3896461c2 SHA256 ca023b01ef470c5a55ce34050766c97defe08c8ca66c3c012a876bb2add3fa95
EBUILD php-5.3.2.ebuild 9228 RMD160 a809dae438ea243e519b4b46d00ebe1cd3eb09ee SHA1 ea00f7476447459337e3c967948293d67ff32818 SHA256 868a4e6dc6a158bcdba7dc4178e2f317273775675caf061e0796ea8ec9f406f0
-EBUILD php-5.3.3.ebuild 9469 RMD160 f6f2f6cf86951625104bfbcfce887c4fd6e584bb SHA1 70022d291f6fed3494da63410958388191ecc04c SHA256 137857c64582b0f2e621328913035aed5d503d92fe5dc06b6836b0cae35e0c29
-MISC ChangeLog 69141 RMD160 d5172a38f840c7ce5e953f4e80c95eef2731769e SHA1 688031148cb73e5e455246dcb29550e0c6ab1d37 SHA256 8f1780c48db849d6c4e6c2af57c7bf452dfb9f9bad8beea6d56e00f07456f2e1
+EBUILD php-5.3.3-r1.ebuild 9488 RMD160 924e4983967f64f00ebe008f39612276b76363d6 SHA1 39d27e6c8784a28d4af3f08e14d7ae14c8b44449 SHA256 8cf49205fe501c03adbb0e2e3be4cb97ae1889c6e787028aac7453b9cbe7fa50
+MISC ChangeLog 69488 RMD160 87bf44b50594684eb9465b23016a6f9dc28268be SHA1 a013506a32376fa1d0fd9f607615711589290676 SHA256 75c2e4ec1c3314a7e7192755d504119caebdbc52af759746c17f276e536305f4
MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit
index 24a86e24b6eb..65d2247fbca7 100644
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit
+++ b/dev-lang/php/files/eblits/src_compile-v1.eblit
@@ -1,18 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.4 2010/07/26 13:42:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.5 2010/08/08 20:32:22 mabi Exp $
eblit-php-src_compile() {
SAPI_DIR="${WORKDIR}/sapis"
- local is_first_sapi=1
for sapi in ${SAPIS} ; do
use "${sapi}" || continue
- if [[ ${is_first_sapi} == 1 ]]; then
- is_first_sapi=0
- else
- emake clean
- fi
php_sapi_build "${sapi}"
php_sapi_copy "${sapi}"
@@ -20,36 +14,9 @@ eblit-php-src_compile() {
}
php_sapi_build() {
- local sapi="$1"
- php_set_ini_dir "${sapi}"
-
- mkdir -p "${SAPI_DIR}/${sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for one_sapi in $SAPIS ; do
- case "$one_sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${one_sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${one_sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
-
- esac
- done
+ mkdir -p "${SAPI_DIR}/$1"
- econf ${sapi_conf}
+ cd "${WORKDIR}/sapis-build/$1"
emake || die "emake failed"
}
diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit
index 0a581ca14cf3..258e39e6ae78 100644
--- a/dev-lang/php/files/eblits/src_configure-v1.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v1.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.4 2010/07/26 13:42:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.5 2010/08/08 20:32:22 mabi Exp $
eblit-php-src_configure() {
PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
@@ -241,6 +241,38 @@ eblit-php-src_configure() {
append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
fi
fi
-}
+ mkdir -p "${WORKDIR}/sapis-build"
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+ cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+ sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+ --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --enable-${sapi}"
+ else
+ sapi_conf="${sapi_conf} --disable-${sapi}"
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+ else
+ sapi_conf="${sapi_conf} --without-apxs2"
+ fi
+ ;;
+ esac
+ done
+
+ econf ${sapi_conf}
+ done
+}
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index f567da137c6b..f0bcdb210289 100644
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ b/dev-lang/php/files/eblits/src_install-v1.eblit
@@ -1,15 +1,25 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.6 2010/07/29 17:27:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.7 2010/08/08 20:32:22 mabi Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
addpredict /usr/share/snmp/mibs/.index
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
# Makefile forgets to create this before trying to write to it...
dodir "${PHP_DESTDIR}/bin"
# Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi"
emake INSTALL_ROOT="${D}" \
install-build install-headers install-programs \
|| die "emake install failed"
diff --git a/dev-lang/php/php-5.3.3.ebuild b/dev-lang/php/php-5.3.3-r1.ebuild
index 34a84fa93016..939b9dfb311b 100644
--- a/dev-lang/php/php-5.3.3.ebuild
+++ b/dev-lang/php/php-5.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3.ebuild,v 1.2 2010/07/28 20:20:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r1.ebuild,v 1.1 2010/08/08 20:32:23 mabi Exp $
EAPI=2
@@ -8,12 +8,12 @@ PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-PHP_PATCHSET="1"
+PHP_PATCHSET="2"
SUHOSIN_VERSION="${PV}-0.9.10"
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
function php_get_uri ()
{
@@ -27,6 +27,9 @@ function php_get_uri ()
"suhosin")
echo "http://download.suhosin.org/${2}"
;;
+ "ntnu")
+ echo "http://folk.ntnu.no/olemarku/gentoo/${2}"
+ ;;
"gentoo")
echo "mirror://gentoo/${2}"
;;
@@ -40,7 +43,7 @@ PHP_MV="$(get_major_version)"
# alias, so we can handle different types of releases (finals, rcs, alphas,
# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV}"
+PHP_PV="${PV/_rc/RC}"
PHP_RELEASE="php"
PHP_P="${PN}-${PHP_PV}"
@@ -253,7 +256,6 @@ PDEPEND="doc? ( app-doc/php-docs )
# Portage doesn't support setting PROVIDE based on the USE flags that
# have been enabled, so we have to PROVIDE everything for now and hope
# for the best
-# see bug #319623 and new style virtual/httpd-php
PROVIDE="virtual/php"
SLOT="${PHP_MV}"