Version bump, Cleanup. Resolves #410771, #403247, #386155

(Portage version: 2.1.10.44/cvs/Linux x86_64)

5 files changed, 20 insertions, 137 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index d192d33947ac..4849e4de5539 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.57 2012/03/09 04:56:24 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.58 2012/05/13 08:16:04 ramereth Exp $
+
+*dokuwiki-20120125a (13 May 2012)
+
+  13 May 2012; Lance Albertson <ramereth@gentoo.org>
+  -dokuwiki-20101107a.ebuild, -dokuwiki-20110525.ebuild,
+  -dokuwiki-20110525a.ebuild, dokuwiki-20120125.ebuild,
+  +dokuwiki-20120125a.ebuild:
+  Version bump, Cleanup. Resolves #410771, #403247, #386155
+
+  Also make sure to install the VERSION file so that dokuwiki knows about its
+  own version.
 
 *dokuwiki-20120125 (09 Mar 2012)
 
diff --git a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
deleted file mode 100644
index f6085a288e60..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20101107a.ebuild,v 1.4 2011/05/27 15:28:11 ramereth Exp $
-
-EAPI="4"
-
-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="gd"
-
-DEPEND=""
-RDEPEND="
-	|| ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] )
-	gd? ( || ( dev-lang/php[gd]
-		media-gfx/imagemagick )
-	)"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# 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-20110525a.ebuild b/www-apps/dokuwiki/dokuwiki-20110525a.ebuild
deleted file mode 100644
index 31878d0f98bd..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20110525a.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20110525a.ebuild,v 1.3 2011/08/19 16:29:45 tomka Exp $
-
-EAPI="4"
-
-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="gd"
-
-DEPEND=""
-RDEPEND="
-	|| ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] )
-	gd? ( || ( dev-lang/php[gd]
-		media-gfx/imagemagick )
-	)"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# 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-20120125.ebuild b/www-apps/dokuwiki/dokuwiki-20120125.ebuild
index 5a5ecc6a8a2a..15f8b6e3624e 100644
--- a/www-apps/dokuwiki/dokuwiki-20120125.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20120125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125.ebuild,v 1.1 2012/03/09 04:56:24 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125.ebuild,v 1.2 2012/05/13 08:16:04 ramereth Exp $
 
 EAPI="4"
 
@@ -15,12 +15,12 @@ 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"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="gd"
 
 DEPEND=""
 RDEPEND="
-	|| ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] )
+	>=dev-lang/php-5.3[xml]
 	gd? ( || ( dev-lang/php[gd]
 		media-gfx/imagemagick )
 	)"
@@ -39,7 +39,7 @@ src_install() {
 	webapp_src_preinst
 
 	dodoc README
-	rm -f README COPYING VERSION
+	rm -f README COPYING
 
 	docinto scripts
 	dodoc bin/*
diff --git a/www-apps/dokuwiki/dokuwiki-20110525.ebuild b/www-apps/dokuwiki/dokuwiki-20120125a.ebuild
index 86ef723d82b3..aaa2e70de4a6 100644
--- a/www-apps/dokuwiki/dokuwiki-20110525.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20120125a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20110525.ebuild,v 1.1 2011/05/28 16:43:37 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125a.ebuild,v 1.1 2012/05/13 08:16:04 ramereth Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ IUSE="gd"
 
 DEPEND=""
 RDEPEND="
-	|| ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] )
+	>=dev-lang/php-5.3[xml]
 	gd? ( || ( dev-lang/php[gd]
 		media-gfx/imagemagick )
 	)"
@@ -39,7 +39,7 @@ src_install() {
 	webapp_src_preinst
 
 	dodoc README
-	rm -f README COPYING VERSION
+	rm -f README COPYING
 
 	docinto scripts
 	dodoc bin/*