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

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

[Viorel Munteanu]

commit:     67d48bc2a54fa15e622170a036cab2ceddb2ab0e
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 04:18:07 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu May 18 04:18:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d48bc2

www-apps/dokuwiki: add 20230404a

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20230404a.ebuild | 86 +++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index f65a40580e29..15f1d97987b4 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1 +1,2 @@
 DIST dokuwiki-2023-04-04.tgz 4032792 BLAKE2B 32bc42d6fd5d869bfc08ee8fc7214f42dfdb4812eea74d04d2566dc3c75f5a7069b62bbc0b8eaca389322d971ffc35c6d40e8257658e38f9cebf96ab2bd47bd6 SHA512 1539f9306916ce1f759a07168a02dab05ee044b3637ce96cf94d67b84027f5774cb2a9f493c8067ff70176d7b018c54cded1251e35022c8f9dfed74fd4fa501f
+DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8

diff --git a/www-apps/dokuwiki/dokuwiki-20230404a.ebuild b/www-apps/dokuwiki/dokuwiki-20230404a.ebuild
new file mode 100644
index 000000000000..c6d2a56a3fa0
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20230404a.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.4[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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
+}

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

[Viorel Munteanu]

commit:     a53b472e941b6280abffc3d9468c2ccb5c2583ab
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 09:25:48 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 09:25:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53b472e

www-apps/dokuwiki: drop 20230404a-r1

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                     |  1 -
 www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild | 86 --------------------------
 2 files changed, 87 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 7414cc22bd7d..0deb28256097 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1 @@
-DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
 DIST dokuwiki-2024-02-06b.tgz 4206676 BLAKE2B d9d01723f0dca747fb5d7c99057c22af916879be05f3d7048af37d51552efeae328231dabd321c03ab7dd09474157372ec95846c5d80f9eb111ce3eb67210c42 SHA512 6edaa8baaf5f1c090476e98fff94f14ef71ea1293c8f7e329cee62dacab6e5f49e7fb016e238c96f0e770927c69e7800d98cce2f2a52aa3d1fefd4c869f1bb4a

diff --git a/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild
deleted file mode 100644
index 9de0b60bb660..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20230404a-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-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="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-8.0[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-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
-}

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

[Viorel Munteanu]

commit:     95ba59c28195d4ebd07c3ffc7668a5be7ceae91a
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 09:25:38 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 09:25:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ba59c2

www-apps/dokuwiki: drop 20240206a

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  1 -
 www-apps/dokuwiki/dokuwiki-20240206a.ebuild | 85 -----------------------------
 2 files changed, 86 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index b4637d6a5cf9..7414cc22bd7d 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,3 +1,2 @@
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
-DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c
 DIST dokuwiki-2024-02-06b.tgz 4206676 BLAKE2B d9d01723f0dca747fb5d7c99057c22af916879be05f3d7048af37d51552efeae328231dabd321c03ab7dd09474157372ec95846c5d80f9eb111ce3eb67210c42 SHA512 6edaa8baaf5f1c090476e98fff94f14ef71ea1293c8f7e329cee62dacab6e5f49e7fb016e238c96f0e770927c69e7800d98cce2f2a52aa3d1fefd4c869f1bb4a

diff --git a/www-apps/dokuwiki/dokuwiki-20240206a.ebuild b/www-apps/dokuwiki/dokuwiki-20240206a.ebuild
deleted file mode 100644
index 80ace2977efa..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20240206a.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-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="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-RDEPEND="
-	>=dev-lang/php-8.0[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-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
-}

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

[Viorel Munteanu]

commit:     f1b51008ed603e16c0a87258087e5f6e585eae3d
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 09:25:14 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 09:25:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b51008

www-apps/dokuwiki: add 20240206b

Security update.

Bug: https://bugs.gentoo.org/938729
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20240206b.ebuild | 85 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index d8f9e704ea1a..b4637d6a5cf9 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,3 @@
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
 DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c
