gentoo resync : 25.04.2020

3 files changed, 2 insertions, 47 deletions

diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 2f280e3a5984..17e9740ac03d 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,5 +1,4 @@
 AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0-r2.ebuild 1025 BLAKE2B f53539269fa4f4eceeb3c4a2c32ac356e0a705642d57ca1c1672f38c5f20df48105b386d96ca09d77fa5437aa65f556b7c2846e3110c7ac9201183491ba3d2d0 SHA512 7846bc309a48102b4307a4dad27860e26541cc4e855fcd5eb3678c30dd31cb65b32bea4650b8b17139065cad3049ff51faab562c9681de43c8b1b5ee492915f1
-EBUILD gtkhtml-4.10.0.ebuild 978 BLAKE2B 525230be17cb4bda227415152e83c22ee462dd7748ba5030522355994f7d357c6c942ebf92f0787317346d42496a6ddce497e9a82bbeed0b8792ecd151611a73 SHA512 cab7c98ee05f11b864441e976ad47f8af21cc6ab5a33c245b8da79474b6bf943d1212a0302ecc51fb323361305ccb9ce43145a28c997777fbf9787b6c0576cc8
+EBUILD gtkhtml-4.10.0-r2.ebuild 1023 BLAKE2B 18424c1ded44652be1d7e154a3b141a4c29ad48fa3a33d7e2d3a11d4db05e286f6ecbf4b79ec771007c44595cc48b7b0e4335377e49810a27c02a903997f98af SHA512 0b1a8cd61d860de06ea350b12b23ce068f9c3131b2d10f08d2bf04412c6bbef3917dfd448c2fad252dbf4cbbfe32401a0120d8017f07cc800e498bfe315a986b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
index 57d3fb7bf343..b77e196585f2 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
deleted file mode 100644
index e83b54fcb0e7..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/cairo-1.10:=
-	x11-libs/pango
-	>=app-text/enchant-1.1.7:0
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-devel/gettext
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}