Version bump, resolves #354549

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

3 files changed, 79 insertions, 6 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 5ed921178694..30c79184f97c 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2010/11/09 22:17:08 ramereth Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.49 2011/02/28 02:55:56 ramereth Exp $
+
+*dokuwiki-20101107a (28 Feb 2011)
+
+  28 Feb 2011; Lance Albertson <ramereth@gentoo.org>
+  +dokuwiki-20101107a.ebuild:
+  Version bump, resolves #354549
+
+  Thanks to Azamat H. Hackimov for the user contributed ebuild bump.
 
 *dokuwiki-20101107 (09 Nov 2010)
 
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index b64b198a9618..3fd3757c405a 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -4,14 +4,16 @@ 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
 EBUILD dokuwiki-20091225c.ebuild 1530 RMD160 83a245dd47498753ad43dd7260c3fbd5a25fcef7 SHA1 ee1c20c14341a93df0dcd7aefdb37d868e9d1d09 SHA256 d570c47c36a4ec0e1820aad155cb8f3ffc211d8af727318b629a9a526964e4d6
 EBUILD dokuwiki-20101107.ebuild 1534 RMD160 40ea99c712f9da26f9dd6ce810e21343d9db1840 SHA1 30adc92617aecd47fd134468f3631a740805a66c SHA256 bded077df27144df23b81a64f36c64ba74359865dcd456c04a95cad8bc1fd8b5
-MISC ChangeLog 7822 RMD160 9cc0f1ee344b84c77d71b02090d2a7a53abc5ee6 SHA1 77304a220e65e02f4579addb0c099ab6c5c12757 SHA256 ec12dcf106beda22799eecb7992735c7e9137aba045e777e3a46980675742275
+EBUILD dokuwiki-20101107a.ebuild 1436 RMD160 0d5bee5b4ff30af706f313634864cd8487497ee2 SHA1 a7c72e09982f7ae0ff1f8ae8a6d48b6ed8907699 SHA256 6c625f7b70700912a4353e8b00bb8ee855a5c13edf058465bc2f539fd91e3122
+MISC ChangeLog 8044 RMD160 28b8dbf29f16cfdfe135a393c061976de450bd6f SHA1 dc5f980ed2d831a0234eac03cd1d464783f27385 SHA256 9e1b7533598ceb341e73e57ca2b3385d51fac947c03361407eb65d50c77a7e26
 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
+iD8DBQFNaw7FQW+hXSf0t0IRAtD4AJ9jPc348Kjj0NABFooNFbJMlBOS7QCgnJiZ
+u/lny/9sE1DoPDmw2uIeSnM=
+=HmOP
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
new file mode 100644
index 000000000000..05f3e824b657
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2011/02/28 02:55:56 ramereth Exp $
+
+EAPI="2"
+
+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[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
+}