+DIST dokuwiki-2024-02-06b.tgz 4206676 BLAKE2B d9d01723f0dca747fb5d7c99057c22af916879be05f3d7048af37d51552efeae328231dabd321c03ab7dd09474157372ec95846c5d80f9eb111ce3eb67210c42 SHA512 6edaa8baaf5f1c090476e98fff94f14ef71ea1293c8f7e329cee62dacab6e5f49e7fb016e238c96f0e770927c69e7800d98cce2f2a52aa3d1fefd4c869f1bb4a

diff --git a/www-apps/dokuwiki/dokuwiki-20240206b.ebuild b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild
new file mode 100644
index 000000000000..80ace2977efa
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="gd"
+
+RDEPEND="
+	>=dev-lang/php-8.0[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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
+}

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

[Viorel Munteanu]

commit:     17dc934fba01d03eddb307112167ca4e167223f4
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 12:29:01 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 12:29:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17dc934f

www-apps/dokuwiki: add 20240206a

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20240206a.ebuild | 85 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 46c18457d813..1bc52d491e88 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,3 @@
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
 DIST dokuwiki-2024-02-06.tgz 4191147 BLAKE2B fc379c06b31ce8a6ac307743a096728c39dc2098dbb787af7d21e673e8e9f34e8bf7a1e0d7c4c875bd8c80fded2603f32ef8c0a78beee12efcbffc5faa1eb823 SHA512 8584712371ab3901e7dc0e8c039004b6fbe1698db0431108a4683d3b90ba64ba920d386426bcaaea5a2576742f831b4e708b63e5f8cb2c26c827ab84adb54db9
+DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c

diff --git a/www-apps/dokuwiki/dokuwiki-20240206a.ebuild b/www-apps/dokuwiki/dokuwiki-20240206a.ebuild
new file mode 100644
index 000000000000..80ace2977efa
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20240206a.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="gd"
+
+RDEPEND="
+	>=dev-lang/php-8.0[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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
+}

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

[Viorel Munteanu]

commit:     2a83c2d5033665a4974b398874f16bfa3dbae8ca
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 12:29:18 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 12:29:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a83c2d5

www-apps/dokuwiki: drop 20240206

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 -
 www-apps/dokuwiki/dokuwiki-20240206.ebuild | 85 ------------------------------
 2 files changed, 86 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 1bc52d491e88..d8f9e704ea1a 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,3 +1,2 @@
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
-DIST dokuwiki-2024-02-06.tgz 4191147 BLAKE2B fc379c06b31ce8a6ac307743a096728c39dc2098dbb787af7d21e673e8e9f34e8bf7a1e0d7c4c875bd8c80fded2603f32ef8c0a78beee12efcbffc5faa1eb823 SHA512 8584712371ab3901e7dc0e8c039004b6fbe1698db0431108a4683d3b90ba64ba920d386426bcaaea5a2576742f831b4e708b63e5f8cb2c26c827ab84adb54db9
 DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c

diff --git a/www-apps/dokuwiki/dokuwiki-20240206.ebuild b/www-apps/dokuwiki/dokuwiki-20240206.ebuild
deleted file mode 100644
index 80ace2977efa..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20240206.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-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="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-RDEPEND="
-	>=dev-lang/php-8.0[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-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
-}

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

[Viorel Munteanu]

commit:     27c988f6b34d11b156e2975603dd54d025eee54d
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 07:18:20 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 07:28:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c988f6

www-apps/dokuwiki: add 20240206

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 +
 www-apps/dokuwiki/dokuwiki-20240206.ebuild | 85 ++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 8d185a2f2127..46c18457d813 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1 +1,2 @@
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8
+DIST dokuwiki-2024-02-06.tgz 4191147 BLAKE2B fc379c06b31ce8a6ac307743a096728c39dc2098dbb787af7d21e673e8e9f34e8bf7a1e0d7c4c875bd8c80fded2603f32ef8c0a78beee12efcbffc5faa1eb823 SHA512 8584712371ab3901e7dc0e8c039004b6fbe1698db0431108a4683d3b90ba64ba920d386426bcaaea5a2576742f831b4e708b63e5f8cb2c26c827ab84adb54db9

