Clean house: bug #164194

Package-Manager: portage-2.1.2-r10

8 files changed, 13 insertions, 249 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index e29b061395cf..caaafc6c1f01 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dokuwiki
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.16 2006/09/28 13:54:10 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.17 2007/03/01 01:13:06 rl03 Exp $
+
+  01 Mar 2007; Renat Lumpau <rl03@gentoo.org> -dokuwiki-20060309-r1.ebuild,
+  -dokuwiki-20060309c.ebuild, -dokuwiki-20060309d.ebuild:
+  Clean house: bug #164194
 
   28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   dokuwiki-20060309e.ebuild:
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index fac3a137964a..51e54b553ce1 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -5,50 +5,26 @@ AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1
 MD5 1b5b86b6942f3451fc286451dbaf7c4a files/postinstall-en.txt 1590
 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 files/postinstall-en.txt 1590
 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 files/postinstall-en.txt 1590
-DIST dokuwiki-2006-03-09.tgz 834975 RMD160 180d091711a17f53b77bf1ddc8c699764fe57096 SHA1 e6b096ec765a47ada042fde745436b5083f8aba7 SHA256 1c325c120aae7834cea6f8e7caf6938ebaf5231b7134ff0bf36ca59d86286a6a
-DIST dokuwiki-2006-03-09c.tgz 835922 RMD160 9544d2c3fa6f6389610f90a331c57ec2a0053cfb SHA1 a883a5437d72d88ee45a8560b2be3d8c09621502 SHA256 85bcb6eba52f472c98e3f3a05dcd538ac6a067e82a292d9bd4e67faeed9853df
-DIST dokuwiki-2006-03-09d.tgz 835964 RMD160 13769beb4a62fea3dbed33c00d1e1bfc77b44ea9 SHA1 ab6a5223e20e56e8453c6989e84ba057c957b9c0 SHA256 9693382dcf7922d83658fd6fe8c690b5ae785422bcac84ae5cb88fb0903b9b4d
 DIST dokuwiki-2006-03-09e.tgz 835945 RMD160 77d703eaea0aa417b955f37424c9af052a2ac68a SHA1 d45aeb3aaebd777e0d7b3b45939aa35aeead9cf3 SHA256 420175e764503642faadba472b083264fdd19e0639010df79e71e45a90018b93
-EBUILD dokuwiki-20060309-r1.ebuild 1698 RMD160 c5baa3f0c3548c59b6190ac42264e59b8c3c096a SHA1 9f50f28b72e30fb8341bcc8a086c9a1b84b92fb4 SHA256 2d79f3c5a347385acc2c036718973dee65bd80b2a671b242f7b6fc989437a089
-MD5 8b25f5341daccdac9edea6357192235a dokuwiki-20060309-r1.ebuild 1698
-RMD160 c5baa3f0c3548c59b6190ac42264e59b8c3c096a dokuwiki-20060309-r1.ebuild 1698
-SHA256 2d79f3c5a347385acc2c036718973dee65bd80b2a671b242f7b6fc989437a089 dokuwiki-20060309-r1.ebuild 1698
-EBUILD dokuwiki-20060309c.ebuild 1705 RMD160 6805f139cbeac54c6dc1c5d0f0d3f0492213536f SHA1 266baa3c967ab96f535a8628f540ff9a2065af70 SHA256 438ba81a7fd0197f345e9c2fcfc0301465d8951ff66e3e0d49e61f4420f1a53e
-MD5 63d0f492d5561ff6745920eda97e1715 dokuwiki-20060309c.ebuild 1705
-RMD160 6805f139cbeac54c6dc1c5d0f0d3f0492213536f dokuwiki-20060309c.ebuild 1705
-SHA256 438ba81a7fd0197f345e9c2fcfc0301465d8951ff66e3e0d49e61f4420f1a53e dokuwiki-20060309c.ebuild 1705
-EBUILD dokuwiki-20060309d.ebuild 1846 RMD160 01ec115419c0de349fe541f79e4d5f6146eb7ea5 SHA1 4320e32687541277344c190d4d8c086458729b7e SHA256 fca44afa5078b6855db505213362139a09e910ea01dcf1e3c0cd9842ab27b4d3
-MD5 3d884b3c43d6d9f5e18d6b2866fb70ae dokuwiki-20060309d.ebuild 1846
-RMD160 01ec115419c0de349fe541f79e4d5f6146eb7ea5 dokuwiki-20060309d.ebuild 1846
-SHA256 fca44afa5078b6855db505213362139a09e910ea01dcf1e3c0cd9842ab27b4d3 dokuwiki-20060309d.ebuild 1846
 EBUILD dokuwiki-20060309e.ebuild 1846 RMD160 4d49416aa1ff76cbd92671525c845b10ae2be62b SHA1 447026903f64f8b3560c54366dae2c5714e5bff3 SHA256 91678261ba7ff7d574800f7fcfa0f62de9709e058f95d3a5d24a983f8348efdc
 MD5 bb7a81e8d9885035eee7a482d673804f dokuwiki-20060309e.ebuild 1846
 RMD160 4d49416aa1ff76cbd92671525c845b10ae2be62b dokuwiki-20060309e.ebuild 1846
 SHA256 91678261ba7ff7d574800f7fcfa0f62de9709e058f95d3a5d24a983f8348efdc dokuwiki-20060309e.ebuild 1846
