revert USE flag logic, so GnuTLS is used as default for hybrid auth and OpenSSL only on request

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 17 insertions, 12 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index ca78787fd33c..387596779148 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.91 2011/01/03 15:24:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.92 2011/01/04 08:52:52 fauli Exp $
+
+  04 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+  vpnc-0.5.3_p451.ebuild:
+  revert USE flag logic, so GnuTLS is used as default for hybrid auth and
+  OpenSSL only on request
 
 *vpnc-0.5.3_p451 (03 Jan 2011)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 79e15236baf1..3da37618c771 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -9,13 +9,13 @@ DIST vpnc-0.5.3_p449.tar.bz2 106105 RMD160 def2377463de01a505ed58aeb41fcb7fe427d
 DIST vpnc-0.5.3_p451.tar.bz2 108492 RMD160 3e3eb6c0832487e526a236c7d20d9a86d722ba99 SHA1 92ec36e79ebbdd29c9de8210857fe7105736f5e8 SHA256 8a4371489e6802f9b0d18de916e05eb46b4b8b2cd150120180bd353955d83812
 EBUILD vpnc-0.5.3.ebuild 1842 RMD160 3500de75409ade3e401cca9debd5bd63b591dec8 SHA1 4928bddccb65cf69aff31859cbec48c15a06f0c4 SHA256 adbe7894474d4a3132f2e7fc157c9a95777d778a0c133fdbc256d5852ddab5d7
 EBUILD vpnc-0.5.3_p449-r1.ebuild 1347 RMD160 2c098a43242f10022171d8f390dea7b8720762ec SHA1 f9950bb4b58105cbb1d27fd92bf397e447d70ca2 SHA256 de9f54e36cba75c4c6b51a214f3d0c99c00ce9fe0c00ad97e386e1cc5a3de0cf
-EBUILD vpnc-0.5.3_p451.ebuild 2351 RMD160 a08b7bed67e46db344f55f49017860c63b452d10 SHA1 c7d755218f8e7e72c486efb701e3fa90f8ede551 SHA256 ccb6f9686108d997858e9528ae3ad9dabf02aa1e771952b63b305cd102d8e22c
-MISC ChangeLog 14432 RMD160 4b2acac0d1623be11cc8a57ea07b826e83877d01 SHA1 69fd9e3523a874cb81ead16219ce8b6ae4eca03d SHA256 6c756af4615c8224631ac02fbf38996d8634acc3c6148c8e2546519b7778bd27
-MISC metadata.xml 517 RMD160 8de331cd55504c4ad31f3f2c5ddc469aa3804a7e SHA1 2cf0856e05ec858c7f75c41842875c3c475e7b19 SHA256 afeb00dbb4938f0be2482ba7f85facdfbeb55d5f62383000a6507b22612d61e6
+EBUILD vpnc-0.5.3_p451.ebuild 2322 RMD160 98c61c27fcaca7c726d45545d21402b5007dc4bd SHA1 2ea39250cd237a52e7a06f42506f597035af75ce SHA256 fb2b101dd5c79b16c4ba856837c79bdd1c968456bfbbe42b5dcfc17128af5631
+MISC ChangeLog 14614 RMD160 5a9ebd8469f9f16215496005668aed0f53909613 SHA1 0e9316589731591101c7d0ec169c4d819f26224e SHA256 9c1a6001448b368f2a97b3f052f86eda4defd8e1b9547dc871a170c5d81afdd0
+MISC metadata.xml 682 RMD160 e092e732e9df753e80e330f54d81652da656169d SHA1 541c765cd10e78854dca40a43a16c5310095d480 SHA256 ff90e953f404fb817b61bfc5eab019610d9eeab79f6b7013673d83f98b5b3b62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0h6vcACgkQNQqtfCuFnePpBgCfWgL+EhMJykmUmcmrWfs4OxSZ
-90gAn1wmWsYWeP+OWlpDWMLwYgGYI/3B
-=ZR1w
+iEYEARECAAYFAk0i4LsACgkQNQqtfCuFneP/5ACeP3R5mpfeADcRHn9aMsH1aI+a
+bjkAn2uPGDsvSK956O+jqkDes8b6g4OK
+=89xQ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index f1e3da9a585e..5864d32b4ccb 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -7,6 +7,7 @@
     <name>Christian Faulhammer</name>
   </maintainer>
   <use>
+    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hybrid-auth instead of <pkg>net-libs/gnutls, may cause license issues when redistributing</pkg>.</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>
diff --git a/net-misc/vpnc/vpnc-0.5.3_p451.ebuild b/net-misc/vpnc/vpnc-0.5.3_p451.ebuild
index 5b9eb8f42ac0..05f2dc341cf2 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p451.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p451.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_p451.ebuild,v 1.1 2011/01/03 15:24:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v 1.2 2011/01/04 08:52:52 fauli Exp $
 
 EAPI=3
 
@@ -15,13 +15,12 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf gnutls bindist"
+IUSE="resolvconf openssl bindist"
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	>=sys-apps/iproute2-2.6.19.20061214
-	gnutls? ( net-libs/gnutls )
 	bindist? ( net-libs/gnutls )
-	!gnutls? (
+	openssl? (
 		!bindist? ( dev-libs/openssl )
 	)"
 
@@ -29,7 +28,7 @@ RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"
 
 src_prepare() {
-	if ! use gnutls && ! use bindist; then
+	if use openssl && ! use bindist; then
 		sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${S}"/Makefile \
 			|| die
 		ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"