diff --git a/www-apps/dokuwiki/dokuwiki-20240206.ebuild b/www-apps/dokuwiki/dokuwiki-20240206.ebuild
new file mode 100644
index 000000000000..80ace2977efa
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20240206.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="gd"
+
+RDEPEND="
+	>=dev-lang/php-8.0[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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
+}

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

[Viorel Munteanu]

commit:     a22c2df1a867951b9ce232c061b2dce52f90d1b4
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 04:18:13 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu May 18 04:18:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22c2df1

www-apps/dokuwiki: drop 20230404

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 -
 www-apps/dokuwiki/dokuwiki-20230404.ebuild | 86 ------------------------------
 2 files changed, 87 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 15f1d97987b4..8d185a2f2127 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1 @@
-DIST dokuwiki-2023-04-04.tgz 4032792 BLAKE2B 32bc42d6fd5d869bfc08ee8fc7214f42dfdb4812eea74d04d2566dc3c75f5a7069b62bbc0b8eaca389322d971ffc35c6d40e8257658e38f9cebf96ab2bd47bd6 SHA512 1539f9306916ce1f759a07168a02dab05ee044b3637ce96cf94d67b84027f5774cb2a9f493c8067ff70176d7b018c54cded1251e35022c8f9dfed74fd4fa501f
 DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8

diff --git a/www-apps/dokuwiki/dokuwiki-20230404.ebuild b/www-apps/dokuwiki/dokuwiki-20230404.ebuild
deleted file mode 100644
index c6d2a56a3fa0..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20230404.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-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="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-7.4[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-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
-}

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

[Viorel Munteanu]

commit:     15c416c5df205cda4f7f9e054a7383438c176f56
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 06:57:40 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 06:58:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c416c5

www-apps/dokuwiki: drop 20200729

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 -
 www-apps/dokuwiki/dokuwiki-20200729.ebuild | 86 ------------------------------
 2 files changed, 87 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index f64f85e696c1..f65a40580e29 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1 @@
-DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c
 DIST dokuwiki-2023-04-04.tgz 4032792 BLAKE2B 32bc42d6fd5d869bfc08ee8fc7214f42dfdb4812eea74d04d2566dc3c75f5a7069b62bbc0b8eaca389322d971ffc35c6d40e8257658e38f9cebf96ab2bd47bd6 SHA512 1539f9306916ce1f759a07168a02dab05ee044b3637ce96cf94d67b84027f5774cb2a9f493c8067ff70176d7b018c54cded1251e35022c8f9dfed74fd4fa501f

diff --git a/www-apps/dokuwiki/dokuwiki-20200729.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
deleted file mode 100644
index 903888f0e1e8..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20200729.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-
-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="https://wiki.dokuwiki.org"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~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
-
-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
-}

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

[Viorel Munteanu]

commit:     053afd30090cd96adb319edaf4e00889d4a98460
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 06:56:56 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 06:58:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053afd30

www-apps/dokuwiki: add 20230404

Closes: https://bugs.gentoo.org/876244
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 +
 www-apps/dokuwiki/dokuwiki-20230404.ebuild | 86 ++++++++++++++++++++++++++++++
 www-apps/dokuwiki/metadata.xml             |  3 ++
 3 files changed, 90 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index fd175879da7f..f64f85e696c1 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1 +1,2 @@
 DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c
+DIST dokuwiki-2023-04-04.tgz 4032792 BLAKE2B 32bc42d6fd5d869bfc08ee8fc7214f42dfdb4812eea74d04d2566dc3c75f5a7069b62bbc0b8eaca389322d971ffc35c6d40e8257658e38f9cebf96ab2bd47bd6 SHA512 1539f9306916ce1f759a07168a02dab05ee044b3637ce96cf94d67b84027f5774cb2a9f493c8067ff70176d7b018c54cded1251e35022c8f9dfed74fd4fa501f

