gentoo resync : 16.01.2021

10 files changed, 93 insertions, 110 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6a86eab1fd42..56f8b28f4031 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 68e0d79e546a..0705e36c11b2 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,6 +1,8 @@
 AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
 DIST baikal-0.8.0.zip 3282996 BLAKE2B 102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1 SHA512 8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
+DIST baikal-0.9.1.zip 2981404 BLAKE2B 65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d SHA512 28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70
 EBUILD baikal-0.7.2.ebuild 1611 BLAKE2B e16c29f176061b80ef1fc1860678e2c61e5be960c3a12f45feaf0d15a07fe35c58354435d5ff357743baa40e819d66ef776e3cc546574ac07a0268b703adad1a SHA512 37f44fc2e1f437c16271e6f4e60ed457515dc49bce7dd29c891198c7fabadf75e6cd7d9865f5801ab3b56758f141b7a72758a5b072ab7c855ff3cd9b145b93bb
 EBUILD baikal-0.8.0.ebuild 1611 BLAKE2B 5186ee750ffc63fc21320454002dc4900ca440dab419dd5f509c0ba2145810613b76d47acc08854b1a3592663d83c0737ce4bcc0a85c03138acc53ee6fe56bb0 SHA512 f62024469f004fb6b8874a4fe48badbf6ff043b4cb608c78ca02deb95e30840eb73219672e5ffbf32a6745518f1a1d8d44cf9e96abd43e55b7a3b767eec4700a
+EBUILD baikal-0.9.1.ebuild 1611 BLAKE2B 5186ee750ffc63fc21320454002dc4900ca440dab419dd5f509c0ba2145810613b76d47acc08854b1a3592663d83c0737ce4bcc0a85c03138acc53ee6fe56bb0 SHA512 f62024469f004fb6b8874a4fe48badbf6ff043b4cb608c78ca02deb95e30840eb73219672e5ffbf32a6745518f1a1d8d44cf9e96abd43e55b7a3b767eec4700a
 MISC metadata.xml 350 BLAKE2B 54198a366fda3ab711caceec25239a8402b5ba4bdb5cfb8fd29fd88442627c26101cbebdc6fd3175a2e716dcc64bf29fa85dc21022e6b3938b8a622aa8034056 SHA512 7f8682154f1e316f5f3be2ba4fe853793906abbb389a303ec7ef6ed14ff78b356a42b89e53e2f825670fafd96fc52ed69bcc3c9d6df130e2ff0b92515da0596f
