gentoo resync : 28.04.2021

3 files changed, 2 insertions, 55 deletions

diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index de3233fb1a14..0e58491f8ff1 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,6 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.36.0.tar.xz 447760 BLAKE2B c61098362c57c3de879170d3104472b0a7f3c16da163c5d740d7a42bd545cfdaecd96804108834d5b7de5028e847f9b0557f015d08f50f9459a896f1d5f84431 SHA512 b7bf5d935327f61634a898594cf20a270e1b403c8df6c74e6ac20e22eea2845ac8c3007b31994728b74953e40c1015373efe10ed64243cf5e85fd210654aecb3
-EBUILD libwnck-2.31.0-r1.ebuild 1216 BLAKE2B db9fba5c6f3eb5538aff34d97a1f673282683aa448dd88235d7efd33dfbf5cd9bc540ef43686fe6950b32838cb60114bcaad6d23820d9301d9dc53799d011608 SHA512 cc21b1e6ecb2da2f39db746d74fc00bd6757719e6838feadb3dbc28867e72473f49d6fec7d1f42601200911ae8234e1fe55f7bf0b95134c0e3409c558bacffdd
-EBUILD libwnck-2.31.0.ebuild 1242 BLAKE2B 4b13be2134e6b35b103afd00e3cca1acdacad4e9fe3f6b75a2e8cc89a81cf4b037367f43fe83689fa57f10a3a499173e74c68ab8bb3896a33b0ed1ec9445404b SHA512 eb2f6a1578a5352318edafc8a78c7317d1b9dbbdab6b0d337d3060e6964e199bbad76e57f144f6528815fd232a0f321395c08dd008c86d99ebf1c2568255ece9
+EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
 EBUILD libwnck-3.36.0.ebuild 1416 BLAKE2B 6ad29b8a650baedfda842e20f6ad28cc45f147d80c606f1c6b26d01a428a9dc62371d170cfa144e4e0aba1c9b519658f2eefe9dd6ef94de5781ca07eebe7ac21 SHA512 5ab1e243442bb061ed4dcbc72706ec8683247b8fb29e5ec3740173c80b235bcfb725654eabfcaf3630c1356960406e603aebb1434a7c282b36af0e4e0f9d42ee
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
index 392f0d732dea..2ed5aa52ec25 100644
--- a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
deleted file mode 100644
index ab2c6fe9871b..000000000000
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="LGPL-2+"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection startup-notification"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.19.7:2[introspection?]
-	>=dev-libs/glib-2.16:2
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXext
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs
-#	gnome-base/gnome-common
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Regenerate pregenerated marshalers for <glib-2.31 compatibility
-	rm -v libwnck/wnck-marshal.{c,h} || die "rm failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}