gentoo resync : 25.08.2020

3 files changed, 18 insertions, 88 deletions

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index bf7c02176a71..6e06a012b0eb 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,12 +1,10 @@
 AUX htaccess 170 BLAKE2B bcdf354e630f2e2995a56b7f435da2cff2c39f85ee70f745d43ec3cb575816da7b6c9626f2090dd1c2b25b38dc444904d547e4b8f96262b0ad9a9bda805cc045 SHA512 a19dba09a2a5c6926b56ca1063e329e431253825550890be56a46faccd736aec7236167b5da1f0b0cfec47a9935f340f246b4bfaaaaeba06644d08a76fc52514
 AUX htaccess-dist 1639 BLAKE2B 52fea4574320fc4e56aa061e46f7ec978a6282996188f2d86b9eea4e8b4617c561f94621ea3cf334d4eae16d164c96ce419258da40e9644b951f5c4d828acf09 SHA512 8d05756eb04a61fc9a89b814d0cf9022feb57c3de10fa74cf1964bdba7910d25448109147facccd8447a4ff446cb7a0cf8d8134642061d23b03e0921b032fc76
 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
 DIST dokuwiki-2018-04-22b.tgz 3745314 BLAKE2B 56c349c72038db83b5ae199ac1d6d00ef8566a00fdf2bc5a782e808e5205ae3ba5cfa47bdfc4f7fb0b2e493a22eed006517cfb46f7c0c57de748cfb800942f58 SHA512 6fc1fba8d93296d7cc795a4067e409339b3ce965ad38aefa42f1974d267ac05f199185e895a60d355ebe8371c68345fa51f2aea5871f955dbba1cdbdf8bedebf
-EBUILD dokuwiki-20160626e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
-EBUILD dokuwiki-20170219e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
+DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c
 EBUILD dokuwiki-20180422a.ebuild 1654 BLAKE2B 6b468972d44f26972dee1b761afceb73b761adec0e29e3c33c8b255db5294e33a8081b9fe0b495b334841192d7e349a01686ea9f038e2ede3acfad33ba53e5b2 SHA512 b9c3fdf7a2f7e68374957cd47f837b3dbf7b34776864e38cca57c2db5990d8059dc92e03192f579db41beecbdaabd8b70fcb1af7d9ee5e1bd5469c913eeca41c
 EBUILD dokuwiki-20180422b.ebuild 1651 BLAKE2B 8bf185b5b0a8e72c0cfc74579582e33f0e701371a7d025956cd521d48c394566be6a11d923e4b9fcaba1e0fed6147d8526cd8f39ba73b34558bbb0895c227170 SHA512 74d04e42a4d0c02c6b5f8bd4340779ce5077733737e7d9fd6191f28bf8c94107a0ccabe186de6e89674269bfa63810eddcf08a6c9cbdd889c19ad89366ed8356
+EBUILD dokuwiki-20200729.ebuild 1861 BLAKE2B a3f181b2a9eca3924dd58dc44472f5e66b4731a15af4f8a91d82698a84351604257785bbed789a0a99c2356805a06a3f116c01eb608627b2ca0b1965763f043c SHA512 e86bd291b5f9aab0b2d16f4f9925f20b3a2b28ec6b41765261e9c963bb010d9250c45dbd63f3f5a93916335cb0a7be997deff5c0357042e1b0d56e525b3806a8
 MISC metadata.xml 820 BLAKE2B d67c70213557139c38731aae770bc35541a5e10a3c757012dc6a9bae78310bb9b57a9e62d3cf46b99bfb414047bfdbaf7edb66ded453bdee696bcf9a849ab498 SHA512 9fc806f40f766674a758578017d2dd6a81ff81d65b9dc202c811d4970eea0b2e5135e49c9b655bfd25969ba038ce449885424020ac52c2b2e493665b9d2e313f
diff --git a/www-apps/dokuwiki/dokuwiki-20170219e.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
deleted file mode 100644
index d6e837cfd1cc..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-20160626e.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
index d6e837cfd1cc..1b6c72ea09b0 100644
--- a/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -1,17 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 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}"
+
+if [[ ${PV} == *rc* ]]; then
+	MY_PV="${MY_BASE_PV}${PV:8:4}"
+	MY_P="${PN}-rc-${MY_BASE_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-rc.tgz -> ${PN}-${PV}.tgz"
+else
+	MY_PV="${MY_BASE_PV}${PV:8:4}"
+	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
 
 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"
+HOMEPAGE="https://wiki.dokuwiki.org"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -31,11 +40,11 @@ RDEPEND="
 
 need_httpd_cgi
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_prepare() {
 	# create initial changes file
 	touch data/changes.log
+
+	default
 }
 
 src_install() {