Fix bug #120753.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 49 deletions

diff --git a/app-doc/php-docs/Manifest b/app-doc/php-docs/Manifest
index 1614c0dafe3c..7e8a50073061 100644
--- a/app-doc/php-docs/Manifest
+++ b/app-doc/php-docs/Manifest
@@ -10,18 +10,18 @@ EBUILD php-docs-20050822.ebuild 970 RMD160 e7090faa5a88f6b8c43f4fbf14e62c5f825c3
 MD5 cdd5cb5be4672af362e2396069f8f1b6 php-docs-20050822.ebuild 970
 RMD160 e7090faa5a88f6b8c43f4fbf14e62c5f825c36e8 php-docs-20050822.ebuild 970
 SHA256 5925fcfcbe2cce62501f8ec8fb2e62470241a927ccf2ef871759717fbd53ea5c php-docs-20050822.ebuild 970
-EBUILD php-docs-20070202.ebuild 1034 RMD160 bc29623ac750deb7e4e2dcd0f0dccbbac0faab23 SHA1 fa636525027fbe10190a0c642d337c43b03188f4 SHA256 3c1d0cdaa2c0b78309272c95d53b7c5d2200c799cce478b1cb822b732bdd3b24
-MD5 eeb9f18d12c679956372c905b99ad0f9 php-docs-20070202.ebuild 1034
-RMD160 bc29623ac750deb7e4e2dcd0f0dccbbac0faab23 php-docs-20070202.ebuild 1034
-SHA256 3c1d0cdaa2c0b78309272c95d53b7c5d2200c799cce478b1cb822b732bdd3b24 php-docs-20070202.ebuild 1034
+EBUILD php-docs-20070202-r1.ebuild 1106 RMD160 97e66b0e7181d99cd2b54c7abcc5a2dcbb1d881a SHA1 5e7c9c510de2a4d48b3c35f71f6f95edb368fb26 SHA256 0769cc84280b0c890967a98b29645074ed81d9405948c5d806e0f4d5dfa2aed3
+MD5 4ea9393abeeda20f7478ae70ed4869b2 php-docs-20070202-r1.ebuild 1106
+RMD160 97e66b0e7181d99cd2b54c7abcc5a2dcbb1d881a php-docs-20070202-r1.ebuild 1106
+SHA256 0769cc84280b0c890967a98b29645074ed81d9405948c5d806e0f4d5dfa2aed3 php-docs-20070202-r1.ebuild 1106
 EBUILD php-docs-4.2.3.ebuild 490 RMD160 683caff3596b986bc88522f8d49cdba34ef6d720 SHA1 685b4de4787a2e33ce25a79728b479e4013c9e88 SHA256 2378a61b766dc9a8f2612ea85a6c07aea4d491f850ee5e238e7bf440ed39733b
 MD5 d50afb509135f300ebc65d45fc20dc86 php-docs-4.2.3.ebuild 490
 RMD160 683caff3596b986bc88522f8d49cdba34ef6d720 php-docs-4.2.3.ebuild 490
 SHA256 2378a61b766dc9a8f2612ea85a6c07aea4d491f850ee5e238e7bf440ed39733b php-docs-4.2.3.ebuild 490
-MISC ChangeLog 2633 RMD160 b3836b0b4b9b5d881336a37a7ff5ab744d82a48d SHA1 b5c07b4fd70134f94f1091b20a5313005ddcac10 SHA256 0466bc161a607785fcbb808fb9805f0a0f266d66c8bbc8155b8082e981c7bd80
-MD5 ac376c86e425ba7e7c28b4810347cfdf ChangeLog 2633
-RMD160 b3836b0b4b9b5d881336a37a7ff5ab744d82a48d ChangeLog 2633
-SHA256 0466bc161a607785fcbb808fb9805f0a0f266d66c8bbc8155b8082e981c7bd80 ChangeLog 2633
+MISC ChangeLog 2797 RMD160 ba9fd79d9e9b1ed4f0189c4e8249b41d422454be SHA1 b9ba02398b609fc6f1353ef78e1fb03517a411e6 SHA256 b1453d8ce90374057b83ee9f1ec88d2fd3cce818ea37645516561af1e498b333
+MD5 b2be78ab688abc661cce76d966955a6a ChangeLog 2797
+RMD160 ba9fd79d9e9b1ed4f0189c4e8249b41d422454be ChangeLog 2797
+SHA256 b1453d8ce90374057b83ee9f1ec88d2fd3cce818ea37645516561af1e498b333 ChangeLog 2797
 MISC metadata.xml 324 RMD160 7ac8417dc7371ef6d518aa5b5f19e78ffc07efb2 SHA1 cc78941769936a4801901771a4588d209f80aff9 SHA256 5f6691caa92d1f657b722ca5b0c53b231e21b17aa022903216c97604b7112f08
 MD5 93e177b4bb1bd0f178d1b3219c859f04 metadata.xml 324
 RMD160 7ac8417dc7371ef6d518aa5b5f19e78ffc07efb2 metadata.xml 324
