gentoo resync : 02.08.2019

7 files changed, 7 insertions, 64 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0af66e15a87b..78fbaf079730 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-libreswan/Manifest b/net-vpn/networkmanager-libreswan/Manifest
index a17ab7c5afa8..d2b10fdcc604 100644
--- a/net-vpn/networkmanager-libreswan/Manifest
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-libreswan-1.2.10.tar.xz 388552 BLAKE2B c7172ab8e9f967eb69a20b329d7d9f6d8beca8e809f5d6b74a3bbdace553ce47ed99dc09f7655c61a399a01a52073bdedf86d4405227049870530fff68991870 SHA512 90eef90e0ecbe8b8e7b927b49e996b042231ea25495f46b2413dd11a597f170f23668d0a3900f82c84e377dacc15f7589a48b5f28c7d6ee3580b7bbd8f61060d
-DIST NetworkManager-libreswan-1.2.6.tar.xz 348312 BLAKE2B e27180b94807db3bab7d41502674fb9e950fc8eb79447a901f2c69f9fdbbf99032e007cb1e631ef5f8eec5dbed40e74f1e0eadecef7fdfc3b618500447a3a9a8 SHA512 385b7e7cfc0720be1eae0a3c7e080efd17eb6f243d069ba881b97c9638fc3bb951b3c8f1c9b44422fe81a2dc9fc85b675f977284111aeaa6304ad31750f62798
+DIST NetworkManager-libreswan-1.2.12.tar.xz 397132 BLAKE2B 2ffe269e0898954d37c417df9779ff8e4e673e6b27232119b5414ed962e49d23053df1a73183366c4d47cc2da3032a59d7cbd89494f109a7c1a726f8e974304d SHA512 11cc8c2193959ec722e960825e34f246af3a1f93126bc916c122de6fe8d3194910a65b0884483134be1f4416fa072c9c7086f82e2f95b6f0a034ef409f7ca711
 EBUILD networkmanager-libreswan-1.2.10.ebuild 857 BLAKE2B 0702b86e209df2bbad2686bc7fa0e4f075c2007a3f494771b8c01c6b4c9b412910a50756f99e53a4c8500099943ce1df2d08c0591492c5c1c6a679b59a37795c SHA512 feadc141041376082e2a9d7ab588d576b408812f572288149c31d0547d05169b3a22cfe9cee032fb1ddad959bf236c7e0e318bda5523383d11ab07b6d4fa6540
-EBUILD networkmanager-libreswan-1.2.6.ebuild 837 BLAKE2B d6683af55cc293b35cd492e6862b8958243b106b9e0d8742be124134b9e83251448dd9b74afc486cef1bc88df3026e4569e3c6fa089653586f0c4be6da7c4269 SHA512 5c046e22b2c49e4dac512de88f8dab8c578145865763bd6f5f3cb31c94d68ea28ddadffb5307624b2b193b9e0b36d33a191b5f057944706197dc9cd9f63784d0
+EBUILD networkmanager-libreswan-1.2.12.ebuild 859 BLAKE2B c382b8614670a92710fe315bf81d12b9eae3a04d8bec6cc2afbcd3a920ac48d42e7ebd0d9c718467a47d38e60ddfe62e0eebec59bca96ea5c8ddacd6e9336597 SHA512 fb03b01a77f0894fc7b711c75528709767970836e5bec4fbe15770f568d0fb9d2e9aa75108d645921760bfa66899aed94d22008ce831b2c0bdd57abff2fdf01f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.12.ebuild
index 003f0f98b87a..afd895a544aa 100644
--- a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.6.ebuild
+++ b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
@@ -37,6 +37,7 @@ src_configure() {
 		--disable-more-warnings
 		--disable-static
 		--with-dist-version=Gentoo
+		--without-libnm-glib
 		$(use_with gtk gnome)
 	)
 	gnome2_src_configure "${myconf[@]}"
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index a3d09f15ecc7..a4d6b7063415 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,3 @@
 DIST NetworkManager-openvpn-1.8.10.tar.xz 564540 BLAKE2B e117395b91efbd0ee10bdefe0aaff8a39fdd1fe232dc1543224be7dfd9bb18729ad873091301e6348f8955f28579e106f5565c7138309571e06598aa35dc5bba SHA512 f710848fccf21ac4554a2b46e80cf890c011edc6d64d9a49d6d8669f3ff71f7990e11e6f4681bb85d30238ec05f2fc79c4619983f6860c6ab0d714f941a3dfcc
