Version bump, resolves #344681. Cleanup

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 9 insertions, 142 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index c42ea37e98da..5ed921178694 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.47 2010/03/14 19:23:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.48 2010/11/09 22:17:08 ramereth Exp $
+
+*dokuwiki-20101107 (09 Nov 2010)
+
+  09 Nov 2010; Lance Albertson <ramereth@gentoo.org>
+  -dokuwiki-20070626b.ebuild, -dokuwiki-20090214b.ebuild,
+  -dokuwiki-20091225b.ebuild, +dokuwiki-20101107.ebuild:
+  Version bump, resolves #344681. Cleanup
 
   14 Mar 2010; Raúl Porcel <armin76@gentoo.org> dokuwiki-20091225c.ebuild:
   sparc stable wrt #301310
diff --git a/www-apps/dokuwiki/dokuwiki-20070626b.ebuild b/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
deleted file mode 100644
index a512c89aa949..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20070626b.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20070626b.ebuild,v 1.9 2008/05/12 15:40:20 maekke Exp $
-
-inherit webapp depend.php
-
-# 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 company's 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 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use cli expat
-	else
-		require_php_with_use cli xml
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${PN}-${MY_PV} ${P}
-	cd "${S}"
-
-	# create initial changes file
-	touch data/changes.log
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING VERSION
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20090214b.ebuild b/www-apps/dokuwiki/dokuwiki-20090214b.ebuild
deleted file mode 100644
index fceff458e3cb..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20090214b.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20090214b.ebuild,v 1.4 2009/07/19 18:42:18 nixnut Exp $
-
-inherit webapp depend.php
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's 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 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_BASE_PV}"
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use cli expat
-	else
-		require_php_with_use cli xml
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# create initial changes file
-	touch data/changes.log
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING VERSION
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20091225b.ebuild b/www-apps/dokuwiki/dokuwiki-20101107.ebuild
index bbb6327bd8c5..06940efef34c 100644
--- a/www-apps/dokuwiki/dokuwiki-20091225b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20101107.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/www-apps/dokuwiki/dokuwiki-20091225b.ebuild,v 1.1 2010/01/15 20:14:48 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20101107.ebuild,v 1.1 2010/11/09 22:17:08 ramereth Exp $
 
 inherit webapp depend.php