Version bump (resolves #372283), ebuild cleanup

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 26 insertions, 99 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 7be117dbd9b6..ccceb6b37742 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.53 2011/05/28 16:43:37 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.54 2011/07/14 16:25:43 ramereth Exp $
+
+*dokuwiki-20110525a (14 Jul 2011)
+
+  14 Jul 2011; Lance Albertson <ramereth@gentoo.org>
+  -dokuwiki-20091225c.ebuild, -dokuwiki-20101107.ebuild,
+  +dokuwiki-20110525a.ebuild:
+  Version bump (resolves #372283), ebuild cleanup
 
 *dokuwiki-20110525 (28 May 2011)
 
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 4142d0359103..4944441b294f 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA1
 
 AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1 5334752ca970db3bebdba57b3cce9eff125d5888 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41
-DIST dokuwiki-2009-12-25c.tgz 2543601 RMD160 b420185ec38601259f8d479d4869b2a38e01ccd0 SHA1 ece5f1026b97076b41f2cd6769e4e6f2452ec6fd SHA256 ab0ec208864d6b91820111a8530b2fbf959c7b7ae5a4b8855f937476144c69ff
-DIST dokuwiki-2010-11-07.tgz 2756995 RMD160 961916f058bafd9e84d479b41261290d4b535548 SHA1 d913f8c41144540d3d4e820b6ffb093956c43ff7 SHA256 2ed3fe0f10d8ece6bee42a51d9fbce4b597f6f4391597d63957d14ef88d4404d
 DIST dokuwiki-2010-11-07a.tgz 2758654 RMD160 3ee44b8830e26cb0670354d25a5b583cb80ac3c3 SHA1 261be29d6c83abcb3930743a64aaf868a255a0be SHA256 657c033d22b81e56bfa049aadf7bba98d6cb6fe55d5c1e590f1acc30568e6883
 DIST dokuwiki-2011-05-25.tgz 2802796 RMD160 0704a3da50c360e7c707e35b7d6e1a47f0f3796b SHA1 290731365f6d63a4580eaddaf3e9576f7d1629c1 SHA256 caeb993fe6428f251a7683249ac73c7f943aee4155230ac91dc657f661657284
-EBUILD dokuwiki-20091225c.ebuild 1530 RMD160 83a245dd47498753ad43dd7260c3fbd5a25fcef7 SHA1 ee1c20c14341a93df0dcd7aefdb37d868e9d1d09 SHA256 d570c47c36a4ec0e1820aad155cb8f3ffc211d8af727318b629a9a526964e4d6
-EBUILD dokuwiki-20101107.ebuild 1532 RMD160 edec29871a15f88617735d8db1df7702d98f3bd1 SHA1 bb3e3a6dd4719d850111e877d2e597f414155c93 SHA256 47740976effbb32511e935ec96443e9a748a2e76e80faa85051f7603da35830c
+DIST dokuwiki-2011-05-25a.tgz 2802972 RMD160 d4b9c26afb733ff5b02ed3503cefb03ee7a83c7b SHA1 a437e863aa5378091fe11ee21f0c5523ca993cee SHA256 4dd3be5ddddac0629f1df0179892b3f55ee24ffcd6cef7e14931fc465f51bb2d
 EBUILD dokuwiki-20101107a.ebuild 1476 RMD160 5272b94b12e26d749979f617d72e7a98e2e322ad SHA1 cbd45f56c27647a8353f98c7411f31cfba0f83af SHA256 f6d8e750f9e13f25c25564592ac31da66046ff1352df01f991920c8f4aa9ce13
 EBUILD dokuwiki-20110525.ebuild 1477 RMD160 9197e6784a920ebaec04a980d7f018b6d8b0072d SHA1 03958afffeba924821d8c9019958ca3ff35ddaa4 SHA256 78320e2a630e4f8c7743d3dbb69510a1f75f19ac966e9395905442a1e068bfff
-MISC ChangeLog 8589 RMD160 7e9e8583739ff18911b119f48023aaa85d0ecbb8 SHA1 e9bc0275877e2bb5e2108651070b8741b52a671a SHA256 feec4f937bc0685df22642e56d67bc2af3a63ed86112a6e9e0649078b356b24e
+EBUILD dokuwiki-20110525a.ebuild 1478 RMD160 871ca24ada79e917d2c64f367b1a3443374cf015 SHA1 4c8fe442093c288d6d141fc21f1b066c5f481737 SHA256 de57d35249f0b4a599401a76ba1d1bf16aae075da1f3fe2b5e6bed531b86c656
+MISC ChangeLog 8815 RMD160 2c922fec21385ce2bc46ca2c17c334e285ce6d36 SHA1 2e7c2766e329583ed415a2271bf691dcc361659d SHA256 c769ef8d89405f0b242b42aa89a4de7af0a6c6521eb7d49f889b4ea4fefdf90f
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFN4SZBQW+hXSf0t0IRAopPAJwIul/cD01wlHgpZjvV2m4nt5sfzACgka0p
-rDF9WURkvXtTstLicCt3jHk=
-=Stre
+iD8DBQFOHxhuQW+hXSf0t0IRAo1wAJwPJ8h8ks0FCW3paodIpFex+bi19ACeKQiK
+uvA0n04c7RB23UvX+76Od/M=
+=3nTt
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20091225c.ebuild b/www-apps/dokuwiki/dokuwiki-20091225c.ebuild
deleted file mode 100644
index 973cc3d8681e..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20091225c.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-20091225c.ebuild,v 1.5 2010/03/14 19:23:40 armin76 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-20101107.ebuild b/www-apps/dokuwiki/dokuwiki-20110525a.ebuild
index 06acbe43f894..197512a89f37 100644
--- a/www-apps/dokuwiki/dokuwiki-20101107.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20110525a.ebuild
@@ -1,6 +1,8 @@
 # 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-20101107.ebuild,v 1.2 2011/05/26 18:17:59 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20110525a.ebuild,v 1.1 2011/07/14 16:25:43 ramereth Exp $
+
+EAPI="4"
 
 inherit webapp depend.php
 
@@ -13,31 +15,22 @@ 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=""
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
 
 DEPEND=""
-RDEPEND=""
+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_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}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
+src_prepare() {
 	# create initial changes file
 	touch data/changes.log
 }