Version bump, fixes #299360

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

3 files changed, 92 insertions, 3 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 3dc92555e7de..cf6b108f3740 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/dokuwiki
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.41 2009/07/19 18:42:18 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.42 2010/01/15 20:14:48 ramereth Exp $
+
+*dokuwiki-20091225b (15 Jan 2010)
+
+  15 Jan 2010; Lance Albertson <ramereth@gentoo.org>
+  +dokuwiki-20091225b.ebuild:
+  Version bump, fixes #299360
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> dokuwiki-20090214b.ebuild:
   ppc stable #272431
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 08c9191e3a8a..35fb06b4b01a 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,7 +1,19 @@
+-----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
 EBUILD dokuwiki-20070626b.ebuild 1485 RMD160 2e85d48ba8da88e9693e482162b9800d7baf6a99 SHA1 501a67c9a51764ae3f8491356c4b3607243d286c SHA256 4653b442e50aa8d347bbfa529d479d3596be8510e8c6acac9df261ca1479ceb4
 EBUILD dokuwiki-20090214b.ebuild 1529 RMD160 47a32106756ffe7c4fcc5b3812f2ee876039f74a SHA1 c6958b97d4a1c3db7c751763baf385ac83b7766a SHA256 bb7f4a15739d37f8198acc514e258aed61e65ae62c004a188ef4f43cbf026ce6
-MISC ChangeLog 6769 RMD160 b48be4d9c28dfcd70d21ab90d43e8fc18dacd9b4 SHA1 4d35ace616a1266e2167e82a14278e6d209e4554 SHA256 d58c3c758d05caeeb770f7949b1f634f1a30ecde912f5431d0eae38bea373350
+EBUILD dokuwiki-20091225b.ebuild 1535 RMD160 1acab2bd5941dc169249af779a6d60c72a37b377 SHA1 f34a8d05ddbbe45d62495526dd8d0d0a14123786 SHA256 f6446a3d2f4a6ec97fea1aa93f2d84c7dd6e5389f9b70485b0bd540f39cad48e
+MISC ChangeLog 6920 RMD160 21e5bbbca993396e1b9cf9ad26702c02302c92ea SHA1 9e397a4e530a11373fa074a2aedadcb0ef041b2c SHA256 f406eb25e2b6b5fabdd2e472051bd14d4d03d48c06ed00413560bc08ec4936b5
 MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFLUMy/QW+hXSf0t0IRAvdBAJwNe1tdbosO/nec7yLNRqLM31t5fACeNMce
+M4JPNh5XyjUSZVLqqLhRw6g=
+=dUWu
+-----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20091225b.ebuild b/www-apps/dokuwiki/dokuwiki-20091225b.ebuild
new file mode 100644
index 000000000000..bbb6327bd8c5
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20091225b.ebuild
@@ -0,0 +1,71 @@
+# 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 $
+
+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
+}