Drop old, gnome team will take this

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

19 files changed, 54 insertions, 287 deletions

diff --git a/net-misc/networkmanager-openconnect/ChangeLog b/net-misc/networkmanager-openconnect/ChangeLog
index 1f55868f18f9..c105a1808738 100644
--- a/net-misc/networkmanager-openconnect/ChangeLog
+++ b/net-misc/networkmanager-openconnect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager-openconnect
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.17 2013/06/10 09:34:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/ChangeLog,v 1.18 2013/06/16 11:44:04 pacho Exp $
+
+  16 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  -networkmanager-openconnect-0.9.8.0.ebuild, metadata.xml:
+  Drop old, gnome team will take this
 
 *networkmanager-openconnect-0.9.8.2 (10 Jun 2013)
 
diff --git a/net-misc/networkmanager-openconnect/Manifest b/net-misc/networkmanager-openconnect/Manifest
index 2a88926c549b..6ce738da9845 100644
--- a/net-misc/networkmanager-openconnect/Manifest
+++ b/net-misc/networkmanager-openconnect/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST NetworkManager-openconnect-0.9.6.2.tar.xz 319652 SHA256 3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0 SHA512 e9ffc20584738507589ac22f6ceb9315495664ff341a6a95e4126383915d04658990d19e7c4bd82cf7838f01ff89a55f3556921b44b5ba8074acef0be9d990ce WHIRLPOOL 6cb65f73ed5a9cd3c7fcf850f51f0cf1d0f25ad0e0c032107787ea33665b0da8f7af5f782846935c5617a6fd4673008998d8edb890ee2b9c013c85cc999a12d5
-DIST NetworkManager-openconnect-0.9.8.0.tar.xz 391984 SHA256 c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b SHA512 fabf04699ea003ca32e9d192fdcd58885704850980a0d65237b6353fad36022ebfbdd26ba66c394c2313ce1cc202ae69cecee9913844820fc352ea328f5ef7db WHIRLPOOL f0e077318dc07f000e89494b62895de4ad4b7d03f9185ef4daf5a40d96ba7ef4a6c42fe5723c63a0e417e37041ce1e9288afec5c554c58bef445f6a9aca8f466
 DIST NetworkManager-openconnect-0.9.8.2.tar.xz 393908 SHA256 8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb SHA512 d444d19d68124e10c5303327ac996b6e13900c99c511ae4f276e81113b23f5baf5e89d2bbd7dde503ddb88ac2276d2f45467aec18697a3966b16af30981a3a5f WHIRLPOOL 243a5240c3cb6035c2b9e5614fa36ffebd69f519760c66373dec2c0de726382edd6dec028ba5b3acc836d5fce4c1245eff63512ce13cafc9e7e70bebc87c3348
 EBUILD networkmanager-openconnect-0.9.6.2.ebuild 1219 SHA256 98006ea9469270ae0c21a91983a7a5b451dc355c5c49981e5e6bda0c238e0959 SHA512 37263c9b0e190135148d4d2a5b3c2a080d9287e042b799b5269c4d3736d68c8d2ba0468540df99a9fb1aa0c6ff104b7b1d87fbc3efd7132c461acdac5e714cdd WHIRLPOOL 9fa0a63fdc45b72de0cb399dc5bcc5de7b72d94b82f338c5234c29bc819acc3bbc9de48cc1e98dfa8642b486a623b9b6a34f8f3b6a76da5856d6abd7780ff87c
-EBUILD networkmanager-openconnect-0.9.8.0.ebuild 1210 SHA256 041b3016c85197615f15cddebd013bf36024a275e9fe52ee80589bb80ecbf863 SHA512 954931febcb06e68a26bed005815b9b54abb40d362e2b6ecc2e6911ead0301b6ee3816ed14bc006166c9689258338770f378f9e371641024f07765b7e9000557 WHIRLPOOL 6b44d74f3c5452f279c498c264ee9ed8c384e3a4981e5a65a6ba6ecb3ac64567bb9fd1c8a08eb23ba64d5e5715edc06a4ee8ef5895c16008520873a163753177
 EBUILD networkmanager-openconnect-0.9.8.2.ebuild 1211 SHA256 185688ad0fdfc3b85e354581aa068926e7bbd06928cbd07cb6fb89dbed685e2c SHA512 90b6fdafaf9406a97bcdf08e1f0c475f1b39c4f6ba79996687810e78644825871f3de09788a22e002771563743d162fcc56f23627ea757bcd410a2643b060cbd WHIRLPOOL 8f0ee4ac80d88c2b6226e0689e4cf934440b15b3ce4aa3dc01d11be4febfde65ccc0cd366d0fe314800418bade8c644ac8189ce2175638f0b7cefb45f2176f0d
