Version bump. Also fixes bug 343289

Package-Manager: portage-2.1.9.11/cvs/Linux x86_64

3 files changed, 27 insertions, 11 deletions

diff --git a/app-doc/php-docs/ChangeLog b/app-doc/php-docs/ChangeLog
index 483447c3c7ef..86ec32455131 100644
--- a/app-doc/php-docs/ChangeLog
+++ b/app-doc/php-docs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/php-docs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/ChangeLog,v 1.48 2010/10/29 09:31:46 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/ChangeLog,v 1.49 2010/10/30 10:14:24 olemarkus Exp $
+
+  30 Oct 2010; <olemarkus@gentoo.org> -php-docs-20101022.ebuild,
+  +php-docs-20101029.ebuild:
+  Version bump. Also fixes bug 343289
 
 *php-docs-20101022 (29 Oct 2010)
 
diff --git a/app-doc/php-docs/Manifest b/app-doc/php-docs/Manifest
index f5f7b0bc9e94..252fafb76d0f 100644
--- a/app-doc/php-docs/Manifest
+++ b/app-doc/php-docs/Manifest
@@ -20,18 +20,28 @@ DIST php-docs-20071125_sk.tar.gz 3414946 RMD160 f862ce0864e9ab1acc5c96c28656e434
 DIST php-docs-20071125_sv.tar.gz 3425782 RMD160 e9e31b193a01c07aaea3f41f1c9075182f0e6543 SHA1 08fc55fd93bb7f9029c1ef5a53619ca9f316bb2e SHA256 b1bc8ac0d1ac7f5775e3774659ac4d666ce695ec6961af59efc7ef3fafd925c6
 DIST php-docs-20071125_zh_CN.tar.gz 3386463 RMD160 d69cdb0a72b8402430ecb7b9d7f1975d44a2b6f9 SHA1 723e5a072f891a9c90ed632bc9fed3648e405ff0 SHA256 a62b53e097ba5752a423e16a6071c8f6841d40a6dc36adc64cb6dc74e8c72f41
 DIST php-docs-20071125_zh_TW.tar.gz 3478346 RMD160 c54b17d10de1ca7461ab950230686404d6d3e046 SHA1 c64b4aea2b2d170cdfc4090abdce142091e0e5cb SHA256 c6e9731b854e60b9f9cccc735972011e34ffb9ed6f548007ba6528036ade79a6
+DIST php_manual_de-20101029.tar.gz 6041947 RMD160 6c701461b27843e1a5a014c4b23da476dd3f81ad SHA1 c7953539ad5795299ab231ccdae924ae2093f914 SHA256 798132384e9e04c5bfa86bd8b422e5025b503dffdd4dabdea69b5dd4a75ef534
 DIST php_manual_de.tar.gz 5475863 RMD160 5b5f62c28a3f3f208d617e3cc41dc4467ea5920a SHA1 09b23b383f3b6a55d61a2f6cd94f1ba4e9822f4a SHA256 e587423bd99e5fe9e3c7c6c02921f8fff0762b6bda111d38e41b21c471cb1d44
+DIST php_manual_en-20101029.tar.gz 5973968 RMD160 53a8a8fe85aa40867114e1afef17ff0394ebcae7 SHA1 8be3e5d2eddd047f09f8b127f2737b7d477cb941 SHA256 fbdb71cf987d98b17fcceb67405f6ff116597af460f37ed877a2fbe0b59bf963
 DIST php_manual_en.tar.gz 5789026 RMD160 9907ae11a0f69bb3cdfdd7b6ba9da8c7da9331ff SHA1 b1b4e51a00905b53df7707113b59fac9dc6d0ac2 SHA256 2bc29905d99fbb8e43c875b728fc6d6f689fea6798e9ff6e71c37c37524cecb7
+DIST php_manual_es-20101029.tar.gz 6205922 RMD160 e086e05e8d1ab5c9602378ee13c72487dcc48865 SHA1 8e7aa48cc2f2e1bb97d1dd2caf2bad1dc3299a9d SHA256 2f80af48623964f316e7ed90d0399bc935056030b2315f43aa9bd3a7f55717f1
 DIST php_manual_es.tar.gz 6071061 RMD160 a892456d679af9c80fab5880f85ef281c08f9801 SHA1 0d1e8262d6cc64d20bb08002431a1f0eb6486ef3 SHA256 9279dd8119172d6195420c01f56d0e033bbb152fefc19e62b19daf83f571c2ec
