gentoo resync : 14.05.2020

3 files changed, 2 insertions, 54 deletions

diff --git a/net-vpn/networkmanager-vpnc/Manifest b/net-vpn/networkmanager-vpnc/Manifest
index 28642dd764d4..185bf8b88b0e 100644
--- a/net-vpn/networkmanager-vpnc/Manifest
+++ b/net-vpn/networkmanager-vpnc/Manifest
@@ -1,4 +1,3 @@
 DIST NetworkManager-vpnc-1.2.6.tar.xz 417412 BLAKE2B 00072e2f5449687a55ff4dc0382c4ef2bb2042f9b2a4437d1d6790084ff1b88210e45909808048498f315d59ed5408630ae15d09a1d22e4acbf840554e452546 SHA512 4f8adf58d73cef74a950d822c6f17cd813a1e74fcd3c0391f847541c279e448a6353b83984d593fe5e11138a37b7f1c21b9a24a6843c1d35e4cb68bc29bc3eb1
-EBUILD networkmanager-vpnc-1.2.6-r1.ebuild 1128 BLAKE2B afc2a37cf8dd4d4c0064da45ed4cba3b88d63b22c1f153f577104e8a53018dd2f70c38a600cc6b87edb389dc8d9ca455b74def05dcfdc1770fac4f46807f1710 SHA512 5d2ee7a297c4c327e3a6b7c2344b951caa15727dc299b1870bfbac741a9fab53aba211a04b0a74aa9d91e38ab9d950d4cf4bdb82de161b0f44a51e1a9b2360d9
-EBUILD networkmanager-vpnc-1.2.6-r2.ebuild 1111 BLAKE2B ea495819c5873223aad927bb20a5ec025c71ce4d34e4acd939041dcb3f3afd41181cfd992993cb761f03caa57659d9fa1e237cfc189b44038876b509612ebd53 SHA512 b3eb4983d4cd41caf08a5402c6a180ecf94f0b3c1cf8da3ca935b90aad84932d43752062fb2be122d4faad83dea8ec4c2ce343a5dbd67649235eec708e45a1c4
+EBUILD networkmanager-vpnc-1.2.6-r2.ebuild 1110 BLAKE2B 2eca31a7e7539ca8a000c3c2a256c23d106c66d8d68376839c48a7a632c423bcd1c9063910c76c384c811a75328adfccd26f5fb8f32dfb4aa381076767a750a7 SHA512 a655427ecdec2dd22965368e9ff5a1c471c193b713d9129794bda3caabaf723f894b596536fd21d49fea84d2ca7c21d8e74ab3b6fc1b18fb500ef7306e1dc2dc
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
deleted file mode 100644
index 1fe48859e722..000000000000
--- a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2.0:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-vpn/vpnc-0.5.3_p550
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		<net-misc/networkmanager-1.19
-		>=gnome-extra/nm-applet-1.2.0[gtk]
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# https://bugzilla.gnome.org/show_bug.cgi?id=742708
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
index bc252ba5f8d5..0c2c68f02749 100644
--- a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"