gentoo resync : 04.08.2018

2 files changed, 81 insertions, 0 deletions

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 79b456989fae..4939e099dc66 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -3,6 +3,8 @@ AUX htaccess-dist 1639 BLAKE2B 52fea4574320fc4e56aa061e46f7ec978a6282996188f2d86
 AUX postinstall-en.txt 1791 BLAKE2B 96a1f47933d402d7d33aa6cd54724d1f1e9fb717c3a031be6785c49f26d5bcc518388d838a5e68f3911495b51391367ac5777698a8e79e45b5160f99250745e5 SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5
 DIST dokuwiki-2016-06-26e.tgz 3464178 BLAKE2B cdeebee2f36cc899fcffe1d6df6f5beee8f7dd303db00a41fa4d187c27528971a8ea0fccffacb6331fe61f5854a9b2687ff55c2578d628164a39f817e4538a58 SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039
 DIST dokuwiki-2017-02-19e.tgz 3505643 BLAKE2B 99fedb175fa8e1330a4ad14ed8d593edfc1edb9aeb7d8b9100e940fb4c5bfac9dada2fe395e030cff18b8c809e36211fc9d0bdc22d5be3fae7f243343704218a SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4
+DIST dokuwiki-2018-04-22a.tgz 3749191 BLAKE2B bb03b771e857a2db16ebd44d3f888af8e3c9dcd6fb5da2a549dc7c942ad87cb1e0aee6d3ed78edaa9df864804bf51cd18a17cf8a4123d12fac39405fe661bc04 SHA512 bf1dd7411abadedb395c9e12c7a9f5586fe078e59556b1ce66a5351c06f338406eca944d7589f40d8a9eb098da6ed0edc256f83ec8b19f6335415e2fe6c31284
 EBUILD dokuwiki-20160626e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
 EBUILD dokuwiki-20170219e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
+EBUILD dokuwiki-20180422a.ebuild 1654 BLAKE2B 6b468972d44f26972dee1b761afceb73b761adec0e29e3c33c8b255db5294e33a8081b9fe0b495b334841192d7e349a01686ea9f038e2ede3acfad33ba53e5b2 SHA512 b9c3fdf7a2f7e68374957cd47f837b3dbf7b34776864e38cca57c2db5990d8059dc92e03192f579db41beecbdaabd8b70fcb1af7d9ee5e1bd5469c913eeca41c
 MISC metadata.xml 820 BLAKE2B d67c70213557139c38731aae770bc35541a5e10a3c757012dc6a9bae78310bb9b57a9e62d3cf46b99bfb414047bfdbaf7edb66ded453bdee696bcf9a849ab498 SHA512 9fc806f40f766674a758578017d2dd6a81ff81d65b9dc202c811d4970eea0b2e5135e49c9b655bfd25969ba038ce449885424020ac52c2b2e493665b9d2e313f
diff --git a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
new file mode 100644
index 000000000000..336c627e5ccd
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="https://wiki.dokuwiki.org"
+SRC_URI="https://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
+
+	default
+}
+
+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
+}