-MISC ChangeLog 4108 SHA256 80642b8684669a4daa1264601b62a3a486d194bbb273e240c03d441b6baffddb SHA512 9c11fdcfc03ea2ec83ee71c68928a8d24c0694042daca18d0218a8143ed7b646cbde28f79da353ddc6ffc0473edec2864fd453df84afd2f67083e6b95b7e0cc3 WHIRLPOOL c12d812d449e2bc6ef37426da7d9c3635599e1ec2dbdffd4a997b192d27270b07790a4006975645af20fb9895507e47bab3575a3388f3ca32377930c0667a3b2
-MISC metadata.xml 439 SHA256 183d8daaaab8db0bf7c47e92867aaa6b51b30fc8d7927793641e645eac8f2c4b SHA512 c2c768bebd392e57d652123adac0182ccd0d9b90ccc78125f50dc7a6bc99a8ac18627e485c3921616a946f5d891cdaa3c21858a69a4544905cda29a853e49d7b WHIRLPOOL 2dfa59fb7d3ab3219fd40ec547aea43dcacac16c1bdae54a59a23e8a6303fd8cde2a30eda21feb5a84d9703a69930bd2a95d24c4dd93f27a9589199825a5e7de
+MISC ChangeLog 4253 SHA256 5f3518b30579058fdc7330b6028dc926074dd02e713c892407a98b8a6af5f564 SHA512 a9deeeaa86868abf442606bc22185554a5f625475c657e9cc8fe8dc61c4c89622f80902f71fa91d6ef09951bfd72b3f8b4c2b0b55a6f41bf3d89bd886507d582 WHIRLPOOL 8169d297a9c728f7abc0d1e0b7e92ce1734b138b2ac0e09c400adfba29859907968ab0f46176deb85e2836d04090f514d16530b5751120ac38c51dc398aba44b
+MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1nbIACgkQCaWpQKGI+9QwEgCfWVC7hG41GO+ynWl8IoXiJpX8
-bmQAn1CBHN2GZimIqoyPXo3xapQgGcAg
-=MAXq
+iEYEAREIAAYFAlG9pQUACgkQCaWpQKGI+9SzzgCeO7+slDX+ZDRoj5CC0845hqgH
+TA8AmgLKC0D0bHpKBwHSUYSUBF5el3xS
+=OOzL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index 0f7b2b52e00c..e210f22ed961 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
+<herd>gnome</herd>
 	<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
-	<maintainer>
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.0.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.0.ebuild
deleted file mode 100644
index 70ff85e0cc48..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.0.ebuild,v 1.1 2013/04/07 15:09:09 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome.org gnome2-utils user
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.6:=
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	gnome-base/libgnome-keyring
-	>=net-misc/openconnect-3.02:=
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gconf:2
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	gnome2_disable_deprecation_warning
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openswan/ChangeLog b/net-misc/networkmanager-openswan/ChangeLog
index b5f720a6a926..67125c4590ae 100644
--- a/net-misc/networkmanager-openswan/ChangeLog
+++ b/net-misc/networkmanager-openswan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager-openswan
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/ChangeLog,v 1.17 2013/04/07 15:10:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/ChangeLog,v 1.18 2013/06/16 11:45:35 pacho Exp $
+
+  16 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  -networkmanager-openswan-0.9.8.0.ebuild, metadata.xml:
+  Drop old, gnome team will take this
 
 *networkmanager-openswan-0.9.8.0 (07 Apr 2013)
 
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 361dc05406ad..a87a9175aff4 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -3,16 +3,14 @@ Hash: SHA256
 
 DIST NetworkManager-openswan-0.9.3.995.tar.xz 293236 SHA256 8b2116e3965f470d2f73ad38fffc0c14f77ee013fde177f5f9bfd89b6619d1df SHA512 d4bdcbd9e60eca6de7c73f715c653b1d21af1c0755460d4dd734df7f666156f6dea42c80f03ad9e0b3f31c1b547707d4f99b3bc0d9688c94cb8d0fea3be7c2e7 WHIRLPOOL da51c4649e4fcd6fffa0d2646556f3c63f742921641d5fd00a12f3889f21256bb4298e9877bbe3a8e083c70fecbb6dbb76d505285441c0b1e0b9d16f94fb557e
 DIST NetworkManager-openswan-0.9.6.0.tar.xz 295960 SHA256 81deb12d97f540daf607afa1a7599d56f2c1a283b71f021714ba48f0ab000483 SHA512 0e88e2b6582f42e61d982cc34ed40e5b3cc495e380989e1c208d3e06e5ecf92219b69b17cbe2f603861440b645b92b548bf48fe5dfe1ae5a2e409fb87b06a326 WHIRLPOOL e9970e807e1ecc9733463b5fe7b8823aec8412b39bed6a7dc3cf401f00ec88116991d6e6b5f02182f98c050d303bdeb61b7ba0a1a83ddd4f4c13b3e65e4eccac
