amd64/x86 stable, remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 22 insertions, 72 deletions

diff --git a/net-misc/kvpnc/ChangeLog b/net-misc/kvpnc/ChangeLog
index 83512e122988..728601ad1ee9 100644
--- a/net-misc/kvpnc/ChangeLog
+++ b/net-misc/kvpnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/kvpnc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.55 2014/03/01 22:12:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.56 2014/04/28 22:22:05 johu Exp $
+
+  28 Apr 2014; Johannes Huber <johu@gentoo.org> -kvpnc-0.9.6a-r1.ebuild,
+  kvpnc-0.9.6a-r2.ebuild:
+  amd64/x86 stable, remove old.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> kvpnc-0.9.6a-r1.ebuild,
   kvpnc-0.9.6a-r2.ebuild:
diff --git a/net-misc/kvpnc/Manifest b/net-misc/kvpnc/Manifest
index d1a99d650625..3d7102b6ffbb 100644
--- a/net-misc/kvpnc/Manifest
+++ b/net-misc/kvpnc/Manifest
@@ -6,26 +6,23 @@ AUX kvpnc-0.9.6a-ifconfig.patch 1800 SHA256 551feb4d3728b37ca98b55c53de54883bbce
 AUX kvpnc-0.9.6a-scriptsec.patch 1017 SHA256 4219c7bbc86e2e7546e1b5c79b173d54fb562d5e532f7a6a08ae1e3a77dd8f5f SHA512 517d69e5f4b2911f3ef3fc165eb242b11075b46ef7e25d7f0b311da20bfdb14ebb56d91fa2a052330ee928a04e2299a4a01020a5eac270f31d020f2ca0672595 WHIRLPOOL 448908a67ffa2cacc081906e8f6c9d2256dd389983182867e438072a62e88c5c6af9e563546ac705e88187160cd39162e4aa8515abfa0e8cb4df5b6b9731746e
 DIST kvpnc-0.9.6-kde4-locale.tar.bz2 2020192 SHA256 a675f9ed3d66e7fa94a0fd530fa60521d0ef739043bcfe2702be77b0299a47c7 SHA512 a2e5c7f465ec77e61f882cb2a45da7da3c868de164e8cdefe2a987d9040e1762ebd6f3e089f008dfcc7f7fad47b9847c059d615c94a995805af0ca3f1fd4d209 WHIRLPOOL 03b5a49027d024cb2645ea481735223f1551d65fed027690619f75ed38c05ecdc3b31b73e4e1d4309450088b709e35535081c614e4a9136d2da8fc954d739a15
 DIST kvpnc-0.9.6a-kde4.tar.bz2 579425 SHA256 6bf8c1f13f8d54f73f7ebb4102f912a5ebc01697ea36975977de8e57c97771f3 SHA512 e30e3fcb9729a378c84d636c7efe0e45ce7d15bcfab2f5f6cd4e37951de1db10c343e5e14dc13aafc4d540058ebc2ca0c2ad30c555fd78f0de552107d13d2467 WHIRLPOOL 8dadbf4fa0ba3790d8545a05cf9db5e462ba1d5a72c898faeee556d7e071c71e2cfaf81a07b5ff17a790399f044b87d1dc56f43799c7f58df049cf43829896cf