diff --git a/www-apps/dokuwiki/dokuwiki-20230404.ebuild b/www-apps/dokuwiki/dokuwiki-20230404.ebuild
new file mode 100644
index 000000000000..c6d2a56a3fa0
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20230404.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+IUSE="gd"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.4[xml]
+	virtual/httpd-php:*
+	gd? ( ||
+		(
+			dev-lang/php[gd]
+			media-gfx/imagemagick
+		)
+	)
+"
+
+need_httpd_cgi
+
+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
+}

diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 0ebf9ea835d1..9e5234c9d3ab 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/metadata.xml
@@ -14,4 +14,7 @@
 		eases the creation of structured texts. All data is stored in plain text
 		files - no database is required.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">dokuwiki/dokuwiki</remote-id>
+	</upstream>
 </pkgmetadata>

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

[Jakov Smolić]

commit:     218816a23384eab7de0b4a9ce7cf16332f468598
Author:     Chris Su <chris <AT> lesscrowds <DOT> org>
AuthorDate: Sun Oct 30 11:31:36 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 04:25:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218816a2

www-apps/dokuwiki: Keyword 20200729 riscv, #878819

Signed-off-by: Chris Su <chris <AT> lesscrowds.org>
Closes: https://github.com/gentoo/gentoo/pull/28039
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 www-apps/dokuwiki/dokuwiki-20200729.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20200729.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
index 84954389b5dd..903888f0e1e8 100644
--- a/www-apps/dokuwiki/dokuwiki-20200729.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documen
 HOMEPAGE="https://wiki.dokuwiki.org"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
 IUSE="gd"
 
 DEPEND=""

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

[Andreas Sturmlechner]

commit:     20a32156b3f105f6c498fa82d2b27fde52ba18bc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 19:53:03 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 06:05:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a32156

www-apps/dokuwiki: drop 20180422a, 20180422b, EAPI-6--

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  2 -
 www-apps/dokuwiki/dokuwiki-20180422a.ebuild | 79 -----------------------------
 www-apps/dokuwiki/dokuwiki-20180422b.ebuild | 79 -----------------------------
 3 files changed, 160 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 7b5bafc351d4..fd175879da7f 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,3 +1 @@
-DIST dokuwiki-2018-04-22a.tgz 3749191 BLAKE2B bb03b771e857a2db16ebd44d3f888af8e3c9dcd6fb5da2a549dc7c942ad87cb1e0aee6d3ed78edaa9df864804bf51cd18a17cf8a4123d12fac39405fe661bc04 SHA512 bf1dd7411abadedb395c9e12c7a9f5586fe078e59556b1ce66a5351c06f338406eca944d7589f40d8a9eb098da6ed0edc256f83ec8b19f6335415e2fe6c31284
-DIST dokuwiki-2018-04-22b.tgz 3745314 BLAKE2B 56c349c72038db83b5ae199ac1d6d00ef8566a00fdf2bc5a782e808e5205ae3ba5cfa47bdfc4f7fb0b2e493a22eed006517cfb46f7c0c57de748cfb800942f58 SHA512 6fc1fba8d93296d7cc795a4067e409339b3ce965ad38aefa42f1974d267ac05f199185e895a60d355ebe8371c68345fa51f2aea5871f955dbba1cdbdf8bedebf
 DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c

diff --git a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
deleted file mode 100644
index f806c4e91ee8..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-}

diff --git a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
deleted file mode 100644
index f806c4e91ee8..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-}

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

[Sam James]

commit:     11be174b9fbc815432381ddcf749b05c85b88521
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 00:16:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 00:19:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11be174b

www-apps/dokuwiki: drop trailing full stop from DESCRIPTION

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/dokuwiki/dokuwiki-20180422a.ebuild | 4 ++--
 www-apps/dokuwiki/dokuwiki-20180422b.ebuild | 4 ++--
 www-apps/dokuwiki/dokuwiki-20200729.ebuild  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
index 336c627e5ccd..f806c4e91ee8 100644
--- a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit webapp
 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."
+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"
 

diff --git a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
index 1d99e100aff1..f806c4e91ee8 100644
--- a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit webapp
 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."
+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"
 

