gentoo resync : 14.05.2020

3 files changed, 2 insertions, 70 deletions

diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index a36256aeb88e..7249874e2030 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,6 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 AUX gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1740 BLAKE2B 067357992e77226b3269f860641d691688e28901f45fb91b47df2d11fb73a8d45b007c06c988dc7405ce770bdad7079a33a8e38b8b59ad8763b97c7484b811b7 SHA512 a725be5f1511526be3274e653f6cd36ee3c430aaab0b0f787b0dda5157433a1a078749f39a570b9b7e89db2562bc1aca59e24f99c1f0768305afae57ddb59f5b
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1842 BLAKE2B f8e9abceab1c2c83ef521ce3541c8081effd76d8d5427f9075c89d5724ace3d3109e0c10b05d5cd46c87ed649b4f8501e26bce72e66380faa13ee4f5965429d5 SHA512 28945672b9973a45d6a65a81fc8eb3122dee31b6760969ddf8ca593bf34ed10c77ca108f955ff0d38771b38479003fc09d01b5c27241e7db9be1c776644d2e2f
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1841 BLAKE2B 76ca83ac619e2cfba39039f58e9a07b50a1aa2719677b702425f068974fa1ed65e9c02f15a83521a99a72c1bb16659f858e097baf10001ec80dac806a17ae956 SHA512 ce749e14a34553f7b42f17e0e4ff164c53c65db8cb2cdcec932e0a8f8e242cffa24ece15d72e357912ffdd3837b99567a725c02c63a116a36d4c4a32570f9142
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
deleted file mode 100644
index cd302aaeaf93..000000000000
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 multibuild python-r1
-
-DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
-	>=dev-libs/libxslt-1.1.8
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
-	app-text/scrollkeeper-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
-# dev-libs/glib needed for eautofoo, bug #255114.
-
-# If there is a need to reintroduce eautomake or eautoreconf, make sure
-# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
-
-src_prepare() {
-	# Stop build from relying on installed package
-	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
-
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed -e '/s+^#!.*python.*+#/d' \
-		-i xml2po/xml2po/Makefile.{am,in} || die
-
-	python_prepare() {
-		mkdir -p "${BUILD_DIR}"
-	}
-	python_foreach_impl python_prepare
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-	python_replicate_script "${ED}"/usr/bin/xml2po
-}
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index 4d8f4814fdfb..41e86c4e7136 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"