Version bump, resolves #344681. Cleanup

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

5 files changed, 22 insertions, 149 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/Manifest b/www-apps/dokuwiki/Manifest
index dee2623f1328..b64b198a9618 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1 5334752ca970db3bebdba57b3cce9eff125d5888 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41
-DIST dokuwiki-2007-06-26b.tgz 1214743 RMD160 1d68b261267c3e9cf06df9d8c74813c5c09e39c9 SHA1 5ecfd9678605047b2ce7d8fc781c510bcb7f2b64 SHA256 b24f5596e253cea6670bc4a57e42769301cc6cd82427b975eaa6c7ea56231afd
-DIST dokuwiki-2009-02-14b.tgz 1774529 RMD160 6196a5b8b212854973ec1a5e7210f925a945eeb3 SHA1 e94d9c9c59ee5f845b667ea79f0e95c6a149f013 SHA256 f37ce44ef95db64602ad774cd3c35c85524318dd32fd3f20ed99d435e2fa7557
-DIST dokuwiki-2009-12-25b.tgz 2543597 RMD160 10acfa545a2059afd305bfc71609e910dad6b38f SHA1 22337d9a6ce46e49766639a625714e04d8e82491 SHA256 464cebbb97ddade384db24553a205fccaa450fac101b19f9cae1a2f61c60b9e0
 DIST dokuwiki-2009-12-25c.tgz 2543601 RMD160 b420185ec38601259f8d479d4869b2a38e01ccd0 SHA1 ece5f1026b97076b41f2cd6769e4e6f2452ec6fd SHA256 ab0ec208864d6b91820111a8530b2fbf959c7b7ae5a4b8855f937476144c69ff
-EBUILD dokuwiki-20070626b.ebuild 1485 RMD160 2e85d48ba8da88e9693e482162b9800d7baf6a99 SHA1 501a67c9a51764ae3f8491356c4b3607243d286c SHA256 4653b442e50aa8d347bbfa529d479d3596be8510e8c6acac9df261ca1479ceb4
-EBUILD dokuwiki-20090214b.ebuild 1529 RMD160 47a32106756ffe7c4fcc5b3812f2ee876039f74a SHA1 c6958b97d4a1c3db7c751763baf385ac83b7766a SHA256 bb7f4a15739d37f8198acc514e258aed61e65ae62c004a188ef4f43cbf026ce6
-EBUILD dokuwiki-20091225b.ebuild 1535 RMD160 1acab2bd5941dc169249af779a6d60c72a37b377 SHA1 f34a8d05ddbbe45d62495526dd8d0d0a14123786 SHA256 f6446a3d2f4a6ec97fea1aa93f2d84c7dd6e5389f9b70485b0bd540f39cad48e
+DIST dokuwiki-2010-11-07.tgz 2756995 RMD160 961916f058bafd9e84d479b41261290d4b535548 SHA1 d913f8c41144540d3d4e820b6ffb093956c43ff7 SHA256 2ed3fe0f10d8ece6bee42a51d9fbce4b597f6f4391597d63957d14ef88d4404d
 EBUILD dokuwiki-20091225c.ebuild 1530 RMD160 83a245dd47498753ad43dd7260c3fbd5a25fcef7 SHA1 ee1c20c14341a93df0dcd7aefdb37d868e9d1d09 SHA256 d570c47c36a4ec0e1820aad155cb8f3ffc211d8af727318b629a9a526964e4d6
-MISC ChangeLog 7576 RMD160 d9aa39e5094d04cb14eb18dc1e69da1e0c38e78e SHA1 0e98c4bd895801ae6be4621bddf1fd7f5dc178f3 SHA256 4a22a3d80f0729d2a2ee461dbc3c79844f19527be0f82b6e44d53e819bc1668f
+EBUILD dokuwiki-20101107.ebuild 1534 RMD160 40ea99c712f9da26f9dd6ce810e21343d9db1840 SHA1 30adc92617aecd47fd134468f3631a740805a66c SHA256 bded077df27144df23b81a64f36c64ba74359865dcd456c04a95cad8bc1fd8b5
+MISC ChangeLog 7822 RMD160 9cc0f1ee344b84c77d71b02090d2a7a53abc5ee6 SHA1 77304a220e65e02f4579addb0c099ab6c5c12757 SHA256 ec12dcf106beda22799eecb7992735c7e9137aba045e777e3a46980675742275
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iD8DBQFM2chqQW+hXSf0t0IRAo3lAKC0LYLg5e1kyFOyOtqZeVs0KjlZqgCgimS2
+HaTWRfSPI28BmMbWUIkug+c=
+=UzZQ
+-----END PGP SIGNATURE-----
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