+DIST php_manual_fa-20101029.tar.gz 6074998 RMD160 b7c367a2887ea50b0e9030f66bb49b73f5083f8f SHA1 29f610edfbc475fc721a430a5fd52a4f19df7d99 SHA256 5a4c9ae38081dc7328733f60ec955e307ece604b4693b62006e621451ad03a62
 DIST php_manual_fa.tar.gz 6016548 RMD160 c227985089d8833ab43dbd05370376a879ad709b SHA1 2ecd7a88d7dbf34a102a487167d66a83911fd88d SHA256 28d4b4de26aba2acbe36e0a2b82ea046583cef64fd468745be81bdcc6bd95c8d
+DIST php_manual_fr-20101029.tar.gz 6020868 RMD160 db2a1e8cd1ee6d8d0973878542a99f346bda6164 SHA1 2ca9d64d8c944b2ceebc3845e90b21c45e0a4776 SHA256 90bf65fc4cf8aded9ee503d95b124ec8b76aa8fac6993f16fb9f0dce22930431
 DIST php_manual_fr.tar.gz 5808370 RMD160 a6f56124d52a475f86e9c5faddd4160c492285f9 SHA1 b2739434f521fbe3cec3c41ca16f90f27847453c SHA256 490067060e8dd104f376993b515f80479b876a17c4ceb93e40b55cfef3f93b2e
+DIST php_manual_ja-20101029.tar.gz 6363287 RMD160 82b6110b97baa8bbb9dd5258ca84c9cdcbb7e760 SHA1 8714fe5109c444064d9e5f15949884c493453c1c SHA256 efbc19e4f111709d95470ce9c472a37239e59691c23b2c588ac12004a4543633
 DIST php_manual_ja.tar.gz 6174202 RMD160 d1e7183145ae086a57a676017a26db9a7dbeee3a SHA1 a2de0561ecc5b491f41d34e4d303f4a65870f526 SHA256 fc4c430d332194c23a9a0a416b27d8827b0db8ab6b1c21855534c92738993d32
+DIST php_manual_pl-20101029.tar.gz 6049947 RMD160 75d77c2c79846e67f2d8f345a3576968e448ee42 SHA1 232f8dbdff6fab4a14f22208900893faa7594432 SHA256 a90735f684d288e1eaa64071b96cfe8467945e4fa71ae4edf93c7dd46204bdd0
 DIST php_manual_pl.tar.gz 5733385 RMD160 b9066ac78200676579600ec7f2b207c5c41c886a SHA1 9c91c230062caae3352fe0a75c1a4669dd628c93 SHA256 993027c9850a8e66b6ae5a3aaa6c2297f98241e448b2880ee067f4fd8aab466e
+DIST php_manual_pt_BR-20101029.tar.gz 5460583 RMD160 2c1c535f5910c0d9476937fbb5708b09e9bc72e7 SHA1 1b57f81346c28a72f0c5ec559795f4a389f07d78 SHA256 c00350b370fb0341b77a10b16d4f9424703e21e4a973d10b157c5790f39decc6
 DIST php_manual_pt_BR.tar.gz 5170271 RMD160 78a913678fd76189537944ef60ba8f09335a2361 SHA1 4a6fb374aba2da77b5c281434262842399ab3311 SHA256 8d4b9ae9740e65d12f355cf4eaa7a2cb4f43c5b331e8a1a7261a49417963661f
+DIST php_manual_ro-20101029.tar.gz 6073830 RMD160 c3ca9003ae4a874c98f6aa9766b62dade23863ab SHA1 f2bb0eec1871657efc6145cf289e34008c22561c SHA256 379f0e1b9f222e4614a45400db972570b0fd7b3284a93c1136e0efc5381b1846
 DIST php_manual_ro.tar.gz 5803384 RMD160 c17712ff7427cd2a79aa19a6089303e9de40000d SHA1 f951c61ed2af90f0ea81c861ff14a134cef61415 SHA256 3a2a90b7ad460d1e791b5b065637414aef7b9138dc813b0f2b091bb1c100ffb4
+DIST php_manual_tr-20101029.tar.gz 6089215 RMD160 1dd4ee6bfca1c7ef935f939174d56368f56db9e1 SHA1 557eeb69573a0c20954d48163c30e6b42d75c8b8 SHA256 6e3e34a21d1112bf79d43f285f4bb28c6adc7e6311366b2069c74c0e5d17f9f4
 DIST php_manual_tr.tar.gz 5935956 RMD160 6782f0ad7b3150ced65d7236712764c0fca7d43c SHA1 decccecee3451f239a7334ddf094e620bc0497f8 SHA256 db60f503e3d42a6f73161da6a8b40c58bd6338e4b36570fc1572e1bcb3911068
 EBUILD php-docs-20071125-r2.ebuild 1678 RMD160 802e0d7a85758201920299da9dd92fa59e735096 SHA1 39b93a81e0a1af3e4375e4771acd32ac6b888f21 SHA256 7e16dbb5952316282ab753f7e59dd7b7b322588b00ceaa85e7892a88a03c6624
 EBUILD php-docs-20100730.ebuild 1577 RMD160 547e2e6b85c75a30eaf170f51994f6b6baabedb1 SHA1 0e514a499c6a26f4f5bd38df64a894878adb84c8 SHA256 f6ed146fa6353eadbbf0a7b968243d54e56cefa6fdf1732993e81328526cad99