-MISC ChangeLog 2847 RMD160 53f6ca1a40cbaac5da4ff4cc27cc05b89ba67030 SHA1 5bb2314412c40c29efa9c62968a400ff9bd8d71c SHA256 69e462994a09f2491a489aef0561c9f6a32930c16f40b3c34fd5b0ba88a956e5
-MD5 4607fd5a47ef9385acef3a60b92a4615 ChangeLog 2847
-RMD160 53f6ca1a40cbaac5da4ff4cc27cc05b89ba67030 ChangeLog 2847
-SHA256 69e462994a09f2491a489aef0561c9f6a32930c16f40b3c34fd5b0ba88a956e5 ChangeLog 2847
+MISC ChangeLog 3005 RMD160 74a67d59a189bc489b363c1c33bf6b8bbc1a02f0 SHA1 ad5dd01724ccde8dfc58a171f03e83a9b62995d6 SHA256 71dfbddb8b18b95dc47fb0fba33ac59c0fc8b461ccdb534359a4946a92ff32b1
+MD5 0f58f42aeacd600d008bf38edd52db0b ChangeLog 3005
+RMD160 74a67d59a189bc489b363c1c33bf6b8bbc1a02f0 ChangeLog 3005
+SHA256 71dfbddb8b18b95dc47fb0fba33ac59c0fc8b461ccdb534359a4946a92ff32b1 ChangeLog 3005
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 MD5 0922f8bcb85431dab1ce19e2675e2e24 metadata.xml 704
 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 metadata.xml 704
 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 metadata.xml 704
-MD5 3ef2eb1518b86ded6561bbf7755148ac files/digest-dokuwiki-20060309-r1 250
-RMD160 f5fca261e08bb79f06ab2dcfaf0b11298d8766ff files/digest-dokuwiki-20060309-r1 250
-SHA256 b9304ee7f325048fa99373c0eb967e6f79836412c2432780a618777f947ea98f files/digest-dokuwiki-20060309-r1 250
-MD5 2314c2843516d99057414f1323cfc228 files/digest-dokuwiki-20060309c 253
-RMD160 3fd83ff588da53d273939fcb7f66bce8b4d2c496 files/digest-dokuwiki-20060309c 253
-SHA256 f4f33327e466f7edd85d4dd1e8d01d778f70d5c8995fd9eb68325ff2cf977843 files/digest-dokuwiki-20060309c 253
-MD5 49de53a4c5e25cf11813358536276ac8 files/digest-dokuwiki-20060309d 253
-RMD160 21045aad827f293ae2faace4c17e0b37735fd97e files/digest-dokuwiki-20060309d 253
-SHA256 6ee7fded6a20b249f5b24b58bdd4a237e9021b9c7062674a2d95446438370a0a files/digest-dokuwiki-20060309d 253
 MD5 e527c2bab3312ebd2bc527001716fb9b files/digest-dokuwiki-20060309e 253
 RMD160 5eff2118181cc6a82db6a478e38ee4eb7539f2b0 files/digest-dokuwiki-20060309e 253
 SHA256 f389638b39e7ce033cfff29754df0a9a5226e1d7146a36c9a4e9aee350d833b3 files/digest-dokuwiki-20060309e 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFG9QUkT4lNIS36YERAuqIAJ4iNCi05bHNtFf6BF1VUuPuCDBS/QCfQifZ
