easy-rsa now gets installed properly, #111351

Package-Manager: portage-2.0.51.22-r3

4 files changed, 27 insertions, 35 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 736745d9cf98..9bd115770611 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.54 2005/11/03 14:05:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.55 2005/11/03 14:36:55 uberlord Exp $
+
+  03 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.4-r1.ebuild,
+  openvpn-2.0.4-r2.ebuild:
+  easy-rsa now gets installed properly, #111351
 
   03 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   openvpn-2.0.4-r1.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 6fc62ad730ee..e26d1dc5d5b6 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
-MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
-MD5 f7ea94e030ba747b42012f62f51c8032 openvpn-2.0.4-r2.ebuild 3850
-MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
-MD5 d5a6447ee470ed4d00a993a5702cb543 openvpn-2.0.4-r1.ebuild 3185
+MD5 c7972a16f833a3ac9bd624e365f200a8 openvpn-2.0.4-r1.ebuild 3175
+MD5 4ea9399739b319523acb8de014bf498d openvpn-2.0.4-r2.ebuild 3841
+MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
-MD5 93b8aa9b6fac5538eb091122ff224e74 ChangeLog 8789
 MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
-MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
+MD5 2951fb0fa792a0793c638a666129b498 ChangeLog 8939
+MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
+MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
+MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
+MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
 MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
-MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
 MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
-MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
+MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
 MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r2 65
-MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDahktKRy60XGEcJIRAlZGAJ4qhXnfmsMf+KWprAqTW6A9J+5orwCgmb7o
-DreHhSx2j/0MKUyypKanm3o=
-=ja4E
------END PGP SIGNATURE-----
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
diff --git a/net-misc/openvpn/openvpn-2.0.4-r1.ebuild b/net-misc/openvpn/openvpn-2.0.4-r1.ebuild
index 71f37ce80aca..8938d5ce2d1a 100644
--- a/net-misc/openvpn/openvpn-2.0.4-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.3 2005/11/03 14:05:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.4-r1.ebuild,v 1.4 2005/11/03 14:36:55 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -74,11 +74,11 @@ src_install() {
 	# Install the init script
 	newinitd "${FILESDIR}/openvpn" openvpn
 
-	# Install easy-rsa stuffs
-	dodir "/usr/share/${PN}/easy-rsa"
+	# Install easy-rsa stuff
 	exeinto "/usr/share/${PN}/easy-rsa"
-	doexe easy-rsa/2.0/*
-	exeopts -m0644
+	doexe easy-rsa/*-*
+	insinto "/usr/share/${PN}/easy-rsa"
+	doins easy-rsa/{README,openssl.cnf,vars}
 
 	# install examples, controlled by the respective useflag
 	if use examples ; then
@@ -90,7 +90,6 @@ src_install() {
 
 	# Install plugins
 	if ! use minimal ; then
-		dodir "/usr/$(get_libdir)/${PN}"
 		exeinto "/usr/$(get_libdir)/${PN}"
 		doexe plugin/*/*.so
 	fi
diff --git a/net-misc/openvpn/openvpn-2.0.4-r2.ebuild b/net-misc/openvpn/openvpn-2.0.4-r2.ebuild
index edf88e46363d..738090b9b21f 100644
--- a/net-misc/openvpn/openvpn-2.0.4-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r2.ebuild,v 1.2 2005/11/02 20:13:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.4-r2.ebuild,v 1.3 2005/11/03 14:36:55 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -74,11 +74,11 @@ src_install() {
 	# Install the init script
 	newinitd "${FILESDIR}/openvpn.init" openvpn
 
-	# Install easy-rsa stuffs
-	dodir "/usr/share/${PN}/easy-rsa"
+	# Install easy-rsa stuff
 	exeinto "/usr/share/${PN}/easy-rsa"
-	doexe easy-rsa/2.0/*
-	exeopts -m0644
+	doexe easy-rsa/*-*
+	insinto "/usr/share/${PN}/easy-rsa"
+	doins easy-rsa/{README,openssl.cnf,vars}
 
 	# install examples, controlled by the respective useflag
 	if use examples ; then
@@ -90,7 +90,6 @@ src_install() {
 
 	# Install plugins
 	if ! use minimal ; then
-		dodir "/usr/$(get_libdir)/${PN}"
 		exeinto "/usr/$(get_libdir)/${PN}"
 		doexe plugin/*/*.so
 	fi