diff --git a/www-apps/dokuwiki/dokuwiki-20200729.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
index 1a3c5c8fe58a..84954389b5dd 100644
--- a/www-apps/dokuwiki/dokuwiki-20200729.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
 HOMEPAGE="https://wiki.dokuwiki.org"
 
 LICENSE="GPL-2"

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

[Sam James]

commit:     40df93f5960259d13a8db84c102419bbf55d6f38
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:18:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:18:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40df93f5

www-apps/dokuwiki: Keyword 20200729 arm64, #778491

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/dokuwiki/dokuwiki-20200729.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20200729.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
index 8fead534cef..1a3c5c8fe58 100644
--- a/www-apps/dokuwiki/dokuwiki-20200729.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documen
 HOMEPAGE="https://wiki.dokuwiki.org"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="gd"
 
 DEPEND=""

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

[Sam James]

commit:     4a5922d1c5c58d332bc7f3867eb7e95daa1c561c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 22:05:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 22:27:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5922d1

www-apps/dokuwiki: mark ALLARCHES

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/dokuwiki/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-apps/dokuwiki/metadata.xml b/www-apps/dokuwiki/metadata.xml
index 6cbe76a6b93..4a30136143e 100644
--- a/www-apps/dokuwiki/metadata.xml
+++ b/www-apps/dokuwiki/metadata.xml
@@ -9,6 +9,7 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
 		creating documentation of any kind. It is targeted at developer teams,

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

[Jorge Manuel B. S. Vicetto]

commit:     92cc27d5f6cd0f41f7fc00965f8875f6f006d4a4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 02:29:27 2020 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 02:29:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cc27d5

www-apps/dokuwiki: Drop old EAPI=5 versions.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

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

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index c99ec334ccd..7b5bafc351d 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,5 +1,3 @@
-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
 DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c

diff --git a/www-apps/dokuwiki/dokuwiki-20160626e.ebuild b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
deleted file mode 100644
index d6e837cfd1c..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20160626e.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-20170219e.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
deleted file mode 100644
index d6e837cfd1c..00000000000
--- 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
-}

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

[Jorge Manuel B. S. Vicetto]

commit:     7ebd3acb7d81cc48edf6130ed4fe7360beb02784
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 02:26:20 2020 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 02:26:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebd3acb

www-apps/dokuwiki: 20200729 version bump.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 +
 www-apps/dokuwiki/dokuwiki-20200729.ebuild | 86 ++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 64daffe8e74..c99ec334ccd 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,3 +2,4 @@ DIST dokuwiki-2016-06-26e.tgz 3464178 BLAKE2B cdeebee2f36cc899fcffe1d6df6f5beee8
 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
+DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c

diff --git a/www-apps/dokuwiki/dokuwiki-20200729.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
new file mode 100644
index 00000000000..1b6c72ea09b
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+# upstream uses dashes in the datestamp
+MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+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="https://wiki.dokuwiki.org"
+
+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
+
+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
+}

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

[Jorge Manuel B. S. Vicetto]

commit:     36dc4b135fa4e3acbc57783b0e560e10ca38c556
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  1 10:53:19 2019 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Feb  1 10:53:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36dc4b13

www-apps/dokuwiki: bump to hotfix 20180422b.

This hotfix fixes a PHP 7.3 compatibility issue and the ACL check.

Release notes - https://www.dokuwiki.org/changes
Thanks to boris for opening the bug requesting the bump.
Closes: http://bugs.gentoo.org/676904
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20180422b.ebuild | 79 +++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index a8b08deb1d7..64daffe8e74 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/www-apps/dokuwiki/dokuwiki-20180422b.ebuild b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
new file mode 100644
index 00000000000..1d99e100aff
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20180422b.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+}

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

[Jorge Manuel B. S. Vicetto]

commit:     9f5d4725cfc1c75950dd24e84ec7933c0068bcf1
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 19:47:09 2018 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 19:47:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5d4725