-d7aDlezZCntpZrOOFgsJ9sc=
-=75WX
+iD8DBQFF5iiqEzitwsaoONoRAmfDAJ0eyBR1234pA+IGY8spwVmRMXZzigCdFAzM
+HBHZlGTVl5hHOkwzvIKmx4c=
+=+qz9
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20060309-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20060309-r1.ebuild
deleted file mode 100644
index 101617605ace..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20060309-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20060309-r1.ebuild,v 1.2 2006/06/12 20:56:46 ticho Exp $
-
-inherit webapp
-
-# Upstream uses dashes in the datestamp
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
-documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/php"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${MY_PV}.tgz
-	mv ${PN}-${MY_PV} ${P}
-}
-
-src_compile() {
-	# Default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	local docs="README"
-	webapp_src_preinst
-
-	# NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
-	einfo "Installing docs"
-	dodoc ${docs}
-	for doc in ${docs} COPYING; do
-		rm -f ${doc}
-	done
-
-	einfo "Copying main files"
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	# Install the htaccess file for pretty urls
-	cp .htaccess ${D}/${MY_HTDOCSDIR}
-
-	# Create initial changes file
-	touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
-
-	# The data dir needs to be owned by the server
-	for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf
-	for x in $( cd ${D}/${MY_HTDOCSDIR}/conf && echo * ) ; do
-		webapp_configfile ${MY_HTDOCSDIR}/conf/$x
-	done
-
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20060309c.ebuild b/www-apps/dokuwiki/dokuwiki-20060309c.ebuild
deleted file mode 100644
index 8f23705a5461..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20060309c.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20060309c.ebuild,v 1.2 2006/09/12 09:18:44 ticho Exp $
-
-inherit webapp
-
-# Upstream uses dashes in the datestamp
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
-documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/php"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${MY_PV}.tgz
-	mv ${PN}-${MY_PV} ${P}
-}
-
-src_compile() {
-	# Default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	local docs="README"
-	webapp_src_preinst
-
-	# NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
-	einfo "Installing docs"
-	dodoc ${docs}
-	for doc in ${docs} COPYING; do
-		rm -f ${doc}
-	done
-
-	einfo "Copying main files"
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	# Install the htaccess file for pretty urls
-	cp .htaccess ${D}/${MY_HTDOCSDIR}
-
-	# Create initial changes file
-	touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
-
-	# The data dir needs to be owned by the server
-	for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf
-	for x in $( cd ${D}/${MY_HTDOCSDIR}/conf && echo * ) ; do
-		webapp_configfile ${MY_HTDOCSDIR}/conf/$x
-	done
-
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20060309d.ebuild b/www-apps/dokuwiki/dokuwiki-20060309d.ebuild
deleted file mode 100644
index da9cfa2c8516..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20060309d.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20060309d.ebuild,v 1.2 2006/09/14 14:40:26 wolf31o2 Exp $
-
-inherit webapp
-
-# Upstream uses dashes in the datestamp
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small companies
-documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://www.splitbrain.org/_media/projects/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="virtual/php"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${PN}-${MY_PV}.tgz
-	mv ${PN}-${MY_PV} ${P}
-}
-
-src_compile() {
-	# Default compile hangs
-	echo "Nothing to compile"
-}
-
-src_install() {
-	local docs="README"
-	webapp_src_preinst
-
-	# NOTE: doc files should go into /usr/share/doc, and NOT installed in the vhost
-	einfo "Installing docs"
-	dodoc ${docs}
-	for doc in ${docs} COPYING; do
-		rm -f ${doc}
-	done
-
-	# Move bin directory to safe location (outside of docroot)
-	# To resolve security bug #146800
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	einfo "Copying main files"
-	cp -r . ${D}/${MY_HTDOCSDIR}
-
-	# Install the htaccess file for pretty urls
-	cp .htaccess ${D}/${MY_HTDOCSDIR}
-
-	# Create initial changes file
-	touch ${D}/${MY_HTDOCSDIR}/data/changes.log data/changes.log
-
-	# The data dir needs to be owned by the server
-	for x in `find . -print | grep "data/*" | grep -v .htaccess` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_configfile ${MY_HTDOCSDIR}/.htaccess
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf
-	for x in $( cd ${D}/${MY_HTDOCSDIR}/conf && echo * ) ; do
-		webapp_configfile ${MY_HTDOCSDIR}/conf/$x
-	done
-
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060309-r1 b/www-apps/dokuwiki/files/digest-dokuwiki-20060309-r1
deleted file mode 100644
index 17b480c18156..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060309-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d67c854712347e7c3cdba6b4a951c533 dokuwiki-2006-03-09.tgz 834975
-RMD160 180d091711a17f53b77bf1ddc8c699764fe57096 dokuwiki-2006-03-09.tgz 834975
-SHA256 1c325c120aae7834cea6f8e7caf6938ebaf5231b7134ff0bf36ca59d86286a6a dokuwiki-2006-03-09.tgz 834975
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060309c b/www-apps/dokuwiki/files/digest-dokuwiki-20060309c
deleted file mode 100644
index b8f54f0ae28b..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060309c
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de5ea0e1e18c9b57d92b9e83f2fc47ac dokuwiki-2006-03-09c.tgz 835922
-RMD160 9544d2c3fa6f6389610f90a331c57ec2a0053cfb dokuwiki-2006-03-09c.tgz 835922
-SHA256 85bcb6eba52f472c98e3f3a05dcd538ac6a067e82a292d9bd4e67faeed9853df dokuwiki-2006-03-09c.tgz 835922
diff --git a/www-apps/dokuwiki/files/digest-dokuwiki-20060309d b/www-apps/dokuwiki/files/digest-dokuwiki-20060309d
deleted file mode 100644
index f00beada98a5..000000000000
--- a/www-apps/dokuwiki/files/digest-dokuwiki-20060309d
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e061b6f02943e9b0e47866c6d14a1df2 dokuwiki-2006-03-09d.tgz 835964
-RMD160 13769beb4a62fea3dbed33c00d1e1bfc77b44ea9 dokuwiki-2006-03-09d.tgz 835964
-SHA256 9693382dcf7922d83658fd6fe8c690b5ae785422bcac84ae5cb88fb0903b9b4d dokuwiki-2006-03-09d.tgz 835964