added ebuild for 2.0, fixes #50767. also updated metadata.xml, took over maintainership. did some cleanup, removed older versions. introduced support for the examples useflag.

Package-Manager: portage-2.0.51.20-r5

17 files changed, 87 insertions, 250 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 2c75e76fdf36..283b814a3470 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,16 @@
 # 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.24 2005/02/05 16:59:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.25 2005/04/29 17:03:07 luckyduck Exp $
+
+*openvpn-2.0 (29 Apr 2005)
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -openvpn-1.1.0.ebuild, -openvpn-1.3.1.ebuild, -openvpn-1.3.2.ebuild,
+  -openvpn-1.3.2-r1.ebuild, -openvpn-1.4.2.ebuild, -openvpn-1.5.0.ebuild,
+  +openvpn-2.0.ebuild:
+  added ebuild for 2.0, fixes #50767. also updated metadata.xml, took over
+  maintainership. did some cleanup, removed older versions. introduced support
+  for the examples useflag.
 
   05 Feb 2005; <solar@gentoo.org> openvpn-1.5.0-r1.ebuild,
   openvpn-1.6.0.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 213e53a6cfcb..5e1c8bd036b9 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -2,30 +2,18 @@
 Hash: SHA1
 
 MD5 2eb1b0980bacef7c6f118b64621018f2 openvpn-1.6.0.ebuild 1271
-MD5 0a039af071167cdf7c724541ae348239 openvpn-1.3.2.ebuild 775
-MD5 c03d54e2f2a0c6ce36ebcc497480554d openvpn-1.4.2.ebuild 827
-MD5 d542612325f1d195c2f61424a61b9610 openvpn-1.5.0.ebuild 1132
-MD5 f07d44f3996282661ecba0d3c62fe47a openvpn-1.1.0.ebuild 776
-MD5 ca52de3de685474a90cf54dcf04a5c79 ChangeLog 3424
-MD5 5d8a3c33a53b5d020b594dd7cfbb325c openvpn-1.3.1.ebuild 776
-MD5 423c6cab5ca8c828963eea965c8b6486 metadata.xml 461
-MD5 d4881ece5536776e2f2e55532591838d openvpn-1.3.2-r1.ebuild 862
+MD5 d4a5486162f41075ecaca42f7ea77fb6 openvpn-2.0.ebuild 1585
+MD5 a27c3f9a6bfbcc3a6c0da7e2c54e1344 ChangeLog 3873
+MD5 0359acb29d44934b3981716bf54cbb97 metadata.xml 443
 MD5 ccf9bfc596a4cea777bf713c995dc664 openvpn-1.5.0-r1.ebuild 1256
-MD5 7a773fcca001e35d171b15d68d435d97 files/digest-openvpn-1.1.0 65
-MD5 45d5378d808bbb444fe4435d781b4329 files/digest-openvpn-1.3.1 65
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2 65
-MD5 e21b10320b90f5cb54d5e90d2d9ad8eb files/digest-openvpn-1.4.2 65
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0 65
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 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.2.4 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iQCVAwUBQgT7cJ4WFLgrx1GWAQLRzgP/W9aNgW/uG8AXVXrxA6JAOTNN/3nRMSUg
-N8nsaEqDAP/0/pcM0XhLQ9SLLCgfvglPbX8iYEg0Thv3qKqqkTh6kezFyh1s9vAR
-qmYO+x//tRifs00/DrD41RztUGHtkDek4Jh2L8q9+6pCPjIEGq8VcrU6niUYl3Fb
-kLEWoYrEFwA=
-=D3vR
+iD8DBQFCcmjg06ebR+OMO78RAt01AJ9UmTE5n70Te/tMpZB63DnCmBjlrQCgkiB7
+WTNfYrQ1N0ebpOmf7yBWNVI=
+=ccX6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/files/digest-openvpn-1.1.0 b/net-misc/openvpn/files/digest-openvpn-1.1.0
deleted file mode 100644
index 90839383d5e5..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bcbdb086ea6f6647f6d740e0f2b883a openvpn-1.1.0.tar.gz 114994
diff --git a/net-misc/openvpn/files/digest-openvpn-1.3.1 b/net-misc/openvpn/files/digest-openvpn-1.3.1
deleted file mode 100644
index 20881daea500..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 935733f1c9cda587bcd0dfde2e610803 openvpn-1.3.1.tar.gz 231461
diff --git a/net-misc/openvpn/files/digest-openvpn-1.3.2 b/net-misc/openvpn/files/digest-openvpn-1.3.2
deleted file mode 100644
index 3e12685c0770..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f5f92730566401797943561f7cae6e openvpn-1.3.2.tar.gz 234699
diff --git a/net-misc/openvpn/files/digest-openvpn-1.3.2-r1 b/net-misc/openvpn/files/digest-openvpn-1.3.2-r1
deleted file mode 100644
index 3e12685c0770..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57f5f92730566401797943561f7cae6e openvpn-1.3.2.tar.gz 234699
diff --git a/net-misc/openvpn/files/digest-openvpn-1.4.2 b/net-misc/openvpn/files/digest-openvpn-1.4.2
deleted file mode 100644
index 83d8a1b7b062..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9804fb402cc87a686ab2e82ce5e93e6d openvpn-1.4.2.tar.gz 277351
diff --git a/net-misc/openvpn/files/digest-openvpn-1.5.0 b/net-misc/openvpn/files/digest-openvpn-1.5.0
deleted file mode 100644
index 381ed4f7391a..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55d7ce958bb2ccf3d3204d1350c27179 openvpn-1.5.0.tar.gz 403792
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0 b/net-misc/openvpn/files/digest-openvpn-2.0
new file mode 100644
index 000000000000..04f9815947df
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0
@@ -0,0 +1 @@
+MD5 7401faebc6baee9add32608709c54eec openvpn-2.0.tar.gz 639201
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
index f0e4665b5cd5..6b6d4995da3c 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-misc/openvpn/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>secure-tunneling</herd>
+<herd>no-herd</herd>
 <maintainer>
