diff options
author | Lance Albertson <ramereth@gentoo.org> | 2012-05-13 08:16:04 +0000 |
---|---|---|
committer | Lance Albertson <ramereth@gentoo.org> | 2012-05-13 08:16:04 +0000 |
commit | e29a1bc5b96b6d83ec4ad49706dc87aa65ea7c13 (patch) | |
tree | 575155783266508ff6ce74c020cc116ac7b03a1f /www-apps/dokuwiki | |
parent | arm stable, bug #414241 (diff) | |
download | historical-e29a1bc5b96b6d83ec4ad49706dc87aa65ea7c13.tar.gz historical-e29a1bc5b96b6d83ec4ad49706dc87aa65ea7c13.tar.bz2 historical-e29a1bc5b96b6d83ec4ad49706dc87aa65ea7c13.zip |
Version bump, Cleanup. Resolves #410771, #403247, #386155
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'www-apps/dokuwiki')
-rw-r--r-- | www-apps/dokuwiki/ChangeLog | 13 | ||||
-rw-r--r-- | www-apps/dokuwiki/Manifest | 18 | ||||
-rw-r--r-- | www-apps/dokuwiki/dokuwiki-20101107a.ebuild | 64 | ||||
-rw-r--r-- | www-apps/dokuwiki/dokuwiki-20110525a.ebuild | 64 | ||||
-rw-r--r-- | www-apps/dokuwiki/dokuwiki-20120125.ebuild | 8 | ||||
-rw-r--r-- | www-apps/dokuwiki/dokuwiki-20120125a.ebuild (renamed from www-apps/dokuwiki/dokuwiki-20110525.ebuild) | 8 |
6 files changed, 27 insertions, 148 deletions
diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog index d192d33947ac..4849e4de5539 100644 --- a/www-apps/dokuwiki/ChangeLog +++ b/www-apps/dokuwiki/ChangeLog @@ -1,6 +1,17 @@ # 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.57 2012/03/09 04:56:24 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.58 2012/05/13 08:16:04 ramereth Exp $ + +*dokuwiki-20120125a (13 May 2012) + + 13 May 2012; Lance Albertson <ramereth@gentoo.org> + -dokuwiki-20101107a.ebuild, -dokuwiki-20110525.ebuild, + -dokuwiki-20110525a.ebuild, dokuwiki-20120125.ebuild, + +dokuwiki-20120125a.ebuild: + Version bump, Cleanup. Resolves #410771, #403247, #386155 + + Also make sure to install the VERSION file so that dokuwiki knows about its + own version. *dokuwiki-20120125 (09 Mar 2012) diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest index 52c6164dc0e7..fcab61303a9c 100644 --- a/www-apps/dokuwiki/Manifest +++ b/www-apps/dokuwiki/Manifest @@ -2,20 +2,16 @@ Hash: SHA1 AUX postinstall-en.txt 1590 RMD160 febd5daba4df2026d77f03f45894f022a0d1eaa9 SHA1 5334752ca970db3bebdba57b3cce9eff125d5888 SHA256 16f56b18233207dde91c632b4a69a07b627154abd3809aee94ccbf165bb60f41 -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 -DIST dokuwiki-2011-05-25a.tgz 2802972 RMD160 d4b9c26afb733ff5b02ed3503cefb03ee7a83c7b SHA1 a437e863aa5378091fe11ee21f0c5523ca993cee SHA256 4dd3be5ddddac0629f1df0179892b3f55ee24ffcd6cef7e14931fc465f51bb2d DIST dokuwiki-2012-01-25.tgz 2545714 RMD160 3734a635e262f7e3c7a9904191c1f550d82804c3 SHA1 fb9a6eb08a5e3e158164596ba0a47d78af22484f SHA256 4787d62bcd1fbfb4ab134abb72ce3ca500098e7d37d2cbba35a2891825cf00c6 -EBUILD dokuwiki-20101107a.ebuild 1476 RMD160 5272b94b12e26d749979f617d72e7a98e2e322ad SHA1 cbd45f56c27647a8353f98c7411f31cfba0f83af SHA256 f6d8e750f9e13f25c25564592ac31da66046ff1352df01f991920c8f4aa9ce13 -EBUILD dokuwiki-20110525.ebuild 1477 RMD160 9197e6784a920ebaec04a980d7f018b6d8b0072d SHA1 03958afffeba924821d8c9019958ca3ff35ddaa4 SHA256 78320e2a630e4f8c7743d3dbb69510a1f75f19ac966e9395905442a1e068bfff -EBUILD dokuwiki-20110525a.ebuild 1473 RMD160 115f57027f3afb9a8ab86a30a7275cdd7f7bc082 SHA1 19f7a46dd118f4d40a72501315b5eaed322f8dc1 SHA256 29aaab77b334f16b7716562d8dc9e2dcef7e561a946b4186a4722607406fac2b -EBUILD dokuwiki-20120125.ebuild 1477 RMD160 9f551a10960613ea7df7e6e0d19addf1ef5a9ff5 SHA1 fd4e4c720f279551379d6255888de48d662b5850 SHA256 c5b6867223b0081dcd59f0fe8e55406e592bf080dcc2cdd8cdc4df6eae0eae0b -MISC ChangeLog 9163 RMD160 aeabebf1cb4977fa0658fab369e896f695ed2023 SHA1 be8930f33ff4b276ee0e7429e40157a6f0727337 SHA256 19a8c91b950bb0e026cf51af8f718472e8093b239c97a7e52cedf39da13fe8e2 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iD8DBQFPWY1wQW+hXSf0t0IRAn7+AJ9sCfY93RTB4Ye5u2Mky6wn887wzACg5ztO -kZXGQW6FFEq7KlXStqxide4= -=FEfK +iD8DBQFPr23LQW+hXSf0t0IRAjnSAKDX2tOLq8ACRfG8npHJQi5As/zouwCfXIjh +GpvIPR+xjHk/KiGG2bhe5JY= +=6xFp -----END PGP SIGNATURE----- diff --git a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild b/www-apps/dokuwiki/dokuwiki-20101107a.ebuild deleted file mode 100644 index f6085a288e60..000000000000 --- a/www-apps/dokuwiki/dokuwiki-20101107a.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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.4 2011/05/27 15:28:11 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,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_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 -} diff --git a/www-apps/dokuwiki/dokuwiki-20110525a.ebuild b/www-apps/dokuwiki/dokuwiki-20110525a.ebuild deleted file mode 100644 index 31878d0f98bd..000000000000 --- a/www-apps/dokuwiki/dokuwiki-20110525a.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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-20110525a.ebuild,v 1.3 2011/08/19 16:29:45 tomka 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,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_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 -} diff --git a/www-apps/dokuwiki/dokuwiki-20120125.ebuild b/www-apps/dokuwiki/dokuwiki-20120125.ebuild index 5a5ecc6a8a2a..15f8b6e3624e 100644 --- a/www-apps/dokuwiki/dokuwiki-20120125.ebuild +++ b/www-apps/dokuwiki/dokuwiki-20120125.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-20120125.ebuild,v 1.1 2012/03/09 04:56:24 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125.ebuild,v 1.2 2012/05/13 08:16:04 ramereth Exp $ EAPI="4" @@ -15,12 +15,12 @@ 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="" RDEPEND=" - || ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] ) + >=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) )" @@ -39,7 +39,7 @@ src_install() { webapp_src_preinst dodoc README - rm -f README COPYING VERSION + rm -f README COPYING docinto scripts dodoc bin/* diff --git a/www-apps/dokuwiki/dokuwiki-20110525.ebuild b/www-apps/dokuwiki/dokuwiki-20120125a.ebuild index 86ef723d82b3..aaa2e70de4a6 100644 --- a/www-apps/dokuwiki/dokuwiki-20110525.ebuild +++ b/www-apps/dokuwiki/dokuwiki-20120125a.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-20110525.ebuild,v 1.1 2011/05/28 16:43:37 ramereth Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20120125a.ebuild,v 1.1 2012/05/13 08:16:04 ramereth Exp $ EAPI="4" @@ -20,7 +20,7 @@ IUSE="gd" DEPEND="" RDEPEND=" - || ( <dev-lang/php-5.3[xml,spl] >=dev-lang/php-5.3[xml] ) + >=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) )" @@ -39,7 +39,7 @@ src_install() { webapp_src_preinst dodoc README - rm -f README COPYING VERSION + rm -f README COPYING docinto scripts dodoc bin/* |