-DIST NetworkManager-openvpn-1.8.8.tar.xz 562748 BLAKE2B 8c75d30a8865d41cd564e719f08522482b0d6901a8e812dec5f5b9fd8c8c2839663d078148e9d505ee7b7fc6e5c96fda8c3c0a0390837211a1fe9689f01fd27d SHA512 8ed7612bcf727b540a74807ccc7ea7460dba3923a052e8716338bf2c852b6c027fd7547793af1b032a3c2348f9ffc579d1071aad2833baa37784bb5a17af1574
 EBUILD networkmanager-openvpn-1.8.10.ebuild 1256 BLAKE2B 54e4eaaa338447364b6dc56a85d4e37894329f5e401580d3292663626c00a828aa2214d2228ab41dbafd5a3f49159a52871164a2e4ecb7998b5c66985eaa74c3 SHA512 d02142ca90283dcac35f7a88c4a894d9952343953d194b434aaab699b8c16b69116f7ac3eebe4b781cf042f0b2c66a5647ab4d3606ad2f9d1be2456f06156fdd
-EBUILD networkmanager-openvpn-1.8.8.ebuild 1256 BLAKE2B edd6d769382e025e7d94e15fb8ea95914b8876147579535dca3734f78789072b0ad9003b6129a92940f06ef3656aa62fa986cbf83b5804ac91b667d38bedde06 SHA512 8cb666f9966fdc926aed39483f3ae052dcb6151f2bbdb6861c4ac56804a1733b355ab2f73e9ba175129c0223324d5cd7a2471e70345bc83455513597ae5161aa
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
deleted file mode 100644
index 572c134026e6..000000000000
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2 user
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.7.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	enewgroup nm-openvpn
-	enewuser nm-openvpn -1 -1 -1 nm-openvpn
-}
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 541556e7b362..05839815d44e 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,7 +5,7 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.1.3-alpha.tar.gz 7369258 BLAKE2B b06a9fefe592680f715856daec59746b13da2d19e9261bc970c554ff97dc2718bf32cb17afd6e343e92b7750a058e2c6ef7ae9c6c130c87d0c4f22f84fd1457b SHA512 9f3c79ec4c1dbbdf704048f4488f5eb3de44d888ec9da5d6cfa7d36867c9e28b12c65bdbbb184b2c334ff176b345f18b4cd1caddb917ac67996dd53749730f75
+DIST tor-0.4.1.4-rc.tar.gz 7369948 BLAKE2B 336886c45701f3e7a783284000c601d6642a6b866d0cc9ffd66da0876871dc7fbe893edda5e08f059366a7ab21b30e493cf19bd49d9812ce3d06cc7e2d85d190 SHA512 851809c5ff80beea8bf4432d702bcb6ce9ffe0b3d137c3c11386f1e4c771140d218d4ed2dc5c3c4994091c13a2e28f85ce125c1b68fe606d16e4e1f5a259937b
 EBUILD tor-0.4.0.5.ebuild 2232 BLAKE2B fed112e92aa7b11f4646ea94db9fea5ef81a80dd57a4b95990d906142991ee8f4b900601a011246ff6e707069c255555195041929c97e753d16a16bc8d820719 SHA512 44a4958239f006307178121e4cb49f79ca2063561dc593af840456895eaa4f7d272592a1a3658645b29fe9e82a71e73a731eccbc7cab0ebbbfe37b41068f1c1b
-EBUILD tor-0.4.1.3_alpha.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
+EBUILD tor-0.4.1.4_rc.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.1.3_alpha.ebuild b/net-vpn/tor/tor-0.4.1.4_rc.ebuild
index 5260bac68c8c..5260bac68c8c 100644
--- a/net-vpn/tor/tor-0.4.1.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.1.4_rc.ebuild