gentoo resync : 22.01.2019

3 files changed, 2 insertions, 49 deletions

diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 4ed38a323131..456259c5b917 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,3 @@
-DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
-EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
-EBUILD gcab-0.8.ebuild 925 BLAKE2B c75fd9d6e4983af3fceefda6b58e9b67f51836cc5794ba7dbbccaed9bf7b9e87193357ce22f59bf8020c10b80c6d126c9ec538d5445e5589f3d0aceb5f9e7d54 SHA512 b5e6a123fa608b3c70ff45c1538cb0912cf82e1c69a26cdc23482de99fc5d68945bd04745e7aebd2db6205d8089758d7d194e5928036497975d07ed47b4a1d7d
+EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.7.ebuild b/app-arch/gcab/gcab-0.7.ebuild
deleted file mode 100644
index a14c0902d34b..000000000000
--- a/app-arch/gcab/gcab-0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
-HOMEPAGE="https://wiki.gnome.org/msitools"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
-
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.22:2
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use vala || myconf="VAPIGEN=no"
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		${myconf}
-}
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index c39c71ed870d..0d924ce135e1 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"