-EBUILD kvpnc-0.9.6a-r1.ebuild 1261 SHA256 10672c98f15baefcc9c0bd128a6c4e917f25623fbfa538657bd79d47540f449c SHA512 aeb8024cb92b00baa236b7e9911fa9666799a5d4610235deab0b4f51cca2b1b662557b2b6f31e4521e00d333bb9722fb5f27c153def16590ec736c59ca49d0e1 WHIRLPOOL b55b1f9f787352ff409d53d215ebafb62d1e5c93f5c32fb3359d02b4f861d6af60bf1e54caa1a0ed4b62609e7c9ab081f7e2073ebdbb7d4e1f27aa3f0360e9f9
-EBUILD kvpnc-0.9.6a-r2.ebuild 1299 SHA256 7eda56d8733b238ef1a523a78131c8d6253949ee5eeea18758e4031595b40668 SHA512 2e72310dda9fc9bd0e9b5fcbc8d6bc909e9d34292cfa450b84f04c0fb5c7a2552d3c66c46e4ebe27794721283fdba9f2c6060aa66245007410091f37c35ee233 WHIRLPOOL 4f6d74758186533bfac8625119525ff70d2ab9327035f6e1d8d3989a1f7f60f6b8baa1334820132faa562181fc1958c2275560bd847a9973922493de2689e5f8
-MISC ChangeLog 7978 SHA256 d4e8cf469ae0560e40fc05f320ec48155b46751047acf48cf0803cd70ff44c15 SHA512 b6ca8dbbf1f72cbd5ba939f38f3751f72fd70803759a287629be042998912b17d718a27038c2c12753b5ba6398a7cfcce3fc9a5bf9d079f2d064a0a7842f69f3 WHIRLPOOL 2f17cb948d422817fe211fc04060cda12fef408eaf7e58a37d72da3d004fc8adeec5d81e57c3b835d48a11eb0fbe4f3928a27fb867723c771fbb686616cc878c
+EBUILD kvpnc-0.9.6a-r2.ebuild 1295 SHA256 16739c15532eab2e0e9e72cd34d5c501fe68c3bf7cd1991c8f1791ec81b607ec SHA512 3b86a9b58a57e95906e38765e693986f3d891acfb661b0be849c85b53d290cb756deed7638d8eb0f92fb652b802989637085592e1fac95371992170e46c6c248 WHIRLPOOL b648214a063318b5ab18c0d903f285f51f7fde7b96ce7c24c331a9bb99593a3a3c0f6eb6e343a7156ec35e9fd2d8928fe91c906bffabc02001c29958cd3ab210
+MISC ChangeLog 8108 SHA256 f7b6572676852c251b28dc4a39e3f918940ddf1c68cb567d9be918ef62ee59f1 SHA512 d95df07c11855a0e392d0938328e62fe679c35dfc8f1590946861932c6cf43e6c3316bb3ea9d11da35de23ea41508cdc963d09032f1f8e0f3850ee9dafc43bbc WHIRLPOOL 2a47c402d7e73c4ae8805370ad59ac80937bed92be09cdead3eb07324ca2c577196b8769b1d9714276fa14645c755fe7f08aba951aac6d52f80f432af95e9838
 MISC metadata.xml 158 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 SHA512 a9f1d39008120816359e4198157b5613ab427fde9b8503e24346193fe9c84edc9a62860b90fd56c4adf4526bb7873a489a0f98efc75b52caa913e911ffd50f12 WHIRLPOOL 22e1f5aef99c4356a076c106161a1a73b40367e9f95e3ddc38c66a153674daef83871f77d765dd7d1bd7d970b72fd3841577176e361fcdb9936bf0309fd28635
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEltsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfF8QANMW3vIBOGbvqEVt+rZoMImI
-MBxUhwXp3oc6duSay5EkYaGhR0opZK0wLp0l2OfZuYJc8pniEdDGdnIHJcKxC4EM
-Ie5BPJYIRm5TiXuPzk/owdpKmDNv/enPMdJZ3Li53mDVQRySHb6XstRPKw36pnc3
-Wke2gKQwr/pu6+uqvx5PCK+WR/UWKTXWLdoI8InCdAMAUNdW9qvCNLCZqkkq8tpK
-Sd2CRFP/rV4gCZEUByzPkdOMHKjFNFbUbiRzqwzFIBCi9MS/ewL4BXSdY0fOftNO
-mXdUc/3xUFIvAv9M2QU1994X0NsRDMf5bv9A3DNXKCx6NQjjWN/IVD82V89eWwYN
-9I35vzWS8TEj2TFqobl2NyxQfyRT+Qrt8bttJVQ+qc3T542f17jsFCV2JKTzO/gB
-m9X+CScUhXrk2KC1Di6HoZsHrw/ONlk/Grp2EYQ8phkWSSvTqgOllZQ403gyhWns
-GRnlvfmmjRdpjS3kXkbFpy3BxnbWeMi2ZslhyKznAXzOTlXrYlfRUNyWQvorHNI+
-yZ/qgojSgNnjOPO4rpmnPu+UJcR7ajRzB42IUf+UJPtdljXD8WNIyuqESfAzl0KS
-bYyq7RKiBh71RQv8nW6yWknoMeP5kMP/tDMclABfU7/kzQhXk72WsjGFqPVK6avg
-J8gWXarQJh8Y/eTRsSYq
-=gl/p
+iQIcBAEBCAAGBQJTXtSSAAoJEGVpnaTzz9K9CG0P/01nczqfVyLMFhE0tqIzDbVi
+uX/umKJchi7fAEOuhB/78QsK6hFPQP40opRqjiS83/76jvhZKUwut7QBBUubULye
+iSwH/p/Yx5ZZ6yD8kKWjosO2eG0vp9CrWwHjesMGymlS0VGmh0tAC4cYHCX0pbsQ
+OplIOmNeMjh8G+0sfOh6842qCdyUl4Ng1nEpEjlaaD1lSx2CIcEit86AbQUuLACQ
+512HYN+UpOZ+BglVUCQqIE2vNxRqXsE0t9YC98Xvq5MqEEuqCsSQqKEEDIrlplqo
+VerN5RhLMdi5Z6DFRzLZE42QY8ioa19kcKSRQ6oA0wdXi6PHguqaTwO3q9cj1kiF
+5WItfhD5aGdkbHWUTWasE/ijXE2I0BLWtYfUSAUL/YvJAfT9pI/q1nRjEQceoL6k
+XH/oD/0b9qKZ8CoubhG6ZuuFN60UOgKCIV6Tx9FEw5ydcZrWDR2zDXMokqVmaBEs
+/XvF716SXYjEKVcnYJxMKqXJZZ7BxtpkGK3wSnruJajh6mTawMbfXkQD54llSD+y
+BOggXQGBoHMMQuw64paAirTjMgJwnzz83rLnqWWtPZtRwyMAKp1WRIr1p/icd0/M
+ArwlE7MZkr98iRaIk3YYfIGa+SrSuSG7ZlRrw/zhDP8+jg07lR50t8U/WSHy21Lc
+IxIHqXqnE7cSSedNhCn7
+=j9JL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/kvpnc/kvpnc-0.9.6a-r1.ebuild b/net-misc/kvpnc/kvpnc-0.9.6a-r1.ebuild
deleted file mode 100644
index 320575759fa5..000000000000
--- a/net-misc/kvpnc/kvpnc-0.9.6a-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.9.6a-r1.ebuild,v 1.6 2014/03/01 22:12:53 mgorny Exp $
-
-EAPI=4
-KDE_LINGUAS="ar br cs da de el en_GB eo es et eu fr ga gl hi hne it ja ka lt
-ms nb nds nl nn pa pl pt pt_BR ro ru sv tr uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for various VPN clients"
-HOMEPAGE="http://home.gna.org/kvpnc/"
-SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2
-	http://download.gna.org/kvpnc/${P/a}-kde4-locale.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/libgcrypt:0
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S=${WORKDIR}/${P}-kde4
-
-PATCHES=(
-	"${FILESDIR}/${P}-scriptsec.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-)
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/${P/a}-kde4-locale/po . || die
-
-	echo "find_package ( Msgfmt REQUIRED )" >> CMakeLists.txt || die
-	echo "find_package ( Gettext REQUIRED )" >> CMakeLists.txt || die
-	echo "add_subdirectory ( po )" >> CMakeLists.txt || die
-
-	sed -i \
-		-e "s:0.9.2-svn:${PV}:" \
-		CMakeLists.txt || die
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=( "-DWITH_libgcrypt=ON" )
-	kde4-base_src_configure
-}
diff --git a/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild b/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild
index 7f36489f8a85..50890f6b54a1 100644
--- a/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild
+++ b/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild,v 1.2 2014/03/01 22:12:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.9.6a-r2.ebuild,v 1.3 2014/04/28 22:22:05 johu Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="