-DIST NetworkManager-openswan-0.9.8.0.tar.xz 298700 SHA256 fc627deffb5d880e1d203f67a63689c9d75a0a8ed309b537a39fb8699a819fce SHA512 eacb0be62932c0d36f8ef0802a52c25d6de7b3d79a3014ef72258ad33204c306d5e01dff81a2d967687eff2cb72acd45434dfaea1d950df7783725d9207a66a0 WHIRLPOOL 872c074da6f4a0dabbc8cc404e8816586ba7fdac3646d282d9e0f320c6076240df2757952f7086a3294757c79cb7122126c8baf2332ae7308d442b4d81b1b7b6
 EBUILD networkmanager-openswan-0.9.3.995.ebuild 984 SHA256 9de141ffc71f1fcc23b454e0f952b786bdf994401a44c4b5100bfdcfe04db5cb SHA512 d07129a0138e16d3b4c86914275d015140ccbe8ed10b016dc1eef454f6e8c412762c9f345150dce7d5acc2911a178d8f22cce4ac1ba0f4533a8092e4a7116285 WHIRLPOOL 0e1a6bc8727111899434dd0ced2b490ea3fd8d487c84098f8aa6f70c93605e8ea552e3713d91322e0aac702223947c32ca646ff3c90136266c4a68697fe73821
 EBUILD networkmanager-openswan-0.9.6.0.ebuild 976 SHA256 0c2ee48ab7e2847fd2ac518d1b6f098e9c9a176d3c199dea9e3efe6e2a71e5fc SHA512 899ac0a486ab01c5bbc179a3a3258a9ca56f52f806981b3afb4acee946e0a253ea359a4aa75c2d3788afed9b9a40e9f03fac3b6710554cf631aa9700c6bf571f WHIRLPOOL c6e6006705d37d44dc2e05da99e59a8aab77b9ff1114c416c5dc95fed969bbc8edc39fabf6768019d02a92784d9cb9e506b74306129faef1f981ec07523d7426
