version bump, mark stable

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x27F4B742

4 files changed, 87 insertions, 16 deletions

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index 4849e4de5539..ac589c44d055 100644
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2012/05/13 08:16:04 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.59 2012/12/24 08:14:04 ramereth Exp $
+
+*dokuwiki-20121013 (24 Dec 2012)
+
+  24 Dec 2012; Lance Albertson <ramereth@gentoo.org> +dokuwiki-20121013.ebuild,
+  dokuwiki-20120125a.ebuild:
+  version bump, mark stable
 
 *dokuwiki-20120125a (13 May 2012)
 
@@ -281,4 +287,3 @@
   24 Jul 2005; Lance Albertson <ramereth@gentoo.org>
   +files/postinstall-en.txt, +metadata.xml, +dokuwiki-20050713.ebuild:
   * Initial commit for package
-
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index fcab61303a9c..a48d8b5413c9 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1 5334752ca970db3bebdba57b3cce9eff125d5888 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41
-DIST dokuwiki-2012-01-25.tgz 2545714 RMD160 3734a635e262f7e3c7a9904191c1f550d82804c3 SHA1 fb9a6eb08a5e3e158164596ba0a47d78af22484f SHA256 4787d62bcd1fbfb4ab134abb72ce3ca500098e7d37d2cbba35a2891825cf00c6
-DIST dokuwiki-2012-01-25a.tgz 2539659 RMD160 7780f215dc7e37f379138ae293eaf91d4b796f5b SHA1 4287b947e5d59528ef0d6685fee4ebefd99c1a24 SHA256 7a7f23ae6847db02bfc123d4292d7938662cc0c443a8e33402c63acb280ff664
-EBUILD dokuwiki-20120125.ebuild 1433 RMD160 96daa710d8ba08fa1553f1ffe3eccc17146204fc SHA1 f0046c3e8717f8173e0d0c8c5013bafcf49b9100 SHA256 97cc6c587ad9086163c5a3a83f1158deb72668fec9eace7881ebe471c4991cb2
-EBUILD dokuwiki-20120125a.ebuild 1436 RMD160 d5fa69f565205f7a1180f4b5c287a21bd3401883 SHA1 6914d236995deea1c029f6a4e8483c53bf2f1736 SHA256 4e1d37208d6ff1edd8819a5db9e02b05bfd7b6b32d21d48ca1e38124482e7448
-MISC ChangeLog 9549 RMD160 9cdfc49d9e15653a907b19e16222fe808b17f491 SHA1 aa64a6bb1a663fb50b95f3f79032e4e76cde847a SHA256 7a52a83f5ce31731647879c32b62d60deeb6258ca7256325d2b120d98dd787a3
-MISC metadata.xml 704 RMD160 b2fd3b409fae5b45fa0026324005078c634bf2c8 SHA1 22d012d3e3e37879c35e7c2b3d7eef7f0ff62187 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705
+AUX postinstall-en.txt 1590 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 SHA512 74012af53becc13a548acf9961fa52ac58c05166039dc99b4762f2e755df08ea94908f56a502ba4c9b9269ed111e7332411c03ec42747af3517a3030620313f2 WHIRLPOOL 1aa56e321098e9c97fcbffb989d17bb7e34cf3ca351dd64db3311233f981661a72f85f0cc3e961679fecd0de7c76f177162ed48308058d6143503e914ac3ad20
+DIST dokuwiki-2012-01-25.tgz 2545714 SHA256 4787d62bcd1fbfb4ab134abb72ce3ca500098e7d37d2cbba35a2891825cf00c6
+DIST dokuwiki-2012-01-25a.tgz 2539659 SHA256 7a7f23ae6847db02bfc123d4292d7938662cc0c443a8e33402c63acb280ff664
+DIST dokuwiki-2012-10-13.tgz 2810228 SHA256 27119ad9b62514dccf3afa4545370d5a775eb71ab794365a498e966f8b6c3834 SHA512 be3b14db2835576fa6df784608b078d36f9df1d126aa094b5ccc5df5b841807a3732301f191d5977815cd6eedcda12a8da9f0a8a209091706c4fc27126cecdd6 WHIRLPOOL d0bd2ed27c9828eba7200d5888ba44b95dcca848540043ee47679bf8d8f01e4b8a83242476ccb24ecb573eb6af9586c44fd8b1e5bc766b32eb50c58751f3ceef
+EBUILD dokuwiki-20120125.ebuild 1433 SHA256 97cc6c587ad9086163c5a3a83f1158deb72668fec9eace7881ebe471c4991cb2 SHA512 7805e2c3c14da6d532fb603e1e6ab138d13ac0b8747a2fb0c2d618f104d42085f469adceb572e8076d77bba47a57c4e000df59a6f5796134953ce62f409c76f1 WHIRLPOOL 6ab34a1b9518157b56e70b98c761186566be7211d3a1e179574b447957c4e031f7fa32277c63bad0ddd89580ac93314be6ad6203f78ef0d8ad2b63f9304e6192
+EBUILD dokuwiki-20120125a.ebuild 1434 SHA256 991d10e834c51b0465a7ac4cd4de42a97b32d1608abf455b8d63f6ee1be5468a SHA512 baf35fe97bebf04837dea71e2b8ab9a311ec3d11d431d6b5179a89a24cdc8bb1a6a4783238884afcd6cf5f59e7c420da045c3a111b8e570d722877579454fe6b WHIRLPOOL 32b96d3d14204d39fc5d0a463b7d25b7a469f02d33b0f41a4be0a927926b9fdda728ee1481393d09e06b02356b46e8eb61844e42b7a6ffc7a33a27b5ca849814
+EBUILD dokuwiki-20121013.ebuild 1435 SHA256 1f4154c771681b0253351e8ae9d9c3b519660a307b4b7785be59bdd1f1fb97e5 SHA512 68c0d5f8a17216f263489ca187e45973c8d966805e2126dcbc613ce0cf949568c4187581e48862eb6b4750eab12d41873a46ade8f026bbec64a9a34c6cd978a0 WHIRLPOOL 047d8d4353f35fb44bd93527848387e4647c771a51f8480816a845cf17768753a321a0ba43c5c9d194e6a150ad3b48ca6e42ed9c2a5fd1bd42ec640bf26eb8aa
+MISC ChangeLog 9720 SHA256 6e4b1c8cbb35da8ec47453b79af9f15373754a7a2cb7f79749aafdc49dd5946a SHA512 48691fef6fbfba8d0a4b88d60e4871b4d683f05781e8de1ba9b153699696367ae463a8124e2d1f598e08cbd144931472d6fb87b91a9ec53a173966d639436f95 WHIRLPOOL 803a4c392f167d6f94941b811a77b4e5033974ba3177845cbb71c492e7f1cdcbd105915c9de84b95056fb15f099e2f5227ba9424b2e8e81da4421936081fe30f
+MISC metadata.xml 704 SHA256 b5deb081a101cb2403fd375f3315c53a046dabfd62b10c201e336e83d3c2d705 SHA512 983f684a5360ff1a8522257e0229a4821ba4dafb62930c8aef7371f7e684908ec44de7eb626d8dbb76b42e831969780215e53ea6e4b8145e6ed322cd02809b72 WHIRLPOOL b5c0db0dee9733523b7d7f5f80613cc0f23d40a4a0c99344e58c2105d9885a863c9195f678c6a2d70a9d519e613dfbf17aadfa39ffa5dbfb93fb6b037ea2ebd1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iD8DBQFPr23LQW+hXSf0t0IRAjnSAKDX2tOLq8ACRfG8npHJQi5As/zouwCfXIjh
-GpvIPR+xjHk/KiGG2bhe5JY=
-=6xFp
+iD8DBQFQ2A7PQW+hXSf0t0IRCLRqAKDYF8SAL+qLF447x1p2yoAMz2zgEwCcCJ/y
+UsciSUS1evdKBNxWEJZrinY=
+=uXZr
 -----END PGP SIGNATURE-----
diff --git a/www-apps/dokuwiki/dokuwiki-20120125a.ebuild b/www-apps/dokuwiki/dokuwiki-20120125a.ebuild
index aaa2e70de4a6..dd4fd500692e 100644
--- a/www-apps/dokuwiki/dokuwiki-20120125a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20120125a.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-20120125a.ebuild,v 1.1 2012/05/13 08:16:04 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125a.ebuild,v 1.2 2012/12/24 08:14:04 ramereth Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ 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=""
diff --git a/www-apps/dokuwiki/dokuwiki-20121013.ebuild b/www-apps/dokuwiki/dokuwiki-20121013.ebuild
new file mode 100644
index 000000000000..e0ac1a41471c
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20121013.ebuild
@@ -0,0 +1,64 @@
+# 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-20121013.ebuild,v 1.1 2012/12/24 08:14:04 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]
+	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
+
+	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
+}