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

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 30 insertions, 26 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/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 )"