www-apps/dokuwiki: Fix EAPI 6 bump.

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 www-apps/dokuwiki/dokuwiki-20180422a.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
index f0eb2c1c725..336c627e5cc 100644
--- a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
@@ -36,6 +36,8 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 src_prepare() {
 	# create initial changes file
 	touch data/changes.log
+
+	default
 }
 
 src_install() {

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

[Jorge Manuel B. S. Vicetto]

commit:     22b61e4421edc6df7cfd401f3f32dabe8e947b02
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 19:36:37 2018 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 19:37:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b61e44

www-apps/dokuwiki: Version bump to release 20180422a.

Reported by: boris <funtoo <AT> alphaframe.net>
Closes: https://bugs.gentoo.org/657530
Package-Manager: Portage-2.3.42, Repoman-2.3.9

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20180422a.ebuild | 77 +++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 6f2ff03da93..a8b08deb1d7 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/www-apps/dokuwiki/dokuwiki-20180422a.ebuild b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
new file mode 100644
index 00000000000..f0eb2c1c725
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20180422a.ebuild
@@ -0,0 +1,77 @@
+# 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
+}
+
+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
+}

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

[Jorge Manuel B. S. Vicetto]

commit:     c31676125999f57f4e98a7b2c63346f6fe14261f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 09:59:56 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 10:00:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3167612