-EBUILD networkmanager-openswan-0.9.8.0.ebuild 928 SHA256 af3cf9b5942537cddc386f1898bcad4524fbfb1a848a8b2a4d89204a57b71b1a SHA512 a076993c95381d8e5d12fea0cb9d99f7edd4d95821cf241dccccb41a98b5a9c0d0ac006ec839cadfa4e5ce6eab821541a64936e3f5c3696fa258c10be1084dcf WHIRLPOOL 9a7c95d0dd93f7b97381a6a572a00e7aa2aa7fc5a1ccee205e80dc657fa84907f3ba2305b55916d9454c053f17226737dcce2f364800c71647082eaa53a3afaa
-MISC ChangeLog 3158 SHA256 0a2bdf9626f114581f95593a21e3a965e0f4508c619a9dd30f312e527259e8d1 SHA512 9cb534e1c4cd5c9a5ae6c2fe5e93b116b54948c993ee01636a3de50cbe16b180eb7ecccfab53147d605be06abd4fc7d7362b55fdf835eed4bcfffe60a37a8e8e WHIRLPOOL 1e03a0cd36da67d4d83dfa014f0af23a8edaf05814e6fc7243683262edab8b6401e1131667faf435443712edf1080e9de930b01d5eeb957e2dbb2d941898a4e1
-MISC metadata.xml 439 SHA256 183d8daaaab8db0bf7c47e92867aaa6b51b30fc8d7927793641e645eac8f2c4b SHA512 c2c768bebd392e57d652123adac0182ccd0d9b90ccc78125f50dc7a6bc99a8ac18627e485c3921616a946f5d891cdaa3c21858a69a4544905cda29a853e49d7b WHIRLPOOL 2dfa59fb7d3ab3219fd40ec547aea43dcacac16c1bdae54a59a23e8a6303fd8cde2a30eda21feb5a84d9703a69930bd2a95d24c4dd93f27a9589199825a5e7de
+MISC ChangeLog 3300 SHA256 d8c298032700abf2aaf1ee5344f704a7177be963e5c73489eec5ebe4b0e33f76 SHA512 11c2d69e79792f7481f6b364071c624585a28921df8b7bb1a1abe07bc666cad5653252690a5d69cbe44dd89783dd05df0cc5a9f28ad09702e5c29cce9283bf83 WHIRLPOOL 7ebcbd35df026046f06f661414d2328a8e4b8b02a6190b80f86b4a3117c817ad57df694be161c2ded295fa712b471745a2a2add0934f4292b1889d3b0aa37f52
+MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFhjGIACgkQCaWpQKGI+9QXwgCfdixPxvBztKGjvViM7nTmIEMf
-f3wAn3Lc2MWGJSLu84KBpqUAblvkdLXe
-=8HTg
+iEYEAREIAAYFAlG9pWAACgkQCaWpQKGI+9QtQwCdEpCmMe/024yzNAnsrZ+BMOzc
+RrUAn1OZbRypwH8Ol9xZNmd1/oiohRkf
+=vCYc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index 0f7b2b52e00c..e210f22ed961 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
+<herd>gnome</herd>
 	<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
-	<maintainer>
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.0.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.0.ebuild
deleted file mode 100644
index bea32998b434..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.0.ebuild,v 1.1 2013/04/07 15:10:25 pacho Exp $
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome.org
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	net-misc/openswan
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-openvpn/ChangeLog b/net-misc/networkmanager-openvpn/ChangeLog
index 0046e51fbf0d..eacf03b9ee9d 100644
--- a/net-misc/networkmanager-openvpn/ChangeLog
+++ b/net-misc/networkmanager-openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager-openvpn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.40 2013/06/10 09:36:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/ChangeLog,v 1.41 2013/06/16 11:47:06 pacho Exp $
+
+  16 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  -networkmanager-openvpn-0.9.8.0.ebuild, metadata.xml:
+  Drop old, gnome team will take this
 
 *networkmanager-openvpn-0.9.8.2 (10 Jun 2013)
 
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 56ca7162bec4..c90dd376ad8c 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST NetworkManager-openvpn-0.9.6.0.tar.xz 375324 SHA256 8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3 SHA512 6a2b5942abcecf036e893e5f91fb5337a1b7967989feb2ae0000a56483a3a445f9099f89c0a2433d2c86ca299d505132709951ef7de0b8e85938eb31f2fa61b2 WHIRLPOOL b9c146cff9f2e632a9b6d1dbd0712127aeddeb16130ddd47bfb06ce89aad9ba217dd3f8199c16ea86b8dac1c02b8259a3ddfa2635ff778103303baba9c6fa42e
-DIST NetworkManager-openvpn-0.9.8.0.tar.xz 392304 SHA256 4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce SHA512 d3fb9b1e223343c9b7ec930dfb95ba0e769d77eef971d5ad6370003664e9ba0e514a958410998e67dfb42808c08e0e7fb898c7d516794c7318553e18cd893701 WHIRLPOOL 3625949d1e1613d0e29ed14a0044d5e3f88b770319c7728bb637df13e023269e16a39a4451fd8d10022150575d263f052be0f8b913392b3b951837688884b6d0
 DIST NetworkManager-openvpn-0.9.8.2.tar.xz 391456 SHA256 d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359 SHA512 84d03e6fa446d6ebdb704a7260204d9c9a9c5f6430a7322da6f2058bb28817553d1b68081e1f1650d829389def309c1410702c3ae3ddf99923ac183f70f69e0c WHIRLPOOL 66152d3ee83dc3da9498aeb001ffcc31da66992eb7c40884ba45aeaa682b787c1c6bb9088238e79ae2e1dcb513ed27ac50a9db9de92705d96140d30dac5f6619
 EBUILD networkmanager-openvpn-0.9.6.0.ebuild 1594 SHA256 ea4fa7a3881a5e6ff61c61ec48677ae74367d06fca2d672765de0b44a2c83c76 SHA512 80665f75890a325d321e18708c49a3a7f6acb26769f835b29a4a6e3e029620a32e6bc0693397d6fb8a56cf11c5df9d8c1efd272cc4f8ad0d13e277236a4ae1b9 WHIRLPOOL 58472c03cd88732e88becbc9e93c15e1cb46347b9a4ade84f0128195b55af79b5dd9ba30dae0a275ed644395fe7291b3645288da25c89bbea885f4c4ca8f0d57
