net-misc/vpnc: Use REQUIRED_USE to sanitize *DEPENDS, thanks Dmitri Bogomolov for the initial patch, #407965

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 36 insertions, 32 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 2a39f6d4b747..1ee1c2b06300 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vpnc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.102 2012/12/27 23:29:31 fauli Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.103 2013/02/06 15:25:07 jlec Exp $
+
+  06 Feb 2013; Justin Lecher <jlec@gentoo.org> vpnc-0.5.3_p514.ebuild,
+  metadata.xml:
+  Use REQUIRED_USE to sanitize *DEPENDS, thanks Dmitri Bogomolov for the
+  initial patch, #407965
 
   27 Dec 2012; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   add local description of bindist USE flag to clarify on the whies and about,
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index e14cdc0434c7..152feadaa9dc 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -14,13 +14,13 @@ EBUILD vpnc-0.5.3.ebuild 1842 SHA256 adbe7894474d4a3132f2e7fc157c9a95777d778a0c1
 EBUILD vpnc-0.5.3_p451.ebuild 2330 SHA256 61550287b3dd4e302768f232e6828596ee23d0410417e12b970b07d199c7e358 SHA512 5686a24a3ee8dce42cc85d04037c4645189f9e96d7640b71fe1a9d9b4aef63f592db762fd71693bd47616fd42c7752b5a5152aa5b8ecf3de79ee7d5d3789e395 WHIRLPOOL 8d75df1fc43f38531e258dfe20738f8eb474e638d1644df7e1145e360c067854db2d12d6a9ed710ac0d034387fef2c60d0a792251e32277e7fd62762d8699781
 EBUILD vpnc-0.5.3_p457-r1.ebuild 2333 SHA256 63b6b6b766c03ebdce23985c0cb4ea0415e65785c75ef23d32f925573b2b2a2a SHA512 d25db1d54df21c89d7d69f479920c1af704ba4f8f1b5607ce82bd4c781ff8d37647606a2fcf10016d5b0800b09120eb2d01223ee511eb8aa362bc9251b80c11d WHIRLPOOL 7efc9a142cac9d2fcd4f02c8309890e713cc1db481874ecc0345bc6432df4de3b7fc9d28f1c5d6098fcd58fc09d7e855cc56e11c976e65f845ef2a06e271f91c
 EBUILD vpnc-0.5.3_p457-r2.ebuild 2383 SHA256 d4b00edceaec27acf5c5117b1f25fbd9b4821138b68c98a3b38502302d67683d SHA512 090aa58988bca1e590193edb25409df17458f7727fc90aeb250df65ca141d326c379055d3672b80099494f2a5ee86cc2dce9ed05603bd145e9a0321f938a96dc WHIRLPOOL b12d61382b6d75cba5468f8cf73793f4277c9443ae5f46a6e566641405a689dbe088bbcec7f8dce41ec1983fa6208ad30c93c02fdd835f6ea1d2df411a63189c