www-apps/dokuwiki: Add releases 20160626e and 20170219e - security bump to address CVE-2017-{12583,12979,12980}. Fixes bug 627154 and bug 628482.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 www-apps/dokuwiki/Manifest                                            | 4 ++--
 .../dokuwiki/{dokuwiki-20160626b.ebuild => dokuwiki-20160626e.ebuild} | 2 +-
 .../dokuwiki/{dokuwiki-20170219b.ebuild => dokuwiki-20170219e.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index e88109f71ad..5b03db3d221 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,2 @@
-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
+DIST dokuwiki-2016-06-26e.tgz 3464178 SHA256 af63ccaa54b617a809d78642c7e83fe6581c545b869aab7440d63ab82b0120bd SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039 WHIRLPOOL 028c5ac4c72d0bc29d8d534133e61749683169f1f5a5ad4627fff8cf9bcd9bd5b4cb6e5ac845cd1572f9417fe2c23e2234d484c0920250ffacc830075abfa913
+DIST dokuwiki-2017-02-19e.tgz 3505643 SHA256 93172a28ab88107a8abac1e6a34fa6cef54b6e407cd03a8cc14d2a604a63e888 SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4 WHIRLPOOL b3eeee3bff1d1ea8bd62432dcd79480b929cdb4a86331aa0179690d6c7602ba8176d79c276316ea4a9b81a645e91e7739d2332dc23ccc249867328556f5540da

diff --git a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
similarity index 96%
rename from www-apps/dokuwiki/dokuwiki-20160626b.ebuild
rename to www-apps/dokuwiki/dokuwiki-20160626e.ebuild
index bc4d3d6cab9..d6e837cfd1c 100644
--- a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
@@ -10,7 +10,7 @@ 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://www.dokuwiki.org/DokuWiki"
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"

diff --git a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
similarity index 96%
rename from www-apps/dokuwiki/dokuwiki-20170219b.ebuild
rename to www-apps/dokuwiki/dokuwiki-20170219e.ebuild
index bc4d3d6cab9..d6e837cfd1c 100644
--- a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
@@ -10,7 +10,7 @@ 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://www.dokuwiki.org/DokuWiki"
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"

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

[Patrice Clement]

commit:     7af88ce5cd4f2d5a0215abb46cb5de213929fa8a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 21:06:01 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 21:06:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af88ce5

www-apps/dokuwiki: update HOMEPAGE.

Gentoo-Bug: https://bugs.gentoo.org/616656

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 www-apps/dokuwiki/dokuwiki-20160626b.ebuild | 2 +-
 www-apps/dokuwiki/dokuwiki-20170219b.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild b/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
index d6e837cfd1c..bc4d3d6cab9 100644
--- a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
@@ -10,7 +10,7 @@ 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"
+HOMEPAGE="https://www.dokuwiki.org/DokuWiki"
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"

diff --git a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild b/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
index d6e837cfd1c..bc4d3d6cab9 100644
--- a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
@@ -10,7 +10,7 @@ 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"
+HOMEPAGE="https://www.dokuwiki.org/DokuWiki"
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"

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

[Jorge Manuel B. S. Vicetto]

commit:     904fa363946f82f8e84d9e8a3aa8ef55d8d7f4dd
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 02:35:17 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 02:35:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904fa363

www-apps/dokuwiki: Drop old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-apps/dokuwiki/Manifest                     |  5 --
 www-apps/dokuwiki/dokuwiki-20140505e.ebuild    | 67 ----------------------
 www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild | 67 ----------------------
 www-apps/dokuwiki/dokuwiki-20150810.ebuild     | 67 ----------------------
 www-apps/dokuwiki/dokuwiki-20150810a.ebuild    | 77 --------------------------
 www-apps/dokuwiki/dokuwiki-20160626a.ebuild    | 77 --------------------------
 6 files changed, 360 deletions(-)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index dea1e783044..e88109f71ad 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,7 +1,2 @@
-DIST dokuwiki-2014-05-05e.tgz 3218289 SHA256 015b5e76427b97e584f195bab6652beaa80796f12f4a547ba9b6bc4e50387282 SHA512 b306be2378aed7119c9005fc9d0c8af4d89317eac19d633a992c6e37d9fb23e22493f25854e1803c892951ec995adf2a7689e04001666318614dd78813d0ffa4 WHIRLPOOL cb4823e7110fe83eea7d61fbf2937455b44a27805b849bc475ae5c9f74a4de353be283ebd8f2cf95a94df8ea395a2a34b9f2442e763a64c730401aee67347aa9
-DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a167486a676e9822fa17aab0a45b094794 SHA512 426c41c5d7c6484cc6d5757dbe8e0ac50bf1088406c5c58d975f19fde5f6cb0a0dafb5a27c9901335b1d65a34578f46ffabbd44eed4f5bbd59d6c3fed1c769e3 WHIRLPOOL 59ea72ab973dfc5119056bfccbd5adae9a2ac45b13dbe5971325ca6e1bc4db2e8213aac1d5aab8d699b43b0602dd4b635841e7279e9535c63ed3d80cc85b1007
-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-20140505e.ebuild b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
deleted file mode 100644
index 07a4c03afa4..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 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 .
-
-	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-20140929d-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
deleted file mode 100644
index 63678efc0c6..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 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 .
-
-	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-20150810.ebuild b/www-apps/dokuwiki/dokuwiki-20150810.ebuild
deleted file mode 100644
index a0b93e11317..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20150810.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 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 .
-
-	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-20150810a.ebuild b/www-apps/dokuwiki/dokuwiki-20150810a.ebuild
deleted file mode 100644
index 49cca1d19b4..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20150810a.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 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-20160626a.ebuild b/www-apps/dokuwiki/dokuwiki-20160626a.ebuild
deleted file mode 100644
index e66cedb9360..00000000000
--- a/www-apps/dokuwiki/dokuwiki-20160626a.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 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
-}

[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
+}

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

[Brian Evans]

commit:     f93123068d0a7ca6e56f2c954e646cfacc394366
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 13:15:43 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 13:15:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9312306

www-apps/dokuwiki: Drop old version

Remove last consumer of dead depend.php eclass

Package-Manager: portage-2.3.0

 www-apps/dokuwiki/dokuwiki-20140929d.ebuild | 68 -----------------------------
 1 file changed, 68 deletions(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
deleted file mode 100644
index 17559c8..0000000
--- a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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://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]
-	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
-}

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

[Jorge Manuel B. S. Vicetto]

commit:     582883a3818a70aab4ec01619d383615d8a91fb2
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 21:56:37 2016 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 21:58:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582883a3

www-apps/dokuwiki: Add "Elenor of Tsort" release with hotfix 20160626a.