-EBUILD networkmanager-openvpn-0.9.8.0.ebuild 1330 SHA256 36ebae0c95ee55113e093b6709fe5f24ad78e10f65c5f9ed7a5c7ce4cb4a1dd0 SHA512 da063a1ffdc3fbcacdb55d367cff3e4017ea48bc3db26cb44a264923c8082a97a06422c88d8b7949d8c17e51c35dc964a9270911aa6bc0dcca291d5ca0caff31 WHIRLPOOL a3d156d76d40d56f18ed4f952b6216ed5956db55628e2a3e0beb159218abe8793bfe44e4e71b92d447c0beb01c7dab391ed3a0041fa10f688fb0bcc9db9d97c1
 EBUILD networkmanager-openvpn-0.9.8.2.ebuild 1293 SHA256 293b9d995d3752b32e0bc3b0d5c0413c6dfe4d97fa994ccd95b0c082e521525c SHA512 2f7710a681c07d4906288165bd50183de2714d8bbc60e16f47f9a1c8f131035f4babaee1eb61a21ede0a7f7af99a37aab1b7ea67ccd03a1cd42ce0c1d75f9ee7 WHIRLPOOL 22ca632ff0f8b35fb4b39d3f96969887fa1becb757af5fed0a4b365e799c45c93e83d37048ac0dc5b965cd971619e52cf28fbb5528640737f29b40d62e2fb999
-MISC ChangeLog 7837 SHA256 00923ff8521e2e51e0a45a73e84429436bbb454fa22c0c5ad43e17c245a9c422 SHA512 5ed1c7830e9918a86174fa5d1192b94339c3ca6b89f599a8d675cc4e5a6b4a3b0f52c483b72f1749c93792979ad0d0ca78a46c1e70806e94552a48f04b1960d3 WHIRLPOOL b11b40087fe8deb30a926e99d3f26ea3f4039976cd6ba88c09203c07a65cedc43cd4ed6b32892613e2e1074525c020449529b32ad94c533af8bb282ebe6b3c77
-MISC metadata.xml 439 SHA256 183d8daaaab8db0bf7c47e92867aaa6b51b30fc8d7927793641e645eac8f2c4b SHA512 c2c768bebd392e57d652123adac0182ccd0d9b90ccc78125f50dc7a6bc99a8ac18627e485c3921616a946f5d891cdaa3c21858a69a4544905cda29a853e49d7b WHIRLPOOL 2dfa59fb7d3ab3219fd40ec547aea43dcacac16c1bdae54a59a23e8a6303fd8cde2a30eda21feb5a84d9703a69930bd2a95d24c4dd93f27a9589199825a5e7de
+MISC ChangeLog 7978 SHA256 e4a173982bcd4b8cd4ea2423c0edf7ef61a8a4e4751ffa7184de780538bcd9ca SHA512 b24433a325b1064b1de9d884b73272e2ce0157efcedbb26fb93986f1a20738346c0c3f542619a267c12807625087c50cab34cf9c2330aeda2c9134c49cebe710 WHIRLPOOL b79533a633db3d2a7aa2589cf43a839cb26e9fecafb5f86ff5eab1bb6174ad3fe0f8b5bad7087e12e47f91140a1f5882da2150220ed10b63b1e92084b6dadfa5
+MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1nhgACgkQCaWpQKGI+9RjawCfdeXWRYPBnWhMyyl+g27tcceV
-ZaYAnj6KrnYasmFFKUq+YFIRH9pZKry0
-=zcmb
+iEYEAREIAAYFAlG9pbsACgkQCaWpQKGI+9RD1wCggfyVy3rgaSTbkJGKG8+8j80g
+puMAnjc+ZTEmfu5sNU91y0M7/M7LmF4A
+=F37I
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index 0f7b2b52e00c..e210f22ed961 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
+<herd>gnome</herd>
 	<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
