gentoo resync : 25.08.2020

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index abb00bcbf83c..a3deb7e1093e 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
-EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B ace0d550c2ebb0ff35b80242ba3dba196f0b0045d04b1584ca2b9832da02bf2c7c34d57cb82d98815ae1442824de9f8a9fda030f4826a2753264e498a3ad48cb SHA512 b43e74b4da2f9fc31ae02c117e1fba1d8d9ef809888a37a5b1d7d193009862d5b39ad5735d9ca8283ae7bf5e8258eb1c67ddb44b05bc216cc03ba4d8e752e97b
-EBUILD gtk-doc-am-1.32.ebuild 846 BLAKE2B 1c217bf21995fdd7bcda8e14ec2bcb4bf472b88b3021726e748df2515257e996a574125d7c98f82c41b91120d24a0d32fea17dfd83ff0ee9789f6d5fc48382c6 SHA512 b99e520e7e1573f70e678ff6ec8bf3825774edb8d091a8a7de28c7875d53e7c293cdbb7ecb978385efd7642db4a927cd83e5a32c9e2db303fecd590dd6a43092
+EBUILD gtk-doc-am-1.32.ebuild 845 BLAKE2B 044ea059ea4f541aec142d17fc65f30d6ed83fc3bceed2ad2025c02585d0e7f49787a78275ccdb3a90f3f067b71685e8e8717564cbc948d1a0213b9157f0d002 SHA512 734909caf4c8da99c292462b4360a14bb5af0665388465483f9619ebe79de3050f2e6ed0b12272be3e80b6ce2f6b300d9796804ba3143cfee37f5777f0120491
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
deleted file mode 100644
index d57b9d54a37f..000000000000
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk-doc"
-
-inherit gnome.org
-
-DESCRIPTION="Automake files from gtk-doc"
-HOMEPAGE="https://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-lang/perl-5.18"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
-"
-# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
-RESTRICT="test"
-
-src_configure() {
-	# Duplicate autoconf checks so we don't have to call configure
-	local PERL=$(type -P perl)
-
-	test -n "${PERL}" || die "Perl not found!"
-	"${PERL}" -e "require v5.18.0" || die "perl >= 5.18.0 is required for gtk-doc"
-
-	# Replicate AC_SUBST
-	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
-		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin gtkdoc-rebase
-
-	insinto /usr/share/aclocal
-	doins gtk-doc.m4
-}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 4c848dbeb476..10c4538abc8a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND="${RDEPEND}