summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Böhm <bb@xnull.de>2010-10-18 12:10:32 +0200
committerBenedikt Böhm <bb@xnull.de>2010-10-18 12:10:32 +0200
commitc7bb295ea1f2aa35ff88638a9b86fe1545d465ff (patch)
treeb2023b1f24eee569c98b77c08f45f9ffcca0ce21
parentmerge latest changes to php ebuild (diff)
downloadbetagarden-c7bb295ea1f2aa35ff88638a9b86fe1545d465ff.tar.gz
betagarden-c7bb295ea1f2aa35ff88638a9b86fe1545d465ff.tar.bz2
betagarden-c7bb295ea1f2aa35ff88638a9b86fe1545d465ff.zip
only apply fpm patch if it has been downloaded
-rw-r--r--dev-lang/php/Manifest2
-rw-r--r--dev-lang/php/php-5.2.14.ebuild5
2 files changed, 5 insertions, 2 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0faa620..8f9a6f4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -18,4 +18,4 @@ DIST php-5.2.14.tar.bz2 9055945 RMD160 f699488f5b266a1c5e36df570c4d5896dc4e0aea
DIST php-fpm-0.6~5.2.patch 285105 RMD160 297db9b433233abb0ee38a3e2d3744db36082e65 SHA1 3a8d0825cb6f728f5c9b9e956eb2221a9c07845c SHA256 569f07eb95cf258c655b0dcab2bf75b1b2ccc38d17f31b44d804790f5c2f0c54
DIST php-patchset-5.2.14-r1.tar.bz2 8381 RMD160 7f562ac7df8f918f6d73f61c4e2096a88759889d SHA1 0453926bccfd5bd8089c311f6e16f1e4a8c08993 SHA256 f49aacef203cee8e7ad038492ed43e7677ed2d22e0fef07dc840195cacc95d34
DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
-EBUILD php-5.2.14.ebuild 9427 RMD160 3938fbbd9dc2225eb0d86bce094d2dceee120fa7 SHA1 949dca86aa77e114bdb91c52385483a97df7ed1f SHA256 674e48c9ac083397f1f01bed02a0d6921cb4a4b7c0efe8beae389f0f4078f08d
+EBUILD php-5.2.14.ebuild 9451 RMD160 0cafb6310a2ca707179e6bdfabdeb6396f23fada SHA1 241107eafc285929349639df187bc8448c17adb5 SHA256 a0c1233405e5e80ef384edb93844e920de02acb4a282c52e79511d3c62cd11a2
diff --git a/dev-lang/php/php-5.2.14.ebuild b/dev-lang/php/php-5.2.14.ebuild
index fc97276..58f2a48 100644
--- a/dev-lang/php/php-5.2.14.ebuild
+++ b/dev-lang/php/php-5.2.14.ebuild
@@ -313,7 +313,10 @@ eblit-pkg() {
eblit-pkg pkg_setup v1
src_prepare() {
- EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}/${FPM_PATCH}"
+ if use fpm; then
+ EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}/${FPM_PATCH}"
+ fi
+
eblit-run src_prepare v1
}