-	<maintainer>
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.0.ebuild
deleted file mode 100644
index 4a2862ac83ec..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.0.ebuild,v 1.1 2013/04/07 15:12:05 pacho Exp $
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/networkmanager-${PV}
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	# Drop DEPRECATED flags, bug #385597
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-pptp/ChangeLog b/net-misc/networkmanager-pptp/ChangeLog
index 2c2409033e36..f7cca4c3ca95 100644
--- a/net-misc/networkmanager-pptp/ChangeLog
+++ b/net-misc/networkmanager-pptp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/networkmanager-pptp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.33 2013/06/10 09:39:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/ChangeLog,v 1.34 2013/06/16 11:47:55 pacho Exp $
+
+  16 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Drop old, gnome team will take this
 
 *networkmanager-pptp-0.9.8.2 (10 Jun 2013)
 
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index cd5a6b371e76..9bc2b745c2ba 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -7,12 +7,12 @@ DIST NetworkManager-pptp-0.9.8.2.tar.xz 350192 SHA256 7f46ea61376d13d03685eca3f2
 EBUILD networkmanager-pptp-0.9.6.0.ebuild 1241 SHA256 71744ecf625bc3a48d5362667d1921f3f140606ea4d3f834ce1419e58ef27ad2 SHA512 fb207439d199c3daad49873110e9756d38d4a5e01a42eacb1d525a4698f7ae772dcbb2873b957435301538e6f150c5feb7adb236ac0bf14038a6ad7062446b3c WHIRLPOOL 5d2849e2a819818169ee1865490d030caec41fda7c202abf3ead6884d9b8c6b37fe85ec57a1d875168e498bb5adcb41a8a9397cbc5957afe2924681df176332d
 EBUILD networkmanager-pptp-0.9.8.0.ebuild 1044 SHA256 40a0390dc45ededc10f9209d19614410eabcba156360217238a1706016d68ec4 SHA512 700abe831df58972595f1019753ec3d58ee552290c02221e901b550d8792af6395438ecae9f4470ba6b4e0302bfa76ef0676d660c11e525531f850c51cd405c7 WHIRLPOOL 8d4698d3489003aad6a55ed43371f73f32ef909980060907eefc7438867fc5df96f7a42bfd6b4f08191869164647e08e2ba648053a8a95c339eaae63c75f1574
 EBUILD networkmanager-pptp-0.9.8.2.ebuild 1007 SHA256 fe867854cbfe81187667e3dcaee4a5c059d915ab1e55bd961e0f4017e39acddc SHA512 f32580575955afaaadd55f9f8a823320d7b422d1a2efcece2c7db7472502643188b3b168c25ffef37c97f62f64da5bba7d322875c407f98913922ed79a025658 WHIRLPOOL c878fe572f05546c8de4053842a256785a384797dc4fce90129048e5c8350a2b7857058150426ffd9be22f69ac0f43ba2225439d26d7ecb9c7f67811d5e1f9d0
