Version bump. Modernize ebuild, drop old. Update license.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 42 insertions, 27 deletions

diff --git a/net-misc/networkmanager-openswan/ChangeLog b/net-misc/networkmanager-openswan/ChangeLog
index 67125c4590ae..ef302363bbbc 100644
--- a/net-misc/networkmanager-openswan/ChangeLog
+++ b/net-misc/networkmanager-openswan/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2013/06/16 11:45:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/ChangeLog,v 1.19 2013/09/16 01:16:33 tetromino Exp $
+
+*networkmanager-openswan-0.9.8.4 (16 Sep 2013)
+
+  16 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-openswan-0.9.3.995.ebuild,
+  networkmanager-openswan-0.9.6.0.ebuild,
+  +networkmanager-openswan-0.9.8.4.ebuild:
+  Version bump. Modernize ebuild, drop old. Update license.
 
   16 Jun 2013; Pacho Ramos <pacho@gentoo.org>
   -networkmanager-openswan-0.9.8.0.ebuild, metadata.xml:
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index a87a9175aff4..66c8629915a3 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-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
-MISC ChangeLog 3300 SHA256 d8c298032700abf2aaf1ee5344f704a7177be963e5c73489eec5ebe4b0e33f76 SHA512 11c2d69e79792f7481f6b364071c624585a28921df8b7bb1a1abe07bc666cad5653252690a5d69cbe44dd89783dd05df0cc5a9f28ad09702e5c29cce9283bf83 WHIRLPOOL 7ebcbd35df026046f06f661414d2328a8e4b8b02a6190b80f86b4a3117c817ad57df694be161c2ded295fa712b471745a2a2add0934f4292b1889d3b0aa37f52
+DIST NetworkManager-openswan-0.9.8.4.tar.xz 301068 SHA256 b11bbfeb2eb2efe6392a94f4b8f41efc3c79a947ed2eff3f0881d5bcd2edf107 SHA512 0e32005d979923add3db42333f6bf3f5e6759cde9436a4f6deb9e21f0ec227b5fe91467dbb2e4d95ed576cbfef016096123e36684af006b4b38ed141cc3eab20 WHIRLPOOL d211035e4d2d1ba068a3fed2b09d6177114c1fd90253a8518064fff6b859144441fc42b5388db7ae5b61731d8713dc8c79bcd2caa4490fba0135677f7bfafe25
+EBUILD networkmanager-openswan-0.9.6.0.ebuild 983 SHA256 43ae358e7ac8f08018557e8a54c91e671fc72d67695fdd5943b213d9e450a6a6 SHA512 244cf720619f307c615f140eb59e8b96a0cc69b063599775fd350c4cbc9ad212008edb79997e83800be356ec06dfb08cd3f0367d24f6faebb34ccf785820ef7a WHIRLPOOL 9d192030564e8a388185743aac2ef0ef7de9f3622879e4b5e4c9d0497cfb398b0f6468aec03d4772ee70fa998dbf9ff210d199b0a821f1445e0c9337acf51768
+EBUILD networkmanager-openswan-0.9.8.4.ebuild 1017 SHA256 479853d8f68a68b6986f4b5f33b046bfe46a3b586c5d6ce63281e94466550752 SHA512 ba5614e696dac52a6c761133151c8d29db9fb1177834823a0634b6ae8c4cae9747df46e0ee4af0cde5cadc7ed1193e093837ba7592d078b7a83301a62d01e98e WHIRLPOOL 6a4eed45bb3c58c6dc1f8f8ae557bbc21df3a45e90c8dc477482f93675ef0edc605d05b92eb1043b6fa27616ee01083e76493846ed7340d05f500ad71d383c4c
+MISC ChangeLog 3602 SHA256 6a46d42f378b0382498b9cc678ca2612e26337efaeaf405d2a77e2565515aa63 SHA512 44ba023ea8732f82051112818384b6badea9db0210b87f185ef4b515fea7e7281c62513cf39d0c1ea739d219964c680b3c306d414cd13d1f4e219053cabd24dd WHIRLPOOL a95d76c1cab2023a7e159a77191a20129d4ba04a142e912753ebc85f1fb66d7235c14cab16dcff5056fd362b37c7d50f1c78431ea2481752450e1d2b111256af
 MISC metadata.xml 257 SHA256 a5789d9be253767cbc21f45ce73723ac16e2c45637033a3b67ec1e9f12ae8846 SHA512 0947d371f24a86e39c1faeb42f6d635550d7cf96480bf36eccbcbed7dc73c80c51c9ebe90c9749257e17950247b47eea19aae5161722e789efb0e212efcb6640 WHIRLPOOL 7a5853a2040251133a790c202b92b0e3ba151700cdf0b7c60a21d41ea90377155296a16d5f3085e6933fe2991290e7ae03958f7477112e195b06c977a1b8a049
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlG9pWAACgkQCaWpQKGI+9QtQwCdEpCmMe/024yzNAnsrZ+BMOzc
-RrUAn1OZbRypwH8Ol9xZNmd1/oiohRkf
-=vCYc
+iQEcBAEBCAAGBQJSNlvvAAoJEJ0WA1zPCt1hq5EH/2JkdszJDsOkS8isDd58PI2o
+TUk4T0liXu7DLxtBCr/1gr681dv6GRY0APOh5PskA1Bjf9IUfuMtsUc9OXN48POE
+6I8DF3x+nS1CgoEG455h7hRu1fJjerepzBbcSJxbEq0e8+UavIWd/SBbNacwXZxa
+PH/82RHtpJcJXU+poojRX6wRwJwJ6Us2YoJmx1YJ5iMKKgyNJPPrzSWMQYUSGQMH
+fJWNzw3d26D+0ju9Na/xGViFqToIfhwxd709hhqBbWkEaNTekY3op94R8eXTahOP
+xO+6ul2hIPU4uv/A50Dji/0tx42PZOzBXN/DoS8ewbxSX1BGW03givD3j8j6TXk=
+=MGnM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.6.0.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.6.0.ebuild
index c0c260e6063a..fe0d703fb79d 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.6.0.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6.0.ebuild,v 1.3 2013/01/27 12:47:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.6.0.ebuild,v 1.4 2013/09/16 01:16:33 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
@@ -9,7 +9,7 @@ inherit gnome.org
 
 DESCRIPTION="NetworkManager Openswan plugin"
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gtk"
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.3.995.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild
index af67266ae0c2..45b53a5abc71 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.3.995.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3.995.ebuild,v 1.6 2012/09/07 17:42:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild,v 1.1 2013/09/16 01:16:33 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
 
-inherit gnome.org
+inherit gnome.org gnome2-utils
 
 DESCRIPTION="NetworkManager Openswan plugin"
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
-	>=net-misc/networkmanager-${PV}
+	>=net-misc/networkmanager-0.9.8:=
 	>=dev-libs/dbus-glib-0.74
 	net-misc/openswan
 	gtk? (
@@ -28,18 +28,21 @@ DEPEND="${RDEPEND}
 	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_prepare() {
+	gnome2_disable_deprecation_warning
+	default
+}
 
-	econf ${ECONF}
+src_configure() {
+	econf \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--with-gtkver=3 \
+		$(use_with gtk gnome)
 }
 
 src_install() {
 	default
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --modules
 }