gentoo resync : 10.02.2020

3 files changed, 3 insertions, 78 deletions

diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 5ee5c9857971..f4358d306ccc 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
-EBUILD gtkmm-2.24.5.ebuild 1554 BLAKE2B c395fa1cad348276e8f8a91ab69442d940e8a3d69f51aeb42be574fd6933dbd3937b4436fb997e80b310a7131d7157181d8d924b15d8fc2d915e186228e6ff22 SHA512 8cbf63a4159bfe42f4ed6f8abeac9f843e3b774892725742960c0fc993415233e6a98fdc6e1cd5eb624393bbe0e956fb2c275bc760c50bc7f5e7a4faeef12146
-EBUILD gtkmm-3.24.1.ebuild 1846 BLAKE2B 9c5bc4bc488836226fbba384b054a495548e1a4eb7971ae94746626cde394b9dd75736db469a7aac0b43fd2b0498d23de9f4e127c82ab398c54d28b230adf5f9 SHA512 c922ab781853f00363056ee13b0db9add6478054e07c004cc6ce5d22263744d2c61e0bd64b356a3641a81002802d36bf5a729b98960713ead371441072d0eb48
+EBUILD gtkmm-2.24.5.ebuild 1555 BLAKE2B 17ad219b34da1a9188765f58cb8152f7f3136f01d45a2ee26f98ce66bcb2394a9512c85f692b78f44ba302ae56d80ce16b4ca94258cb227ce5cb73ac5618dfe0 SHA512 4de8d15de0fcd94fa3e8b9c98e641b215f28de3281013999c0694437240fa961036ba5320a21fc563b9c2b87695b627892785bf4881bec3631f1b9b167c90dbe
 EBUILD gtkmm-3.24.2.ebuild 1874 BLAKE2B be05332c336138b7834bfad9ab96db7c19851bbd1b480ff3d3c3450de13ac536861d68f793ea351fa1070186b26d069e99efc5ca852c222d1436eb90d7151282 SHA512 919abc6ef78a577830ac50f4fb929ab489c9fd52e3f3b080be40ba557f75a65ccb4ca941d5d4264054da17f78efa4f49e855d4a4a92d7e128482321e95660cec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index 40b8fe7867d4..719b4a6451a2 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
deleted file mode 100644
index ddafc05c9c0e..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	# don't waste time building examples
-	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r demos
-}