diff --git a/www-apps/baikal/baikal-0.9.1.ebuild b/www-apps/baikal/baikal-0.9.1.ebuild
new file mode 100644
index 000000000000..bcc8eac313f6
--- /dev/null
+++ b/www-apps/baikal/baikal-0.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit webapp
+
+DESCRIPTION="Lightweight CalDAV+CardDAV server"
+HOMEPAGE="https://sabre.io/baikal/"
+SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc64"
+IUSE="+mysql sqlite"
+REQUIRED_USE="|| ( mysql sqlite )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+	mysql? ( virtual/mysql )
+	sqlite? ( dev-db/sqlite )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc *.md
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r html/* html/.htaccess Core vendor
+
+	einfo "Setting up container for configuration"
+	dodir /etc/${PN}
+
+	# setup config in /etc
+	# we are not allowed to use straight-forward absolute symlink :(
+	local root path htdocsdir=${MY_HTDOCSDIR%/}
+	while [[ -n ${htdocsdir} ]] ; do
+		root+="../"
+		htdocsdir=${htdocsdir%/*}
+		# trim duplicate slashes
+		while [[ ${htdocsdir} == */ ]] ; do
+			htdocsdir=${htdocsdir%/}
+		done
+	done
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config
+	dosym . "${MY_HTDOCSDIR}"/html
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
+	webapp_src_install
+
+	if has_version www-servers/apache ; then
+		fowners -R apache:apache /etc/${PN}
+	elif has_version www-servers/nginx ; then
+		fowners -R nginx:nginx /etc/${PN}
+	else
+		einfo "/etc/${PN} must be owned by the webserver user for baikal"
+	fi
+}
diff --git a/www-apps/cvsweb/Manifest b/www-apps/cvsweb/Manifest
index 4a588cd4277f..3de355420ef5 100644
--- a/www-apps/cvsweb/Manifest
+++ b/www-apps/cvsweb/Manifest
@@ -1,6 +1,6 @@
-AUX cvsweb-3.0.6-perl518.patch 791 BLAKE2B 01d515a4cca28acf9b07b062677106e8bf6774b84b31ff7324c61e1af00243963280a551b901932b158b1f512c40735fa752116f0b8a8e4811c3f10b3309b56c SHA512 9cdd1f92974dd35c70280913301050b6d2f0a6d37e19bd87834aefd78985469f508262f7e63d282d0ab98446dc4687626fd8b166a1c59a20e2098d23c45cf145
+AUX cvsweb-3.0.6-perl518.patch 754 BLAKE2B dbfd60d99a56793789bdc757fb2e0faea821889e7f2a7b105ff3c33d4d906ec31bd581c60834b1f3606c131f9b0f6649a4c29febb4b8227be9773329e2edc9ad SHA512 a0d84ba2fabc69a2c4c8194e03f1cf9e144c79eda41a4ce558a086289a7d439d3cde17b644b81de5e123786ced4e72dd4f5abc238e6b77b1ac75c0be37e32faa
 AUX postinstall-en.txt 35 BLAKE2B 82790471a9a0422424b6fce32d8faad7d99355ff99b55d74df8e114dfa67a4d4196b411e2dfca912297554cbc0783480096def2e2c6ab07176c6d4dd625bbf80 SHA512 ba2ac529a8b20dfbe9110559a33d80dbe2b846af99b49bb8602520084e24474ef89ea2dd309287455ca94f9d9332ac8f36b2b7a2082dfb063e46456f1d11ca74
 AUX reconfig 381 BLAKE2B 68ef63345f95c1b3a803d7aad5bbc2b3ea7bbc41c2babd68f2bba82003cf9fdd4fe811a43844ce72199041d77af0dc1a05f67bd45cdf23e20df364d5b07e0c0f SHA512 73883f035c7d82de255a9aad5cc58d20b614e70eec86d5b524783e28e34e60888a0215923fd956aa851a42be31a3eb27634ad5d693148722160b569ea73b749b
 DIST cvsweb-3.0.6.tar.gz 72484 BLAKE2B ae2a53fcc3618bb1375543a68d2a5866161a1d68b2b55f688f4d3357e7c7db4a37ca0f3d6f58c0955824a112006193108a227f7eaabe3851780c1f0450ae45f4 SHA512 32ac58bcb025746e4cc20bdc12d1bd915e2286a4093afebf8d60cb94a70ac614301f9b7f0a175458b14262a03d3d2eb8c29eabaf9127bef1aa6847905f331cc6
-EBUILD cvsweb-3.0.6-r1.ebuild 1004 BLAKE2B 75475db699f99e2f7f5d8cc1e542d8aabe218ea449733d1f38458ac57a843408a874359c72b97427253578c3839e1d25cbed3980696b76e722a605e30401a227 SHA512 63656f6df3cd65ebdc87a3896893de9dc945e145e17c8d74638d29dd21105e145eadd9e7b060a2b3e660e2b95d27387222c4d09d2db6a4c9667e290ce905d754
+EBUILD cvsweb-3.0.6-r2.ebuild 989 BLAKE2B bc732e29a73595852681b3e94e227b007db0a53683a54d773a4c8b65beb8dff9878cb4523df27d0d5bfdfcfaf30d1a4ff06dcf95451e4012104015dcda812015 SHA512 8bee108a3cdf7516efc0b181f8d1ec8c68b53264a7bef8d7d8ac52930cd79a8f146f65c4c0bb858ac66294f4c53e23879a078aca6b682b1da02ac8d7403effa6
 MISC metadata.xml 247 BLAKE2B 8814d4967475a272f825a4cc1a031f0d207e07f16911b3c06d3a1e6539ac5f8ecaea0c4b561c2e68d5a50e1402311a0ae90bbf3db4f10141316676d9c7ddb50e SHA512 e77693fadbc706e67d13a805b6f419a057e60416d6d598c26618d2b9bc6b5ebf8ad3106a7761d713a7e4b8e53c92b1ab75f721323b2ee01c8fe32ec1b3517b39
