3 files changed, 12 insertions, 123 deletions
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index e7dd8eb2dda5..0e456bb149e5 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,6 +1,5 @@
-DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 DIST ikiwiki_3.20200202.3.orig.tar.xz 2689636 BLAKE2B 2b88691591e72dc7d55ace2860ce6faf0bd62fde119bbab9c8db7d55dda384b84a51b562aeb9397457fcfb8cd405cd327380e418f8a65debf1e311942c05c222 SHA512 a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
-EBUILD ikiwiki-3.20190228-r1.ebuild 2114 BLAKE2B 52beda8293f45105a4368dd8fe8af68d3901b7da990c10b341de47df730032009f2b728b4067f7ceab791e8ef5e7a51e429c9041e53a9deb46f9c4204342f80c SHA512 87ed038729411d1c75911a4d97a833ad80c0b0b635707862b575eeda715e1ef565ba8866c7bba9c60fe65ff24f8fd0424af9f939c9c9d476e9392279b95dbbb1
+DIST ikiwiki_3.20200202.4.orig.tar.xz 2733060 BLAKE2B 9a4f1d6c8596f1bc4eee9a6590b4515e82af34939624c6e63560bf95cbaa45083c992d7a708027912459ac2a90a811b4134175a802ff753ed2d5c42e1c65b223 SHA512 2ed7084a0e4eee3360aca23be24ed1ba0b7d52d1c716379442ded67a408de3b628cd92d1112fc0b277f24c7fe5a9cd35f4b20924427f79afb1e631a98f0e0fab
 EBUILD ikiwiki-3.20200202.3-r1.ebuild 2183 BLAKE2B 988290c99b15f39cc9315f3b900cc750d5048ba2f3a52c064396b84307dde636b49f07eedb18cfa041d7059f8d74e9a865c9be243a5521548b122b1aa5b97d24 SHA512 dae06db3d4861311dc8e715703cd606652d83f99febf6a5717aef9e65a30af094bbc1fc7e6e36ed187cf7638fc651f17ecdb0e4b9e1b8d1411f613720acfe75d
-EBUILD ikiwiki-3.20200202.3.ebuild 2127 BLAKE2B 1a981093f3ab37e0b50376233ece145804140ee72504896c82c3269a6b4d5abf3743c453f68a6baa287e79b52888af4903862ef2dac245798d7e3ecefd509a72 SHA512 4ece2a1e145cfc61d2e10592109e7277ddbd12edc6e00ef8a2c5c023b41db5025b5b5d252c5094b3d4eb50d80ff059c13f1181f4198a6a2fc2900243eb1da8bf
+EBUILD ikiwiki-3.20200202.4.ebuild 2204 BLAKE2B 87f9cf98b2bed3f8952c41aa8b17fa5a1c42014e0f0f998d1096fb65f16e49dfdd722c42671a9256ef0ac988fbbec4fcc244d3f4ee58fd24ebab2ebc50a8230c SHA512 e2d9c5eb2313b360854086d92ecea0e642c77a3f012fe08630f1f12e59629da9c5261d2a24ff3d05c9cf8303b8fe3d6907b86f1bc2b02750c8322e9a2aa0ae83
 MISC metadata.xml 260 BLAKE2B 912094efbdb14e53fb606a8d85604fe8963d5c40162db26cbb43b8d18091d28a0d543d64edc7e300755b10e0fdada949901ca5df997a90ffe5be7f4717507855 SHA512 7ad3a45f173d9755b2b0faa91a3f35d110fae001d94f21b3e403a4933e14d385f2e8b1db9ad30dae6a5b282ca1b82028cebd3605ca3ab5cb4a06cf8059512cc8
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild
deleted file mode 100644
index c50a939e4cee..000000000000
--- a/www-apps/ikiwiki/ikiwiki-3.20190228-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_TEST="do"
-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 )"
-
-#Authen::Passphrase
-#Search::Xapian
-#Locale::gettext
-#Crypt::SSLeay
-#Text::CSV
-#Text::Typography
-#Text::Textile
-#Text::WikiFormat
-#Net::Amazon::S3
-
-EXTRA_RDEPEND="
-	dev-python/docutils
-	dev-perl/Digest-SHA1
-	dev-perl/File-MimeInfo
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/LWPx-ParanoidAgent
-	dev-perl/Net-OpenID-Consumer
-"
-
-SUGGESTED_RDEPEND="
-	dev-perl/CGI
-	>=dev-perl/CGI-FormBuilder-3.0202
-	>=dev-perl/CGI-Session-4.14
-	dev-perl/Mail-Sendmail
-	dev-perl/Term-ReadLine-Gnu
-	dev-perl/XML-Simple
-	media-gfx/imagemagick[perl]
-"
-
-TEST_DEPEND="
-	dev-perl/File-chdir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-MimeInfo
-	dev-perl/HTML-LinkExtractor
-	dev-perl/HTML-Tree
-	dev-perl/Net-OpenID-Consumer
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/XML-Twig
-	dev-vcs/cvs[server]
-	dev-vcs/cvsps"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	app-text/po4a
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Scrubber
-	dev-perl/HTML-Template
-	dev-perl/URI
-	dev-perl/Text-Markdown
-	dev-perl/TimeDate
-	dev-perl/YAML-LibYAML
-"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		${SUGGESTED_RDEPEND}
-		extras? (
-			${EXTRA_RDEPEND}
-		)
-	)
-"
-
-BDEPEND="test? ( ${TEST_DEPEND} )"
-
-src_prepare() {
-	default
-
-	#bug 498444 /usr/lib/plan9/lib/fortunes.index
-	addpredict "/usr/lib/plan9/lib/fortunes"
-
-	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
-		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
-#	if use w3m ; then
-		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
-#	else
-#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" pure_install
-	insinto /etc/ikiwiki
-	doins wikilist
-
-	#dodoc -r doc/examples
-	#docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r html/.
-	dodoc debian/{NEWS,changelog}
-}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild b/www-apps/ikiwiki/ikiwiki-3.20200202.4.ebuild
index 4fbd6a7663dd..fade9ff58556 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20200202.3.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20200202.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,13 +7,13 @@ DIST_TEST="do"
 inherit perl-module
 
 DESCRIPTION="A wiki compiler"
-HOMEPAGE="http://ikiwiki.info/"
+HOMEPAGE="https://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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="extras minimal test"
 RESTRICT="!test? ( test )"
 
@@ -44,7 +44,10 @@ SUGGESTED_RDEPEND="
 	dev-perl/Mail-Sendmail
 	dev-perl/Term-ReadLine-Gnu
 	dev-perl/XML-Simple
-	media-gfx/imagemagick[perl]
+	|| (
+		media-gfx/imagemagick[perl]
+		media-gfx/graphicsmagick[perl]
+	)
 "
 
 TEST_DEPEND="
@@ -71,17 +74,14 @@ DEPEND="
 	dev-perl/TimeDate
 	dev-perl/YAML-LibYAML
 "
-
 RDEPEND="${DEPEND}
 	!minimal? (
 		${SUGGESTED_RDEPEND}
-		extras? (
-			${EXTRA_RDEPEND}
-		)
+		extras? ( ${EXTRA_RDEPEND} )
 	)
 "
-
-BDEPEND="test? ( ${TEST_DEPEND} )"
+BDEPEND="app-text/ghostscript-gpl
+	test? ( ${TEST_DEPEND} )"
 
 src_prepare() {
 	default