-  <email>warpzero@gentoo.org</email>
-  <name>Joshua Charles Campbell</name>
+  <email>luckyduck@gentoo.org</email>
+  <name>Jan Brinkmann</name>
 </maintainer>
 <longdescription>OpenVPN is an easy-to-use, robust and highly 
 configurable VPN daemon which can be used to securely link two or more 
diff --git a/net-misc/openvpn/openvpn-1.1.0.ebuild b/net-misc/openvpn/openvpn-1.1.0.ebuild
deleted file mode 100644
index ac49a026bb45..000000000000
--- a/net-misc/openvpn/openvpn-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.1.0.ebuild,v 1.14 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
-SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
-HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND=">=dev-libs/lzo-1.07
-		virtual/linux-sources
-		ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-	./autogen.sh || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
-
-}
diff --git a/net-misc/openvpn/openvpn-1.3.1.ebuild b/net-misc/openvpn/openvpn-1.3.1.ebuild
deleted file mode 100644
index 93ffac11425e..000000000000
--- a/net-misc/openvpn/openvpn-1.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.3.1.ebuild,v 1.12 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
-SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
-HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND=">=dev-libs/lzo-1.07
-		virtual/linux-sources
-		ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-	./autogen.sh || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
-
-}
diff --git a/net-misc/openvpn/openvpn-1.3.2-r1.ebuild b/net-misc/openvpn/openvpn-1.3.2-r1.ebuild
deleted file mode 100644
index 46703f378778..000000000000
--- a/net-misc/openvpn/openvpn-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.3.2-r1.ebuild,v 1.8 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
-SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
-HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-
-DEPEND=">=dev-libs/lzo-1.07
-		virtual/linux-sources
-		ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-	./autogen.sh || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
-	insinto /etc/init.d ; doins ${FILESDIR}/openvpn
-	chmod 755 ${D}/etc/init.d/openvpn
-
-}
diff --git a/net-misc/openvpn/openvpn-1.3.2.ebuild b/net-misc/openvpn/openvpn-1.3.2.ebuild
deleted file mode 100644
index 60bbc5d42b3b..000000000000
--- a/net-misc/openvpn/openvpn-1.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.3.2.ebuild,v 1.8 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
-SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
-HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-
-DEPEND=">=dev-libs/lzo-1.07
-		virtual/linux-sources
-		ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-	./autogen.sh || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
-
-}
diff --git a/net-misc/openvpn/openvpn-1.4.2.ebuild b/net-misc/openvpn/openvpn-1.4.2.ebuild
deleted file mode 100644
index 545dab34c032..000000000000
--- a/net-misc/openvpn/openvpn-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.4.2.ebuild,v 1.6 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application"
-SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
-HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND=">=dev-libs/lzo-1.07
-	virtual/linux-sources
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-#	./autogen.sh || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/openvpn
-}
diff --git a/net-misc/openvpn/openvpn-1.5.0.ebuild b/net-misc/openvpn/openvpn-1.5.0.ebuild
deleted file mode 100644
index 35b6333dc7af..000000000000
--- a/net-misc/openvpn/openvpn-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.ebuild,v 1.7 2005/02/05 16:59:59 solar Exp $
-
-IUSE="ssl"
-
-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"
-
-DEPEND=">=dev-libs/lzo-1.07
-	virtual/os-headers
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_compile() {
-
-	local myconf
-
-	use ssl || myconf='--disable-ssl --disable-crypto'
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES 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."
-	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-2.0.ebuild b/net-misc/openvpn/openvpn-2.0.ebuild
new file mode 100644
index 000000000000..7aa1ac3db519
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0.ebuild
@@ -0,0 +1,64 @@
+# 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-2.0.ebuild,v 1.1 2005/04/29 17:03:08 luckyduck Exp $
+
+inherit gnuconfig
+
+
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ppc-macos ~amd64"
+IUSE="examples ssl threads"
+
+RDEPEND=">=dev-libs/lzo-1.07
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack ${A}
+	gnuconfig_update
+}
+
+src_compile() {
+	econf \
+		$(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"
+
+	# install documentation
+	dodoc AUTHORS ChangeLog INSTALL PORTS README
+
+	# Empty dir
+	dodir /etc/openvpn
+	keepdir /etc/openvpn
+
+	# Install upstream init script for Gentoo
+	sed -i "s:/usr/local:/usr:" gentoo/openvpn.init
+	newinitd ${S}/gentoo/openvpn.init openvpn
+
+	# Install easy-rsa stuffs
+	dodir /usr/share/${PN}/easy-rsa
+	exeinto /usr/share/${PN}/easy-rsa
+	doexe easy-rsa/*
+	exeopts -m0644
+
+	# install examples, controlled by the respective useflag
+	if use examples; then
+		local sampledir="/usr/share/doc/${PN}/examples"
+		dodir ${sampledir}
+
+		cp -r sample-{config-files,keys,scripts} ${D}${sampledir}
+		cp -r contrib/ ${D}${sampledir}
+	fi
+}