From: Roy Marples <uberlord@gentoo.org>
Date: Sat, 15 Oct 2005 08:05:22 +0000 (+0000)
Subject: plugins now really install to /usr/lib/openvpn
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=575506759d9070b5258ddc9dd40ab4d3b7d8f4b2;p=gentoo.git

plugins now really install to /usr/lib/openvpn
Package-Manager: portage-2.0.51.22-r3
---

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index bfde44451277..fb08ea0caa79 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # 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.46 2005/10/14 13:04:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.47 2005/10/15 08:05:22 uberlord Exp $
+
+  15 Oct 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.2-r3.ebuild:
+  plugins now really install to /usr/lib/openvpn
 
 *openvpn-2.0.2-r3 (14 Oct 2005)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 62acc312b9bc..0d8c22953ae7 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,14 +1,14 @@
-MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
-MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
-MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
-MD5 3cfae6f24887b9f5ca3dca1951864cb4 ChangeLog 7322
-MD5 977cd32e522ad50962ec444274a6fa61 openvpn-2.0.2-r3.ebuild 3478
 MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
+MD5 31347c727a5f65178bba691daa667343 ChangeLog 7446
+MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
+MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
+MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
 MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
-MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
+MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
 MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
-MD5 9a4a53360a88a0c7d9b9c020921e48a8 files/openvpn.init 1116
+MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
 MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
+MD5 9a4a53360a88a0c7d9b9c020921e48a8 files/openvpn.init 1116
diff --git a/net-misc/openvpn/openvpn-2.0.2-r3.ebuild b/net-misc/openvpn/openvpn-2.0.2-r3.ebuild
index 05a1679eac2d..6d04abcc3442 100644
--- a/net-misc/openvpn/openvpn-2.0.2-r3.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.2-r3.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.2-r3.ebuild,v 1.1 2005/10/14 13:04:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.2-r3.ebuild,v 1.2 2005/10/15 08:05:22 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -30,6 +30,7 @@ src_compile() {
 	# We cannot use use_enable with iproute2 as the Makefile stupidly
 	# enables it with --disable-iproute2
 	use iproute2 && myconf="${myconf} --enable-iproute2"
+	use minimal && myconf="${myconf} --disable-plugins"
 
 	econf ${myconf} \
 		$(use_enable ssl) \
@@ -81,8 +82,8 @@ src_install() {
 
 	# Install plugins
 	if ! use minimal ; then
-		dodir "/usr/share/${PN}/plugins"
-		exeinto "/usr/share/${PN}/plugins"
+		dodir "/usr/$(get_libdir)/${PN}"
+		exeinto "/usr/$(get_libdir)/${PN}"
 		doexe plugin/*/*.so
 	fi
 }