gentoo resync : 10.03.2018

3 files changed, 2 insertions, 50 deletions

diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 9365c21a0e75..d0ba1c3356f0 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-openswan-1.0.6.tar.xz 306648 BLAKE2B a21f415bceab5edd9932e887e3aaa5da0819f025babccfd58fcefb207d2c222aa4630b145d78e9befc09409f7f74aa596bce779c4034b9c3a5cf0765bc71c57f SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce
 DIST NetworkManager-openswan-1.0.8.tar.xz 318672 BLAKE2B f0a277de4bf58c9d15f329ce8e0ba00ff80dde205fde19d9cd0b6feea4796cd0d84da6934713ee9b958c286c96a565f53d430b4105e6a963ab1ae8f7755e202f SHA512 66a3948493dd51def3d0afd57ccbb2e38a2f1b3c37df85b47059a0c06457093d574aed4165710080b9cfcc914e4459a60d6946170199dd3f75482c6350e9ed6a
-EBUILD networkmanager-openswan-1.0.6.ebuild 844 BLAKE2B 1a4fae4ecbb449df83df81ed2a9f57c43fd0ecfb0d6588f99c1b56643824cd8f6279287c528f7139906b5ece1b6dbc32217efb560514fd72d22ca5d46ad8b905 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73
 EBUILD networkmanager-openswan-1.0.8.ebuild 844 BLAKE2B 1a4fae4ecbb449df83df81ed2a9f57c43fd0ecfb0d6588f99c1b56643824cd8f6279287c528f7139906b5ece1b6dbc32217efb560514fd72d22ca5d46ad8b905 SHA512 8cfb84d687f2a2cc34f70dc0e9d79525b2b3f4c265084f5ede3e2918e7952d1d89b89a83e713cc2c8cd07cc95546925e1c3c409d93cf8f8e0583a9fc514e8c73
-MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index 30c8deabf55b..996e7cacd217 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-		<email>steev@gentoo.org</email>
-		<name>Stephen Klimaszewski</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
deleted file mode 100644
index dcd10236ee5c..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	|| ( net-misc/openswan net-vpn/libreswan )
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.10
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}