7 files changed, 6 insertions, 218 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/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