-MISC ChangeLog 6206 SHA256 75a506c63bf64736fecb41b5bcaf235ec8f8e0bba9a82d0fc652b6329abf04e0 SHA512 a54cf984b88ab51c2b4cbb73c6c0b29c6e0384c5cf11ee1b77d0cce55c048f987cc5181357539945e3f347b947d116cf7e40b4ebefaa660a6fcc37972a1d239e WHIRLPOOL 821481ddb5e92904268d5efbc697082a0d935528099f5a4a8353e79ed638d86ca4dbb6f2fc988b69b9d15bc9941f209f651e36ec0f4b50d43515a4c2a06d36ef
-MISC metadata.xml 439 SHA256 183d8daaaab8db0bf7c47e92867aaa6b51b30fc8d7927793641e645eac8f2c4b SHA512 c2c768bebd392e57d652123adac0182ccd0d9b90ccc78125f50dc7a6bc99a8ac18627e485c3921616a946f5d891cdaa3c21858a69a4544905cda29a853e49d7b WHIRLPOOL 2dfa59fb7d3ab3219fd40ec547aea43dcacac16c1bdae54a59a23e8a6303fd8cde2a30eda21feb5a84d9703a69930bd2a95d24c4dd93f27a9589199825a5e7de
+MISC ChangeLog 6305 SHA256 cf5d1dd366f70c686d687a55b5fba7320ad62cbcab6a74b090d935cbecf9fe2b SHA512 ed34526b779835d1e24774302c3a357e8fd972b13074816af3cb5f97c8274b357ac48cebbea2c1b7e12aac694a5a35b6bec58c69fef12974bd37bcd6b4f87a80 WHIRLPOOL 4f43b9ea1320a3fcc7289bbb14d39c2c9359e328556e0f70148694065e8b44493b702b05db351a2c055fcdf02d5258013b7d243e09d51cdce0b36a438a88627e
+MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1ntQACgkQCaWpQKGI+9SgBgCfQ4TJlt2DS9u/HvL4T6S0C7Gr
-6Y0Amwd18NNLVc69MqUZeeZ5R+3nhrse
-=r373
+iEYEAREIAAYFAlG9pewACgkQCaWpQKGI+9SWdQCfU8oFGqADcCwtUyp9GK/CRiDk
+X60Amwduhv+uBu/QBHiC4/wgFo2htC8b
+=k608
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index 0f7b2b52e00c..e210f22ed961 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
+<herd>gnome</herd>
 	<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
-	<maintainer>
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-vpnc/ChangeLog b/net-misc/networkmanager-vpnc/ChangeLog
index d1f8cb8e4b3a..b87fdf9552a8 100644
--- a/net-misc/networkmanager-vpnc/ChangeLog
+++ b/net-misc/networkmanager-vpnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager-vpnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/ChangeLog,v 1.31 2013/06/10 09:41:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/ChangeLog,v 1.32 2013/06/16 11:48:48 pacho Exp $
+
+  16 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  -networkmanager-vpnc-0.9.8.0.ebuild, metadata.xml:
+  Drop old, gnome team will take this
 
 *networkmanager-vpnc-0.9.8.2 (10 Jun 2013)
 
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index 550790a0da03..301bf2afec58 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST NetworkManager-vpnc-0.9.6.0.tar.xz 342580 SHA256 6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2 SHA512 b3898c9b91c46a749b3efcba3d9bba2015d2fbfd5601444f8d940481e75a7f7973851da3c1bc7b4e763d5b161bc623034da897032dc097332109a87f6bbe63ab WHIRLPOOL 696e69d7e9c7dea74f44e6424082f72698bcbf208cceac8447d74de9c43517524e263ea49271c89a7d646aa3c1ff255ab27e58d19f1df08fd4a125c0ffb5e379
-DIST NetworkManager-vpnc-0.9.8.0.tar.xz 346304 SHA256 e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1 SHA512 4a15c7d1da86b2ac1fda44ada0fff69d936210493da0d44da1387aae326a566facf235a84688df720208ba46c63980c2f2693a9dceee6a5f470d68435c104f48 WHIRLPOOL b2524a2a9536f280ee124de3face4166691f1404c0df6e11da1480aba3765fb92a543b0c6857c81222892aa86bb215db90027f280e31b066d85e7b02200c906a
 DIST NetworkManager-vpnc-0.9.8.2.tar.xz 345396 SHA256 adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1 SHA512 d3d40f7bc47d1e53f7164a834a31dd15185436e0a7207b899f35ebc7ed631cd214754834b0981c3fdb3d99532c8ebab48e81d2e20aae75ee4563026d21a9fb42 WHIRLPOOL 49c5b3b9f5d6399165c23f06e9cb5688551dcae904630c9574ed43727641aa25d071ede5a70a150e19d7015c21177ee37e7dec89adb57a09bafe1035dd8a66d0
 EBUILD networkmanager-vpnc-0.9.6.0.ebuild 1435 SHA256 50ad1ddfc0f66e2a2cda78a6331118e2f0a1c528ae89f389318cae9fea97022e SHA512 303f06a801def0d73aab58d0bb9dff9eb2587dcc40003970371dea41ee38566adcd14ba3d9e85e1ee2cc6cb053e2b057194115e9be3a18db36e38a713e185af5 WHIRLPOOL 8707cfcf8515cec1f7a2832170fd50c62ef3fa729e7fc6684154c42277c8ceb17e2339a68af1bdbfeff3ea8411d0b53a7384eb948f4860a412efa9731d8835ce
