Bunch of fixes from project overlay

(Portage version: 2.1.4_rc7)

7 files changed, 146 insertions, 61 deletions

diff --git a/app-doc/php-docs/ChangeLog b/app-doc/php-docs/ChangeLog
index 1136aa377632..24b2dc8754c8 100644
--- a/app-doc/php-docs/ChangeLog
+++ b/app-doc/php-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/php-docs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/ChangeLog,v 1.32 2007/11/29 23:15:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/ChangeLog,v 1.33 2007/12/05 23:25:23 jokey Exp $
+
+*php-docs-20071125-r1 (05 Dec 2007)
+
+  05 Dec 2007; Markus Ullmann <jokey@gentoo.org> -php-docs-4.2.3.ebuild,
+  -php-docs-20071125.ebuild, +php-docs-20071125-r1.ebuild:
+  Bunch of fixes from project overlay
 
 *php-docs-20071125 (29 Nov 2007)
 
diff --git a/app-doc/php-docs/files/digest-php-docs-20071125 b/app-doc/php-docs/files/digest-php-docs-20071125
deleted file mode 100644
index 48994c8b0991..000000000000
--- a/app-doc/php-docs/files/digest-php-docs-20071125
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c745e1cf120e59218468319469a4b3aa php-docs-20071125.tar.gz 3407504
-RMD160 f96c134c4e7167f7f639bd196862e6d323fe8696 php-docs-20071125.tar.gz 3407504
-SHA256 5381f40deedb6dc92be752ea4131c00c6b547d884b24712f87cc2c7c4b8fd56c php-docs-20071125.tar.gz 3407504
diff --git a/app-doc/php-docs/files/digest-php-docs-20071125-r1 b/app-doc/php-docs/files/digest-php-docs-20071125-r1
new file mode 100644
index 000000000000..018c6ed44e04
--- /dev/null
+++ b/app-doc/php-docs/files/digest-php-docs-20071125-r1
@@ -0,0 +1,66 @@
+MD5 9f10c985bb4de9c283f710f1e9e2095e php-docs-20071125_cs.tar.gz 3393705
+RMD160 ab087ec698b4c79b071c0ce9485b1969d2e6dbe6 php-docs-20071125_cs.tar.gz 3393705
+SHA256 fb773972f208cf5b40ac2281580ea8bd4211bffd3e01d01d0730e7f6dacbeb79 php-docs-20071125_cs.tar.gz 3393705
+MD5 0fad0c4ca310e88a0af9248ecb63f52f php-docs-20071125_da.tar.gz 3437923
+RMD160 8d182f751cb93f0f235ba496d36785aa827bca0c php-docs-20071125_da.tar.gz 3437923
+SHA256 a626d67fc94461b36c803d8a7dec72c963b82613aaa7dfd27c5d1de4e05197b9 php-docs-20071125_da.tar.gz 3437923
+MD5 b40f670abfbf5e346610dcd265e77a73 php-docs-20071125_de.tar.gz 3413995
+RMD160 f2127395b8c883d8702f91999fc7987160644edd php-docs-20071125_de.tar.gz 3413995
+SHA256 a605eaaec4b870691dc13fc215da66cde8d4c0f8dd8e5202c0f44b18cd86777c php-docs-20071125_de.tar.gz 3413995
+MD5 6add63a1e2fe5c320b7d576597d42dc5 php-docs-20071125_el.tar.gz 3453209
+RMD160 d660df14a7489337293976c197230657bbe84784 php-docs-20071125_el.tar.gz 3453209
+SHA256 20e2fc79949ada20465a11f3f940fb796fe056483e69ca1ec0c76a13689a1016 php-docs-20071125_el.tar.gz 3453209
+MD5 c745e1cf120e59218468319469a4b3aa php-docs-20071125_en.tar.gz 3407504
+RMD160 f96c134c4e7167f7f639bd196862e6d323fe8696 php-docs-20071125_en.tar.gz 3407504
+SHA256 5381f40deedb6dc92be752ea4131c00c6b547d884b24712f87cc2c7c4b8fd56c php-docs-20071125_en.tar.gz 3407504
+MD5 c0b0e0ee3ef55f64825098f42d637b8b php-docs-20071125_es.tar.gz 3478609
+RMD160 bff37a409a5988b293304af94bfe10971907319d php-docs-20071125_es.tar.gz 3478609
+SHA256 9abc3f34bea14f7339be0345daf45cebb0bec0c7b72f95772ab0ec3b09620443 php-docs-20071125_es.tar.gz 3478609
+MD5 82debb5f0e33e2023eebbbbd92d529b9 php-docs-20071125_fi.tar.gz 3422316
+RMD160 9d25fb5f79454da04b95cc6c0816b3c916f1cc8e php-docs-20071125_fi.tar.gz 3422316
+SHA256 d3a2c92bb74af7f6ecddec9b366771201a71ded1f74b6b2ae44922fd3fc7f2ef php-docs-20071125_fi.tar.gz 3422316
+MD5 db4a9dd5b54dd651d65319d48578f148 php-docs-20071125_fr.tar.gz 3595462
+RMD160 4f18111f330eab9b0498ba74762c28a3c1f2e70e php-docs-20071125_fr.tar.gz 3595462
+SHA256 f97ec7194d23100823405c8e5b5e12f2f8a48f4be0e9dcfefbd75ec365131466 php-docs-20071125_fr.tar.gz 3595462
+MD5 99e7015cdcd5a7d163117cc2022c0c2a php-docs-20071125_he.tar.gz 3414572
+RMD160 964420986a0712594ef17fa5bfdba66e27ad9f1d php-docs-20071125_he.tar.gz 3414572
+SHA256 ece0389802a861b543fc80e87caeae1cb0dd5f000fe602b5adeb544976993c04 php-docs-20071125_he.tar.gz 3414572
+MD5 bf75031c37ed74e6d9136d4cd0ee8fc0 php-docs-20071125_hu.tar.gz 3423404
+RMD160 61121902dc40f031c4c700eb4a84ae6d7d91fb42 php-docs-20071125_hu.tar.gz 3423404
+SHA256 12afc59307d35b9f0bf909e2615a256a356faaafde6d537ac47c032d1a2ae76e php-docs-20071125_hu.tar.gz 3423404
+MD5 0ed09ac3ce6862a169f69df2948b5a5a php-docs-20071125_it.tar.gz 3346584
+RMD160 318d52e281535f987d2e891183f131f27ff06d2a php-docs-20071125_it.tar.gz 3346584
+SHA256 85d6620337bcc1a0f3fec035cf597a9afedd17aa7f9520d3a500188e8e610c65 php-docs-20071125_it.tar.gz 3346584
+MD5 acf9d5925d151516f120b6855a33bf7d php-docs-20071125_ja.tar.gz 3703302
+RMD160 0478b817cb37b877d3d015c987315ab6f06888ce php-docs-20071125_ja.tar.gz 3703302
+SHA256 e2d7341bca9589f0f0bf1526a83abc3917ee818d5e94a8c9c21fdb7fed3ede26 php-docs-20071125_ja.tar.gz 3703302
+MD5 9a9ff921d0e75177cd169fb7fc034c28 php-docs-20071125_ko.tar.gz 3440693
+RMD160 2cb563c55e0a9e8d7ec367841fe2f7f106759782 php-docs-20071125_ko.tar.gz 3440693
+SHA256 3a64e4b59c7606a5f118c358adee5aadf26cb926781815f1cef925eeb200422d php-docs-20071125_ko.tar.gz 3440693
+MD5 e64c17d85ce910027dbf89988c99e5f3 php-docs-20071125_nl.tar.gz 3311099
+RMD160 db654f214f598bcf20024aff1773c987c7d958f8 php-docs-20071125_nl.tar.gz 3311099
+SHA256 159ac47fe08e775aba66a8fa70591197cfedfd95d4252b67d4a2de2961d0702c php-docs-20071125_nl.tar.gz 3311099
+MD5 f880f2e233143d9aa691d1809a18c5d3 php-docs-20071125_pl.tar.gz 3402756
+RMD160 54e3c834f2f6268ea9c197c6410862477d2aed1e php-docs-20071125_pl.tar.gz 3402756
+SHA256 30e23c8b495a167e23294b4dcc36033092126c821a4d35b394188b221484372d php-docs-20071125_pl.tar.gz 3402756
+MD5 0ee07e41d6853897c99c98189aa6baf7 php-docs-20071125_pt_BR.tar.gz 3399372
+RMD160 0f54f19b6387b123044c54a40bbdbf7662f12a33 php-docs-20071125_pt_BR.tar.gz 3399372
+SHA256 b542a863364200e32b282fd3067d458413a2b16b9841cb93fd5d25d9a6506246 php-docs-20071125_pt_BR.tar.gz 3399372
+MD5 a615ca4652ef762aa9c39ff92901b5cb php-docs-20071125_ro.tar.gz 3438048
+RMD160 7a9ba3ce616dcdd3b9936e8092cb1d35ec7294f6 php-docs-20071125_ro.tar.gz 3438048
+SHA256 c8b3a54c4d7b14049bfaac7f94855dee1040fe3693be946246acea595912df54 php-docs-20071125_ro.tar.gz 3438048
+MD5 c8347fc133e1c6b8994a266e21006649 php-docs-20071125_ru.tar.gz 3519533
+RMD160 d6eab06515369d47f1163e6bcfd2dde9952a302d php-docs-20071125_ru.tar.gz 3519533
+SHA256 806424b012d98010bbda10330be762aefdc398928daa3283a2f49092249f1903 php-docs-20071125_ru.tar.gz 3519533
+MD5 0fd8d73d5b1aa396de899c3ae4a22739 php-docs-20071125_sk.tar.gz 3414946
+RMD160 f862ce0864e9ab1acc5c96c28656e4347f33a9af php-docs-20071125_sk.tar.gz 3414946
+SHA256 1580d44c53138f435f54560f012e9d1c22c8d64f308c4dd63f914aba640a8be6 php-docs-20071125_sk.tar.gz 3414946
+MD5 811f2cfe944608fdaa8c12c6e34b92ff php-docs-20071125_sv.tar.gz 3425782
+RMD160 e9e31b193a01c07aaea3f41f1c9075182f0e6543 php-docs-20071125_sv.tar.gz 3425782
+SHA256 b1bc8ac0d1ac7f5775e3774659ac4d666ce695ec6961af59efc7ef3fafd925c6 php-docs-20071125_sv.tar.gz 3425782
+MD5 23d76f10e82ec108a6ae6958071668e0 php-docs-20071125_zh_CN.tar.gz 3386463
+RMD160 d69cdb0a72b8402430ecb7b9d7f1975d44a2b6f9 php-docs-20071125_zh_CN.tar.gz 3386463
+SHA256 a62b53e097ba5752a423e16a6071c8f6841d40a6dc36adc64cb6dc74e8c72f41 php-docs-20071125_zh_CN.tar.gz 3386463
+MD5 9cb720103253988a483b523f0c0a6a00 php-docs-20071125_zh_TW.tar.gz 3478346
+RMD160 c54b17d10de1ca7461ab950230686404d6d3e046 php-docs-20071125_zh_TW.tar.gz 3478346
+SHA256 c6e9731b854e60b9f9cccc735972011e34ffb9ed6f548007ba6528036ade79a6 php-docs-20071125_zh_TW.tar.gz 3478346
diff --git a/app-doc/php-docs/files/digest-php-docs-4.2.3 b/app-doc/php-docs/files/digest-php-docs-4.2.3
deleted file mode 100644
index 603eab8b2b0d..000000000000
--- a/app-doc/php-docs/files/digest-php-docs-4.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdc3bd2e342c4b430d92f3a9df1391c1 php_manual_en-4.2.3.tar.bz2 1074488
-RMD160 b714468bfeaf8d5962228460bd1814b96414413a php_manual_en-4.2.3.tar.bz2 1074488
-SHA256 c2fdd983fad5e112a69d2810c4485c45cf20269187d734f4eeef31129dbaedac php_manual_en-4.2.3.tar.bz2 1074488
diff --git a/app-doc/php-docs/php-docs-20071125-r1.ebuild b/app-doc/php-docs/php-docs-20071125-r1.ebuild
new file mode 100644
index 000000000000..872b1b981fe1
--- /dev/null
+++ b/app-doc/php-docs/php-docs-20071125-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/php-docs-20071125-r1.ebuild,v 1.1 2007/12/05 23:25:23 jokey Exp $
+
+EAPI="1"
+
+DESCRIPTION="HTML documentation for PHP"
+HOMEPAGE="http://www.php.net/download-docs.php"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+linguas_en"
+SRC_URI="linguas_en? ( http://dev.gentooexperimental.org/~jakub/distfiles/${P}_en.tar.gz
+			mirror://gentoo/${P}_en.tar.gz )"
+
+RESTRICT="strip binchecks"
+
+
+LANGS="cs da de el es fi fr he hu it ja ko nl pl pt_BR ro ru sk sv zh_CN zh_TW"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="${SRC_URI}
+		linguas_${lang}? ( http://dev.gentooexperimental.org/~jakub/distfiles/${P}_${lang}.tar.gz
+				    mirror://gentoo/${P}_${lang}.tar.gz )"
+done
+
+S=${WORKDIR}
+
+src_unpack() {
+	for lang in en ${LANGS} ; do
+		if use linguas_${lang} ; then
+			mkdir ${lang}
+			pushd ${lang} >/dev/null
+			unpack ${P}_${lang}.tar.gz || die "unpack failed on ${lang}"
+			popd >/dev/null
+		fi
+	done
+}
+
+
+pkg_preinst() {
+	# remove broken/stale symlink created by previous ebuilds
+	[[ -L ${ROOT}/usr/share/php-docs ]] && rm -f "${ROOT}"/usr/share/php-docs
+}
+
+src_install() {
+	for lang in en ${LANGS} ; do
+		if use linguas_${lang} ; then
+			pushd ${lang}/html >/dev/null
+			ebegin "Installing ${lang} manual, this will take a while..."
+			# the whole structure is too much to do with a simple dohtml *
+			for x in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do
+				files="$(echo function.${x}*)"
+				[[ -n ${files} ]] || continue;
+
+				dohtml function.${x}*
+				rm function.${x}*
+			done
+
+			# what's left will fit into a single dohtml *
+			dohtml -r *
+			popd >/dev/null
+			dodir /usr/share/doc/${PF}/html/${lang}
+			mv "${D}"/usr/share/doc/${PF}/html/{*.html,figures} "${D}"/usr/share/doc/${PF}/html/${lang} \
+				|| die "mv failed on ${lang}"
+			eend $?
+		fi
+	done
+
+	einfo "Creating symlink to PHP manual at /usr/share/php-docs"
+	dosym /usr/share/doc/${PF}/html /usr/share/php-docs
+}
diff --git a/app-doc/php-docs/php-docs-20071125.ebuild b/app-doc/php-docs/php-docs-20071125.ebuild
deleted file mode 100644
index 4282f01565b6..000000000000
--- a/app-doc/php-docs/php-docs-20071125.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/php-docs-20071125.ebuild,v 1.1 2007/11/29 23:15:46 jokey Exp $
-
-DESCRIPTION="HTML documentation for PHP"
-HOMEPAGE="http://www.php.net/download-docs.php"
-SRC_URI="http://dev.gentooexperimental.org/~jakub/distfiles/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="strip binchecks"
-
-S=${WORKDIR}/html
-
-src_install() {
-	# the whole structure is too much to do with a simple dohtml *
-	for x in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do
-		files="$(echo function.${x}*)"
-		[[ -n ${files} ]] || continue;
-
-		dohtml function.${x}*
-		rm function.${x}*
-	done
-
-	# what's left will fit into a single dohtml *
-	dohtml *.html
-	mv * "${D}"/usr/share/doc/php-docs-${PVR}/html/ || die "bad mv"
-}
-
-pkg_postinst() {
-	einfo "Creating symlink to PHP manual at /usr/share/php-docs"
-	[[ -e ${ROOT}/usr/share/php-docs ]] && rm -f "${ROOT}"/usr/share/php-docs
-	ln -s "${ROOT}"/usr/share/doc/php-docs-${PVR}/html "${ROOT}"/usr/share/php-docs
-}
diff --git a/app-doc/php-docs/php-docs-4.2.3.ebuild b/app-doc/php-docs/php-docs-4.2.3.ebuild
deleted file mode 100644
index b782250298e4..000000000000
--- a/app-doc/php-docs/php-docs-4.2.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/php-docs/php-docs-4.2.3.ebuild,v 1.9 2005/01/01 13:18:17 eradicator Exp $
-
-S=${WORKDIR}
-DESCRIPTION="HTML documentation for PHP"
-SRC_URI="mirror://gentoo/php_manual_en-4.2.3.tar.bz2"
-HOMEPAGE="http://www.php.net/download-docs.php"
-DEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha ppc64"
-IUSE=""
-
-src_install() {
-	dohtml *
-}