marked 1.6.0 stable on amd64 and x86, some cosmetic changes.

(Portage version: 2.0.51.20-r5)

4 files changed, 38 insertions, 42 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 132421ce21af..29b30ad1037e 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.27 2005/04/29 18:35:44 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.28 2005/05/01 09:02:35 luckyduck Exp $
+
+  01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  marked 1.6.0 stable on amd64 and x86, some cosmetic changes.
 
   29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml:
   herd -> secure-tunneling
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 409fe685e323..8adaad3d3e93 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2eb1b0980bacef7c6f118b64621018f2 openvpn-1.6.0.ebuild 1271
+MD5 09706035d1120207dea2d6afc6cfe859 openvpn-1.6.0.ebuild 1337
 MD5 cf58aa3553ff782d02e82f8045ec0217 openvpn-2.0.ebuild 1920
-MD5 d33767f789fc591036955bd629d20a91 ChangeLog 4073
+MD5 b6ea5b0b3c18f1e63ca413f027fba9c7 ChangeLog 4238
 MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
-MD5 ccf9bfc596a4cea777bf713c995dc664 openvpn-1.5.0-r1.ebuild 1256
+MD5 931d6fac85f3d9251186242c4e6615f8 openvpn-1.5.0-r1.ebuild 1330
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
 MD5 a455c11efdca8a3caadbac543345490e files/digest-openvpn-2.0 63
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
 MD5 62150e7ee165ac0f0db05fbbfefe17bd files/openvpn 1019
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCcn6W06ebR+OMO78RAiZPAKCBlwRqjADsbkjWH/PcPDb3Yj9JsgCeKd1x
-24nUlgctSZKcm/xiEiet/6c=
-=b+N2
------END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
index 524e2ed95791..c52f1240e7f3 100644
--- a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.11 2005/02/05 16:59:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.12 2005/05/01 09:02:35 luckyduck Exp $
 
 inherit gnuconfig
 
-IUSE="ssl threads"
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha ~amd64"
+IUSE="ssl threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
@@ -23,27 +24,26 @@ src_unpack() {
 }
 
 src_compile() {
-
 	econf \
-		`use_enable ssl` \
-		`use_enable ssl crypto` \
-		`use_enable threads pthread` \
-		|| die
-	emake || die
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
+	make DESTDIR=${D} install || die "make install failed"
 
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING ChangeLog INSTALL PORTS README
+	dodoc ChangeLog INSTALL PORTS README
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/openvpn
 }
 
-
 pkg_postinst() {
-	einfo "The init.d script that comes with OpenVPN expects directories /etc/openvpn/*/ with a local.conf and any supporting files, such as keys."
+	einfo "The init.d script that comes with OpenVPN expects directories"
+	einfo "/etc/openvpn/*/ with a local.conf and any supporting files, "
+	einfo "such as keys."
 	ewarn "This version of OpenVPN is NOT COMPATIBLE with 1.4.2!"
 	ewarn "If you need compatibility with 1.4.2 please emerge that version."
 }
diff --git a/net-misc/openvpn/openvpn-1.6.0.ebuild b/net-misc/openvpn/openvpn-1.6.0.ebuild
index 788f2ef94684..0cbb934b98cb 100644
--- a/net-misc/openvpn/openvpn-1.6.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.6.0.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.6.0.ebuild,v 1.7 2005/02/05 16:59:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.6.0.ebuild,v 1.8 2005/05/01 09:02:35 luckyduck Exp $
 
 inherit gnuconfig
 
-IUSE="ssl threads"
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ppc-macos ~amd64"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~ppc-macos amd64"
+IUSE="ssl threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
@@ -24,24 +25,25 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		`use_enable ssl` \
-		`use_enable ssl crypto` \
-		`use_enable threads pthread` \
-		|| die
-	emake || die
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 
-	dodoc COPYING ChangeLog INSTALL PORTS README
+	dodoc ChangeLog INSTALL PORTS README
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/openvpn
 }
 
-
 pkg_postinst() {
-	einfo "The init.d script that comes with OpenVPN expects directories /etc/openvpn/*/ with a local.conf and any supporting files, such as keys."
+	einfo "The init.d script that comes with OpenVPN expects directories"
+	einfo "/etc/openvpn/*/ with a local.conf and any supporting files,"
+	einfo "such as keys."
 	ewarn "This version of OpenVPN is NOT COMPATIBLE with 1.4.2!"
 	ewarn "If you need compatibility with 1.4.2 please emerge that version."
 }