-EBUILD networkmanager-vpnc-0.9.8.0.ebuild 1240 SHA256 ab5a222a3cd86d8291d9f3ec28a51de53a366dc2383c2c5fbf563a23098f1261 SHA512 7aa1a303f141b367486bc390a9e6815cf020d7c3479b79981334fc54d0423d59dc42f40647f4d4f14caaf52204779e6535efa49d78bd13b16103c68355b7dffe WHIRLPOOL 8abce4203bfe230da97550ff6a19188d836799efd380681976af2d26c0483a56c57d0ae1fc9150ff177363b5c77565a6cdbf0b8eded1bcddc641e8749644de19
 EBUILD networkmanager-vpnc-0.9.8.2.ebuild 1203 SHA256 c013c0fd6e3490825106d968eb4393a90886bf06e0ab33130e73927b860c5407 SHA512 83c798fd7e77590f5f8933b61449da15b8d3027532d8f71ec888cfb3254f6919b55ba97cbf0127f260ef42c06b346032908210d5d0a88a78347a5d7d41002fe8 WHIRLPOOL 5b70f2bad68f8b231c21e26e527789818a1ab2c0a3653ca501da6b73603d8ffda8027e174db77d5cc039b3a55a841d5fc6bcdf36f7ca27c99cb0818d1b87239b
-MISC ChangeLog 5882 SHA256 f6c9e48e217f5d9a5cf597e97c18cedca023284cb079e82111847f1a3d0cd59a SHA512 4a4846cfeb305edd1b22553f83d5fd1539d48897b59f665bd03b2801a25f199f9faa4e129d0a5e63970789e5305fdb8988ae90ebcac2670b9571d0fcd8e14e8d WHIRLPOOL 62105eb489ea5044fc047f721bd2e52a8ec84226a20ff604902ba70c6a0f0fc6f5fe132a9311b9e34faca0ac63b83825f28162da765c4129cce769adc813c6bb
-MISC metadata.xml 439 SHA256 183d8daaaab8db0bf7c47e92867aaa6b51b30fc8d7927793641e645eac8f2c4b SHA512 c2c768bebd392e57d652123adac0182ccd0d9b90ccc78125f50dc7a6bc99a8ac18627e485c3921616a946f5d891cdaa3c21858a69a4544905cda29a853e49d7b WHIRLPOOL 2dfa59fb7d3ab3219fd40ec547aea43dcacac16c1bdae54a59a23e8a6303fd8cde2a30eda21feb5a84d9703a69930bd2a95d24c4dd93f27a9589199825a5e7de
+MISC ChangeLog 6020 SHA256 d9adb18fe5d8402f21ff62096e5db0947712c2c714b837781d77a4678956c4e3 SHA512 b91f9a6ed5276fd2eea1103954fc8c4d69cce170ac0bc3d8e5063c9c7da3d268c979e62a4938914dd9dc132493a5e59681158ed59c316b5e7bbe4714804fa8f8 WHIRLPOOL e0ab4948110c8f81700c7c3a458bdb173224496dd47a43fefb4c4e7827cfec598d3db1816074315fcf2acbdc6139e149b03d8a37cbd9f7a786c2e823d0007502
+MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1ny0ACgkQCaWpQKGI+9R0vACfYrHmPtHz2A4o9xTLA4ZhCcoU
-hkMAn1M4+2jC8d+4iLLVwWhdBcGk7ip/
-=tV6f
+iEYEAREIAAYFAlG9piEACgkQCaWpQKGI+9RYXwCeKCFj0PrRlIEJU6FVSvm74goQ
+DGUAnjkM/59PwxB2X8+3rfSAWJMWoCkf
+=G7wH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index 0f7b2b52e00c..e210f22ed961 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/metadata.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
+<herd>gnome</herd>
 	<maintainer>
 		<email>steev@gentoo.org</email>
 		<name>Stephen Klimaszewski</name>
 	</maintainer>
-	<maintainer>
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.0.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.0.ebuild
deleted file mode 100644
index d127203599ce..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.0.ebuild,v 1.1 2013/04/07 15:23:35 pacho Exp $
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-${PV}
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/vpnc-0.5
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-	)"
-
-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
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	# Drop DEPRECATED flags, bug #384987
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}