[gentoo-commits] repo/gentoo:master commit in: www-apps/dokuwiki/

[Jorge Manuel B. S. Vicetto]

commit:     9c0390fdf14bc701a937201e1aa1e251756bd3e6
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 02:31:36 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 02:31:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0390fd

www-apps/dokuwiki: Add 20160626b and 20170219b releases.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-apps/dokuwiki/Manifest                  |  2 +
 www-apps/dokuwiki/dokuwiki-20160626b.ebuild | 77 +++++++++++++++++++++++++++++
 www-apps/dokuwiki/dokuwiki-20170219b.ebuild | 77 +++++++++++++++++++++++++++++
 3 files changed, 156 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index dba81b976cf..dea1e783044 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -3,3 +3,5 @@ DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a1674
 DIST dokuwiki-2015-08-10.tgz 3399960 SHA256 bdede4c71e95c1bd6a8daaa65e2ccfa8ef7372022504b9358f175df964f0a399 SHA512 745edc9ff60d2d145936693a4c66cecc4059c88c6a6fdfcce28cac0f74896f43c9156a11469902be34f278e2138c61a2ee5a8547994bd9163816c25429d8eb1b WHIRLPOOL 74b443432c9b30e4fcfe034a2898cec41ba2142775fe4ee1ae60def332aa572e04f8691914a329975a31d116fdb5e12af3b24d2552c7098ac20cc82c7d960603
 DIST dokuwiki-2015-08-10a.tgz 3406922 SHA256 98f0868c0cf9fc6664b57f89149fa537b73222bcc010247771e4afc08c8199fd SHA512 61108e7dbfa0ce6a142d9a77fbffbfc29cd0ed38ecd52558ab4043703a62d570c230d57822eeb6da2a9e34f6cbf72ac25416e7f97c55b5deae121f34393a9850 WHIRLPOOL 7d4a59669220b8b6abd632a4f074c2643c703d8c7f0c59293536f9f620af92e6a25e896fb48e084dd576456fc8399df53331606628288b97508b2950a3323a77
 DIST dokuwiki-2016-06-26a.tgz 3464161 SHA256 dfdb243cc766482eeefd99e70215b289c9aa0bd8bee83068f438440d7b1a1ce6 SHA512 5b0cb2efa0a1bc8d0601b7d19e34ac1d077522e9de2418fc0209a4162757833111e6fe659c5f2383143759a33b5613ad9783ebe42371b4c715ee5dc582b48249 WHIRLPOOL 0f381e629e9b810e98c46c3f89b98ddd1e716c63d71b9c1954e23c47ebcc3de9fbfdecda88be4022e750b24b2771b7f4ec0345bd76330daf315c4b9d070abe5a
+DIST dokuwiki-2016-06-26b.tgz 3464109 SHA256 eda6421fbd381d67ac6c31c5649fba7e6526904fc186df18191641e5387d8b4f SHA512 6952e89cec7866897b93af5d2719d34e98927545c9ec73600378599d6a8fb8e11d44adf385b4911b9f666dac3f0c7e76b39e589ff28c93da8c83303390d4ff2b WHIRLPOOL 0d7f036b60676312e1adf689606eb10dfb30f5e509bcad9b333ddb32b5d0b1255f4d8c93e08d7b427393ae4b43ee57a697a310c879ec2b7c26522f46ae5165d8
+DIST dokuwiki-2017-02-19b.tgz 3505444 SHA256 88a4d6c83283a1059e9765477667262f15d443f50e48f583c7dc5d55c2abcdb6 SHA512 207f20fb4b5d72cae2cfd7446b43b549e58fb1a57fe5c6676979dc07ec22370841841eb9b455f2f88aa734425a7735f162708f205535498e331035e7bd1fcbb8 WHIRLPOOL d1d62e93d9f940039f3fd24f9ce6b621eaf7632d56223fa78f3650fc5e10ef8197f43f92e7e4bfd56b227cf0d6884a1f8e5ff5b4cf7a90fcdeca505d4f00c45e

diff --git a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild b/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
new file mode 100644
index 00000000000..d6e837cfd1c
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+# 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://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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 .
+
+	# Copy custom .htaccess that works with both apache 2.2 and 2.4
+	for dir in "conf" "data" "inc" "inc/lang"; do
+		insinto "${MY_HTDOCSDIR}/${dir}"
+		newins "${FILESDIR}/htaccess" ".htaccess"
+	done
+
+	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
+	insinto "${MY_HTDOCSDIR}/"
+	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
+
+	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-20170219b.ebuild b/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
new file mode 100644
index 00000000000..d6e837cfd1c
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+# 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://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.3[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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 .
+
+	# Copy custom .htaccess that works with both apache 2.2 and 2.4
+	for dir in "conf" "data" "inc" "inc/lang"; do
+		insinto "${MY_HTDOCSDIR}/${dir}"
+		newins "${FILESDIR}/htaccess" ".htaccess"
+	done
+
+	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
+	insinto "${MY_HTDOCSDIR}/"
+	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
+
+	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
+}