-EBUILD php-docs-20101022.ebuild 1582 RMD160 b979479bdec5962c6be61a68c161ab861a53d343 SHA1 784d3669fb056f0445f89428b5c9a1f187b6c118 SHA256 3ee4ecf3e3b4e22759392e464ee238637a985b6de89eaf84a093a313b02b985a
-MISC ChangeLog 6190 RMD160 483b5dab3926e298cb4bc012f942674b5b7278d3 SHA1 3611d546030f166b6a745e745cb1d24e15465995 SHA256 a7f82768777ceffc860538bfd41c0c5402ef3218c69bc84cd1cdef043eac78b0
+EBUILD php-docs-20101029.ebuild 1558 RMD160 86bd7c55b907e8cf1092f065817ced8a53ed0dbd SHA1 10d10d19d5458a25ba809f8dfc116c92044f7bca SHA256 07b5b2f7262177fbb71734e96d9444b24f49ac610254693d30eb943498d99409
+MISC ChangeLog 6323 RMD160 257717a4e86cf86cd2b7830160ee0a81485b8278 SHA1 54a730eb3e4f91a0485b9315586d2d0ec4a68d33 SHA256 d2fa5b5ba50cffba2078bdc79a3e13f15bfdff3b9be561dab0c6650f0ac13777
 MISC metadata.xml 160 RMD160 944fd2ed43f89c53b17d59f1c2e43c5d2c50cef1 SHA1 ba402ab4ce49122fcdc7965c8409665dd6dc2f6d SHA256 f07e7081dd8b9ced70b87383ad3c35ffc35c67c92ce6c498c83967c49333704e
diff --git a/app-doc/php-docs/php-docs-20101022.ebuild b/app-doc/php-docs/php-docs-20101029.ebuild
index a05530784147..0bc01a1bc1bb 100644
--- a/app-doc/php-docs/php-docs-20101022.ebuild
+++ b/app-doc/php-docs/php-docs-20101029.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/app-doc/php-docs/php-docs-20101022.ebuild,v 1.1 2010/10/29 09:31:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/php-docs-20101029.ebuild,v 1.1 2010/10/30 10:14:24 olemarkus Exp $
 
 EAPI="3"
 
@@ -12,26 +12,28 @@ MY_PN="php_manual"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+linguas_en"
-SRC_URI="linguas_en? ( http://www.php.net/distributions/manual/${MY_PN}_en.tar.gz )"
+IUSE=""
 
 RESTRICT="strip binchecks"
 
-LANGS="de es fa fr ja pl pt_BR ro tr"
+LANGS="en de es fa fr ja pl pt_BR ro tr"
 for lang in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${lang}"
 	SRC_URI="${SRC_URI}
-		linguas_${lang}? ( http://www.php.net/distributions/manual/${MY_PN}_${lang}.tar.gz )"
+		linguas_${lang}? ( http://olemarkus.org/~olemarkus/gentoo/${MY_PN}_${lang}-${PV}.tar.gz )"
 done
 
+# Set English to default
+IUSE="${IUSE/linguas_en/+linguas_en}"
+
 S=${WORKDIR}
 
 src_unpack() {
-	for lang in en ${LANGS} ; do
+	for lang in ${LANGS} ; do
 		if use linguas_${lang} ; then
 			mkdir ${lang}
 			pushd ${lang} >/dev/null
-			unpack ${MY_PN}_${lang}.tar.gz || die "unpack failed on ${lang}"
+			unpack ${MY_PN}_${lang}-${PV}.tar.gz || die "unpack failed on ${lang}"
 			popd >/dev/null
 		fi
 	done
@@ -45,7 +47,7 @@ pkg_preinst() {
 src_install() {
 	dodir /usr/share/doc/${PF}
 
-	for lang in en ${LANGS} ; do
+	for lang in ${LANGS} ; do
 		if use linguas_${lang} ; then
 			ebegin "Installing ${lang} manual, will take a while"
 			cp -R "${WORKDIR}"/${lang} "${ED}"/usr/share/doc/${PF} || die "cp failed on ${lang}"