Package-Manager: portage-2.3.0

 www-apps/dokuwiki/Manifest                  |  1 +
 www-apps/dokuwiki/dokuwiki-20160626a.ebuild | 78 +++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 4c03b1a..dba81b9 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,3 +2,4 @@ DIST dokuwiki-2014-05-05e.tgz 3218289 SHA256 015b5e76427b97e584f195bab6652beaa80
 DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a167486a676e9822fa17aab0a45b094794 SHA512 426c41c5d7c6484cc6d5757dbe8e0ac50bf1088406c5c58d975f19fde5f6cb0a0dafb5a27c9901335b1d65a34578f46ffabbd44eed4f5bbd59d6c3fed1c769e3 WHIRLPOOL 59ea72ab973dfc5119056bfccbd5adae9a2ac45b13dbe5971325ca6e1bc4db2e8213aac1d5aab8d699b43b0602dd4b635841e7279e9535c63ed3d80cc85b1007
 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

diff --git a/www-apps/dokuwiki/dokuwiki-20160626a.ebuild b/www-apps/dokuwiki/dokuwiki-20160626a.ebuild
new file mode 100644
index 0000000..ce5518b
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20160626a.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}

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

[Mikle Kolyada]

commit:     0214a6675ee7befd14b03398ddd1e01fd54901b9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 18:16:01 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 18:16:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0214a667

www-apps/dokuwiki: amd64/x86 stable wrt bug #552858

Package-Manager: portage-2.2.20.1

 www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
index 7a54790..306dc8e 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="gd"
 
 DEPEND=""

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

[Jorge Manuel B. S. Vicetto]

commit:     7b32662e98713b78eec468ca3e3f664527650dcf
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 20:50:23 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 20:50:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b32662e

Version bump - fixes bug 557944.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 www-apps/dokuwiki/Manifest                 |  1 +
 www-apps/dokuwiki/dokuwiki-20150810.ebuild | 68 ++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index 2a61112..d482c6e 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,3 @@
 DIST dokuwiki-2014-05-05e.tgz 3218289 SHA256 015b5e76427b97e584f195bab6652beaa80796f12f4a547ba9b6bc4e50387282 SHA512 b306be2378aed7119c9005fc9d0c8af4d89317eac19d633a992c6e37d9fb23e22493f25854e1803c892951ec995adf2a7689e04001666318614dd78813d0ffa4 WHIRLPOOL cb4823e7110fe83eea7d61fbf2937455b44a27805b849bc475ae5c9f74a4de353be283ebd8f2cf95a94df8ea395a2a34b9f2442e763a64c730401aee67347aa9
 DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a167486a676e9822fa17aab0a45b094794 SHA512 426c41c5d7c6484cc6d5757dbe8e0ac50bf1088406c5c58d975f19fde5f6cb0a0dafb5a27c9901335b1d65a34578f46ffabbd44eed4f5bbd59d6c3fed1c769e3 WHIRLPOOL 59ea72ab973dfc5119056bfccbd5adae9a2ac45b13dbe5971325ca6e1bc4db2e8213aac1d5aab8d699b43b0602dd4b635841e7279e9535c63ed3d80cc85b1007
+DIST dokuwiki-2015-08-10.tgz 3399960 SHA256 bdede4c71e95c1bd6a8daaa65e2ccfa8ef7372022504b9358f175df964f0a399 SHA512 745edc9ff60d2d145936693a4c66cecc4059c88c6a6fdfcce28cac0f74896f43c9156a11469902be34f278e2138c61a2ee5a8547994bd9163816c25429d8eb1b WHIRLPOOL 74b443432c9b30e4fcfe034a2898cec41ba2142775fe4ee1ae60def332aa572e04f8691914a329975a31d116fdb5e12af3b24d2552c7098ac20cc82c7d960603

diff --git a/www-apps/dokuwiki/dokuwiki-20150810.ebuild b/www-apps/dokuwiki/dokuwiki-20150810.ebuild
new file mode 100644
index 0000000..7a54790
--- /dev/null
+++ b/www-apps/dokuwiki/dokuwiki-20150810.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 .
+
+	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
+}