@@ -32,9 +32,9 @@ SHA256 8e57babad1847e5339523ee29c3b923a14b57cb46999c421294d18874f6a11af files/di
 MD5 f1b81f98422dc53aaf26d3902a152d65 files/digest-php-docs-20050822 256
 RMD160 8bb90dc314c14dd43eea7e38fe8be1d0a770f273 files/digest-php-docs-20050822 256
 SHA256 f5dfeb95a251b1af2added14abc4ed3a5750286c315efc2e20a0f476b979ff36 files/digest-php-docs-20050822 256
-MD5 09a6c92b8e2580546be27eb87edebeed files/digest-php-docs-20070202 256
-RMD160 3f1f2b8a08f22285315b17615fa7d1645da767ae files/digest-php-docs-20070202 256
-SHA256 0cd0af1dfecebfe68991dc149b4bdcf3e111246c752bef6b33ff1993426c6997 files/digest-php-docs-20070202 256
+MD5 09a6c92b8e2580546be27eb87edebeed files/digest-php-docs-20070202-r1 256
+RMD160 3f1f2b8a08f22285315b17615fa7d1645da767ae files/digest-php-docs-20070202-r1 256
+SHA256 0cd0af1dfecebfe68991dc149b4bdcf3e111246c752bef6b33ff1993426c6997 files/digest-php-docs-20070202-r1 256
 MD5 b86899d455b1d4fb39d7b57537daf5b7 files/digest-php-docs-4.2.3 73
 RMD160 ef76afc5a5ef8594f33bee975a2050cefa5c7981 files/digest-php-docs-4.2.3 73
 SHA256 c0593094e76e8f43b1fd3f174e7fab91e2992727a1647e6767fb19d430f77669 files/digest-php-docs-4.2.3 73
diff --git a/app-doc/php-docs/files/digest-php-docs-20070202 b/app-doc/php-docs/files/digest-php-docs-20070202
deleted file mode 100644
index b9377d79ac12..000000000000
--- a/app-doc/php-docs/files/digest-php-docs-20070202
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3aa2c3b87d8ec280c9a537f80b8c2506 php-docs-20070202.tar.gz 3424391
-RMD160 cf532c238c6b7c5b6475ba045be01ebc09bdea58 php-docs-20070202.tar.gz 3424391
-SHA256 b4cf2dcb28596b3bae186eea4031efe6197f3acbcede90d3d0560d7600e0de02 php-docs-20070202.tar.gz 3424391
diff --git a/app-doc/php-docs/php-docs-20070202.ebuild b/app-doc/php-docs/php-docs-20070202.ebuild
deleted file mode 100644
index 06299826d72b..000000000000
--- a/app-doc/php-docs/php-docs-20070202.ebuild
+++ /dev/null
@@ -1,35 +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-20070202.ebuild,v 1.1 2007/02/03 00:41:03 beu Exp $
-
-DESCRIPTION="HTML documentation for PHP"
-HOMEPAGE="http://www.php.net/download-docs.php"
-SRC_URI="mirror://gentoo/php-docs-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-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 *
-}
-
-pkg_postinst() {
-	einfo "Creating symlink to PHP manual at /usr/share/php-docs"
-	[[ -e /usr/share/php-docs ]] && rm -f /usr/share/php-docs
-	ln -s /usr/share/doc/php-docs-${PVR}/html /usr/share/php-docs
-}