-EBUILD vpnc-0.5.3_p514.ebuild 2465 SHA256 e25c4ba0a0a8ebff499efaae4f624dce3de875b2826fa7fc3042d8b7e5e5eeaf SHA512 b33110f6ec9740f6973b7aafca71575dceeca6432fca8df4ccfafe284da66cb0cedb5548a234bba2a3a6f4cd06a56c385b996bc2baf5e1ac5c4c81538b8b3e9e WHIRLPOOL cd70293f1a94a8f43e40669a33c4867aa8f9503e4427e3ddb265153f0baaa3d44b0ff7f85e94de6a1558a82668afe43a7915d79a056f93a216daaae2119a1edf
-MISC ChangeLog 16623 SHA256 0dfce8941a52b158f1f6ede682343eebb6d8cdd3f639ae0f152b4bb016be9f2f SHA512 c1bfb779ae45c467a841de1830d976cbc36f4580b8da24c5c2693154476ed8858ce022d2bd5a6fe8a12e8e6e0f7769222ac80b8e994b646231000278fe0c9e6e WHIRLPOOL 3de9a1a7efebf65d6ca80af58cf9c1d5c041b24b1a37609d754c3a6a077254c7d37705d5ef55a1c499407bea7fe22194212c893944bf8946ffb44694d32c2923
-MISC metadata.xml 794 SHA256 5c72939207e7327aab782744aabff154eaaa18dfdc5329466e8f68d8003e8619 SHA512 5939d8813651dad3101702663a94218ba16e9eeaec1d3a050b5a17dabe8e7b85ba58e2cda024e7caf77331af12e7d492b6d45761c88962922e4a49946b4a7304 WHIRLPOOL 142da0cbbf00bbf420cc3600682bc86221dde2cce65efa41807b0c791324982f4710ca9a2a1e6e384155bf428345848c55d758e3b11c8c978eca42315f93a7f7
+EBUILD vpnc-0.5.3_p514.ebuild 2451 SHA256 6e67aeffcee1a1b5f3f6a0a943233f499b8b54ec3a9dcd9e72139055c5b63cce SHA512 fc02b473041142acb0716a6d0d077d09fc0a338ed4968a70fffaf3daa09cc17afc4604855359e0e46f1f517022b87e2d3b8ab245fe6b07977704488191e2ccc6 WHIRLPOOL aa11ec702b1aaeb1ca7168bfad37af902735941c49f7d96ee466ed4832fca23efdeabbc9181d5e4eadb5c1414099677f472f273aa7b828f3e003f748a88626a7
+MISC ChangeLog 16808 SHA256 8f3ee4d2395193c3843c871576b1f228d5de4ac654b105e07f0be2812b91080c SHA512 265f69257d609df215c85ee882ee0e9d946e1dd34d9f06864f9ea477f4b5d5a2f1a5209ff4fbb05593cb93a5e9d717c5005b43f20b753cd3edadef4fab61065f WHIRLPOOL 59be41905b4c92e3357ea688dec589670a4cfbaa6150ee8906c5463e9866baa8711dd28fef0d7e02e1aa9c10493221e7ae0252dce5eb97d28c031d20376d5fbc
+MISC metadata.xml 820 SHA256 c989763fa8086ab1eb19e004672f9dc95581f6a49bbae0b1d77b0e725bd1227d SHA512 0a84e2495250b479a0628933bbf8c8e048304c03e40313393eeef395c65271d5a1d99aa73e740eaf710c2b29d2286f1f67b636dd89bdd24f127f6d2c1b76bebc WHIRLPOOL 663bad46b4e89c9ce37eedc9594d7b94e35f9a10df4f9d4795a25802ccaa08f44a8f845630e1cf23d1c0aa4503c1b0a160a52b1a7486b614a2296a2dd74ee88e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDc2goACgkQNQqtfCuFneOVcgCgm9+ms2QuZ6+N0G+5HGIGCS26
-DwwAnRi0ssVrysf16St+y3bHdcV6/E3Q
-=GZiG
+iEYEAREIAAYFAlESddQACgkQgAnW8HDreRbG/wCfd4sTrzMJrNKKMzKHmgxo6M2h
+zi8An0nsM9vImRKY7yTDK83C2qQbbk8i
+=B+9C
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index d94abc54d8e4..05c63678ec88 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>ljakab@ac.upc.edu</email>
-		<name>Loránd Jakab</name>
-	</maintainer>
-	<maintainer>
-		<email>mmokrejs@fold.natur.cuni.cz</email>
-		<name>Martin Mokrejs</name>
-	</maintainer>
-	<maintainer>
-		<email>fauli@gentoo.org</email>
-		<name>Christian Faulhammer</name>
-	</maintainer>
-	<use>
-		<flag name="bindist">Using GnuTLS for SSL support as redistribution with OpenSSL as provider violates GPL</flag>
-		<flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
-		<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
-	</use>
+  <maintainer>
+    <email>ljakab@ac.upc.edu</email>
+    <name>Loránd Jakab</name>
+  </maintainer>
+  <maintainer>
+    <email>mmokrejs@fold.natur.cuni.cz</email>
+    <name>Martin Mokrejs</name>
+  </maintainer>
+  <maintainer>
+    <email>fauli@gentoo.org</email>
+    <name>Christian Faulhammer</name>
+  </maintainer>
+  <use>
+    <flag name="bindist">Using GnuTLS for SSL support as redistribution with OpenSSL as provider violates GPL</flag>
+    <flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
+    <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/net-misc/vpnc/vpnc-0.5.3_p514.ebuild b/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
index 293edcd51b66..eeb2506da581 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
@@ -1,6 +1,6 @@
-# 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/vpnc/vpnc-0.5.3_p514.ebuild,v 1.3 2012/07/19 20:38:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v 1.4 2013/02/06 15:25:07 jlec Exp $
 
 EAPI=4
 
@@ -20,15 +20,14 @@ SLOT="0"
 KEYWORDS="~amd64 arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="resolvconf +gnutls bindist"
 
+REQUIRED_USE="bindist? ( gnutls )"
+
 DEPEND="
 	dev-lang/perl
 	dev-libs/libgcrypt
 	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
-	bindist? ( net-libs/gnutls )
-	!bindist? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)"
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"