Don't use openssl but gnutls to switch the SSL implementation; default on gnutls; Move to EAPI=4

(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)

6 files changed, 49 insertions, 45 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 8cde8984d35c..aac31c075268 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.99 2012/02/14 19:14:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.100 2012/04/01 05:41:52 jlec Exp $
+
+  01 Apr 2012; Justin Lecher <jlec@gentoo.org> vpnc-0.5.3_p451.ebuild,
+  vpnc-0.5.3_p457-r1.ebuild, vpnc-0.5.3_p457-r2.ebuild, vpnc-0.5.3_p514.ebuild,
+  metadata.xml:
+  Don't use openssl but gnutls to switch the SSL implementation; default on
+  gnutls; Move to EAPI=4
 
 *vpnc-0.5.3_p514 (14 Feb 2012)
 
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index 5e6fc5290abe..c455f017954e 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -14,7 +14,6 @@
 		<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 05f2dc341cf2..5b7d56042bd9 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p451.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p451.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/01/04 08:52:52 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p451.ebuild,v 1.3 2012/04/01 05:41:52 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,20 +15,20 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	>=sys-apps/iproute2-2.6.19.20061214
 	bindist? ( net-libs/gnutls )
-	openssl? (
-		!bindist? ( dev-libs/openssl )
+	!bindist? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
 	)"
-
 RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"
 
 src_prepare() {
-	if use openssl && ! use bindist; then
+	if ! use gnutls && ! 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"
@@ -41,14 +41,14 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die
-	dodoc README TODO VERSION || die
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	dodoc README TODO VERSION
 	keepdir /etc/vpnc/scripts.d
-	newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
-	newconfd "${FILESDIR}/vpnc.confd" vpnc || die
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" vpnc
 	sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
 	# COPYING file resides here, should not be installed
-	rm -rf "${D}"/usr/share/doc/vpnc/
+	rm -rf "${D}"/usr/share/doc/vpnc/ || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild
index 2ab7b2409f63..203bf871d513 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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_p457-r1.ebuild,v 1.1 2011/02/12 23:57:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r1.ebuild,v 1.2 2012/04/01 05:41:52 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -15,20 +15,20 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	>=sys-apps/iproute2-2.6.19.20061214
 	bindist? ( net-libs/gnutls )
-	openssl? (
-		!bindist? ( dev-libs/openssl )
+	!bindist? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
 	)"
-
 RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"
 
 src_prepare() {
-	if use openssl && ! use bindist; then
+	if ! use gnutls && ! 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"
@@ -41,14 +41,14 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die
-	dodoc README TODO VERSION || die
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	dodoc README TODO VERSION
 	keepdir /etc/vpnc/scripts.d
-	newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
-	newconfd "${FILESDIR}/vpnc.confd" vpnc || die
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" vpnc
 	sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
 	# COPYING file resides here, should not be installed
-	rm -rf "${D}"/usr/share/doc/vpnc/
+	rm -rf "${D}"/usr/share/doc/vpnc/ || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
index db7c51f4f877..7b1d042c9a61 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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_p457-r2.ebuild,v 1.2 2012/02/14 19:14:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v 1.3 2012/04/01 05:41:52 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -16,21 +16,20 @@ SRC_URI="mirror://gentoo/${PN}-${PVR}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
 	bindist? ( net-libs/gnutls )
 	!bindist? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
 	)"
-
 RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"
 
 src_prepare() {
-	if use openssl && ! use bindist; then
+	if ! use gnutls && ! 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"
@@ -43,14 +42,14 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die
-	dodoc README TODO VERSION || die
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	dodoc README TODO VERSION
 	keepdir /etc/vpnc/scripts.d
-	newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
-	newconfd "${FILESDIR}/vpnc.confd" vpnc || die
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" vpnc
 	sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
 	# COPYING file resides here, should not be installed
-	rm -rf "${D}"/usr/share/doc/vpnc/
+	rm -rf "${D}"/usr/share/doc/vpnc/ || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/vpnc/vpnc-0.5.3_p514.ebuild b/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
index 369ef34409b1..2f3a798613d6 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
 # 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.1 2012/02/14 19:14:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v 1.2 2012/04/01 05:41:52 jlec Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PF}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="resolvconf openssl bindist"
+IUSE="resolvconf +gnutls bindist"
 
 DEPEND="
 	dev-lang/perl
@@ -26,14 +26,14 @@ DEPEND="
 	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
 	bindist? ( net-libs/gnutls )
 	!bindist? (
-		openssl? ( dev-libs/openssl )
-		!openssl? ( net-libs/gnutls )
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
 	)"
 RDEPEND="${DEPEND}
 	resolvconf? ( net-dns/openresolv )"
 
 src_prepare() {
-	if use openssl && ! use bindist; then
+	if ! use gnutls && ! use bindist; then
 		sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile	|| die
 		ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"
 		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"