diff --git a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild b/www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
index 5f9861b07555..5bad03d5e545 100644
--- a/www-apps/cvsweb/cvsweb-3.0.6-r1.ebuild
+++ b/www-apps/cvsweb/cvsweb-3.0.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch webapp
+inherit webapp
 
 DESCRIPTION="WWW interface to a CVS tree"
 HOMEPAGE="http://www.freebsd.org/projects/cvsweb.html"
@@ -11,30 +11,31 @@ SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/${P}.tar.g
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8
-	>=dev-vcs/cvs-1.11
-	>=dev-vcs/rcs-5.7
-	>=dev-perl/URI-1.28
+RDEPEND="
+	>=app-text/enscript-1.6.3
+	>=dev-lang/perl-5.8
 	dev-perl/IPC-Run
 	dev-perl/MIME-Types
 	dev-perl/String-Ediff
+	>=dev-perl/URI-1.28
+	>=dev-vcs/cvs-1.11
 	>=dev-vcs/cvsgraph-1.4.0
-	>=app-text/enscript-1.6.3"
+	>=dev-vcs/rcs-5.7
+"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-perl518.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-perl518.patch
+)
 
 src_install() {
 	webapp_src_preinst
 
-	cp cvsweb.conf "${D}"/${MY_HOSTROOTDIR}
-	cp css/cvsweb.css "${D}"/${MY_HTDOCSDIR}
+	cp cvsweb.conf "${ED}"/${MY_HOSTROOTDIR} || die
+	cp css/cvsweb.css "${ED}"/${MY_HTDOCSDIR} || die
 	exeinto ${MY_CGIBINDIR}
 	doexe cvsweb.cgi
-	chmod +x "${D}"/${MY_CGIBINDIR}/cvsweb.cgi
+	fperms +x ${MY_CGIBINDIR}/cvsweb.cgi
 
 	dodoc README TODO NEWS ChangeLog
 
diff --git a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
index ba1195ae9160..288a67551d36 100644
--- a/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
+++ b/www-apps/cvsweb/files/cvsweb-3.0.6-perl518.patch
@@ -3,8 +3,8 @@ http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/cvsweb/patches/patch-cvsweb.cgi.d
 
 Fix warnings from newer perl versions
 
---- cvsweb.cgi.orig	2013-07-30 12:49:33.268655300 +0000
-+++ cvsweb.cgi
+--- a/cvsweb.cgi
++++ b/cvsweb.cgi
 @@ -1192,7 +1192,7 @@ EOF
  <legend>General options</legend>
  <input type="hidden" name="copt" value="1" />
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 17aa34074320..c12df0badec4 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,7 +1,5 @@
-DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
 DIST icingaweb2-2.9.4.tar.gz 12314780 BLAKE2B 3ecce619c27dc560b8da3155d008c3f3ab07b7ea0e6a66d0cbc3886becee8f1cf2f99e2cb7d79e2776be09b3bda82da2574d280dc26e41ea8d2ac568354c694a SHA512 77e446c9b48e9db7817fd6a46a6be9f57dfb21278066cce70f6c85d04f04200ec862c3c29c93d62fa3d0468973ddfc04eac5aa957677ec02d09eb13a3aee4265
 DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51 SHA512 1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb
-EBUILD icingaweb2-2.9.3-r2.ebuild 2471 BLAKE2B 7227d7ffbce7e968ef3d32d227dcf4647b2b93dc42bf2f0d2106dea11ef0a2545ca9f7263f2d355e54fe1f37f0c0f04ac90a8776a30605598c5c26ca27215c50 SHA512 85387719edf85adc983d9108434a5fa44abccfb13cda9dc95b32bd42151850b70f1f1c33ae7c08f10880d72e9c7ac187db98f054438addffd5e29e955e1c8892
 EBUILD icingaweb2-2.9.4.ebuild 2471 BLAKE2B 7227d7ffbce7e968ef3d32d227dcf4647b2b93dc42bf2f0d2106dea11ef0a2545ca9f7263f2d355e54fe1f37f0c0f04ac90a8776a30605598c5c26ca27215c50 SHA512 85387719edf85adc983d9108434a5fa44abccfb13cda9dc95b32bd42151850b70f1f1c33ae7c08f10880d72e9c7ac187db98f054438addffd5e29e955e1c8892
 EBUILD icingaweb2-2.9.5-r1.ebuild 2529 BLAKE2B 900d3d06dd84f1889d1d02a9ea4a56ea8f8a4c0d72877f8dab0e7f83958c44ffc25b7d1851516ce9a102b546739016463efcfe9d205a40e80167d5e45d429015 SHA512 3d7cc46c002f1c5ec6ae3c807a289e81a9ceb7ea7126a064707c37c9661e0271b052fbe37480103d84789f3128c7405c7c07b5053d5e7295d28124328448bfb9
 EBUILD icingaweb2-9999.ebuild 2531 BLAKE2B 3f5f8503d3157d485a7d20ee78f92d6cd1fb8948a7ae314a796e79c0379ab9b96fb7f57589fac9ad653cfad6eae4dfa04b67ec1064cad3e9bdd5915c8bebaaeb SHA512 564852d6c04c14e98870a205a72c1ab5d2c4e712b9a71bd84112fce7d44d5652835213375ef7e684dc752be05869cd91f6f3d32168bcdbf2c37c2b44ccbcdda8
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
deleted file mode 100644
index 977d8fee7bb4..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		dev-libs/icinga-php-library
-		dev-libs/icinga-php-thirdparty
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index 58021b4a7fa7..e7b7b79644bf 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,3 +1,3 @@
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
-EBUILD ikiwiki-3.20190228.ebuild 2117 BLAKE2B a44fcc2746c47223ee18c89428b50a1d8b7bee41e705f537267ecf0eb2629b69b52669d44dae84dab6bdf595fcf7525663cdb634259af54a3b19b2f4234f724c SHA512 d8c4303b053547ad028bd1ed25f471cfa0863bdda2b6edf4aa017c6d6c2ff9c34408b558ae99741fd9051bd519f2d0824f130fdd24ed0076e8d8f32011dd9d9e
+EBUILD ikiwiki-3.20190228-r1.ebuild 2108 BLAKE2B 5634027f87db3538cc3c30ae90742088b4c242667054a2477d928a2fc8ac8902be24e762d8505224e1937b000f40116585cac31d9808f71c940178173f0c9999 SHA512 aca669c3026721a23b6c032233c29d3360fc89cd505dd5d6b40625000ef02c1124e967a0e07511306dd13848889552a5c1c3c1cda52268bda05113aef343e3ce
 MISC metadata.xml 337 BLAKE2B 90919956091ccd1b49952c6347f69e508524cf3753d272f862e1a4fc6cf90296963ef2f680282b60039acdbc737ac9c838c5c75e3dcbb5ff91df28de691cf299 SHA512 388d9044e3eee83881c65fc0faada9bfbeca79d94a3160d87d28e9a1b5b5084b6f2e20a23764bb39b12efb2dd8cddd216a6ae4bae30e7d45caa4bdf8c64b21d0
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild
index e7f335283b1d..b1c05c833233 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit perl-module
 
 DESCRIPTION="A wiki compiler"
 HOMEPAGE="http://ikiwiki.info/"
 SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
+S="${WORKDIR}/IkiWiki-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~x86"
 IUSE="extras minimal test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~x86"
-
-S=${WORKDIR}/IkiWiki-${PV}
 
 #Authen::Passphrase
 #Search::Xapian
@@ -81,12 +80,13 @@ RDEPEND="${DEPEND}
 	)
 "
 
-DEPEND="${DEPEND}
-	test? ( ${TEST_DEPEND} )"
+BDEPEND="test? ( ${TEST_DEPEND} )"
 
 SRC_TEST=do
 
 src_prepare() {
+	default
+
 	#bug 498444 /usr/lib/plan9/lib/fortunes.index
 	addpredict "/usr/lib/plan9/lib/fortunes"
 
@@ -106,6 +106,6 @@ src_install() {
 
 	#insinto /usr/share/doc/${PF}/examples
 	#doins -r doc/examples/*
-	dohtml -r -A setup html/*
+	dodoc -r html/.
 	dodoc debian/{NEWS,changelog}
 }