Update live openvpn ebuild with changes for 2.3.0+ (bug 415995).

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

3 files changed, 26 insertions, 46 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index c20aa7702200..766ffb4c3eaf 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.242 2013/01/12 14:32:10 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.243 2013/01/12 14:43:29 djc Exp $
+
+  12 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+  Update live ebuild with changes for 2.3.0 (bug 415995).
 
   12 Jan 2013; Dirkjan Ochtman <djc@gentoo.org>
   -files/openvpn-2.1_rc13-peercred.patch, -files/openvpn-2.1_rc20-pkcs11.patch,
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 786debdeccc8..aa05044407df 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -13,13 +13,13 @@ DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcf
 DIST openvpn-2.3.0.tar.gz 1130659 SHA256 4602a8d0f66dfa6ac10b7abfeba35260d7d4c570948f6eba5f8216ffa3a2c490 SHA512 ebac619dd746406d6751d84391480f7eae2b6c442bbacf1ce6e3d21952ee85bccc7ca2d526fe04cb7ecde749d2a5abb4e787c0e63c349818c7129f5747a2769a WHIRLPOOL 07dc500cb524db43dc75c0fdb67f01411e7831330229b71059c52e4df98afd2b665a016f594edded7652b23fbaa9671978c86f8eb87eb86844679332d3a3d042
 EBUILD openvpn-2.2.2.ebuild 4866 SHA256 280336add46c76deed96468d9f53ddb409a4db51c9e33b1b6fe8e4049802f948 SHA512 26a0756be18ae1c38875653f272a99a3c3a6502f7084171408eaa8685975e4b36478fca624a6b9253428bdc3249b21801f3c61cb4542d7c4f10aee8012ebd61b WHIRLPOOL 8d32af07d7dd99985346771c49688370a630b84c6c6041967da9394d107df7f47232da986f423d901f875041ec301a76c1437d3c8b3d6065f8159e3160c84145
 EBUILD openvpn-2.3.0.ebuild 3678 SHA256 060011efbc9172ff3ddb1a78189e2e964edadd6ba98f53b401f04b96d340cc5b SHA512 cd0c69aa588a2fe441af211d10d7bba36428759a3a60d940d076f8da6d16c6b8ca86679c41eaba4e53253b9be592ae6ed2f19fc17a9812a77b505e82947e18d0 WHIRLPOOL 35055446c6d4c97a37fd7a053d354b209ad51521d8bb0e4391fcbeeb3a738a66187c9db9928d3d5bc976e1a28c299f4222cea45dce54811f841fb7bf77e9e91b
-EBUILD openvpn-9999.ebuild 4151 SHA256 105b047772523ae82d5bd6e7faba4a28f240c954379c73384747aaeb0610e36d SHA512 68163da7bd10d6928ac83ea5423c7e90b2c06f471c4444cbcfcc8fb6fdbd52638ea365d6697992fbc32b0e21df69d72ee69ce8edd433a71826a8d56d55bb2d21 WHIRLPOOL 7abe75f4f7e7be3bf93b30b3c245cc334e740662d2d197ac612429beb9dba38d34aeb6f92584101b70a5fce63139606e8b495b21d8b53a889bd98eb262c544b8
-MISC ChangeLog 35185 SHA256 3e5af9ad0debb49c3ba131a6e4db9fbc69b20fedd4cd8dd6dabea4a743966bd4 SHA512 d59c26b5dac5c05f4d1a8af6a90a97d0b9ccd404141fbf70fb9e7542862ec4f2be78216fd2a86e1d1de97a4984b901f2e2fb3167a84d1b1e286eccf54b8944a5 WHIRLPOOL 49413ca8b8489ca6b3ef9ee90ddf680a007e96a53e3109b440c5f301451e0a606d07501b7cc29b4930870580e2353c434356b18159d28ab0b2d0f7ea41370cd0
+EBUILD openvpn-9999.ebuild 3765 SHA256 2bbffee6e7ff0e8b9ed6fa4d0fe016c80cbc9de58472e478c3697692b2080ca0 SHA512 21b7cd15f30321dab3be947aeb86386bb90c94d0a2365e30834223c68af43d676cb9613cfd3c96327da7778c81d589f83074d5071094d14e0307d7d3c2bf1f4e WHIRLPOOL 2e19f54e97839f1aca0dc578c95188f1ac1d6bbbdd6ff9a12996a3ed1f294add6ce294559d84e32c54d021095673e692a9b9125017ff621bca9e518dc5189ff8
+MISC ChangeLog 35313 SHA256 8b326bed35685b85abf2b9448a53e7de71cb6f7f170405a4a7cfcc4b4b0756a2 SHA512 4bd3395dcce1abff0c1b2c354b1f5d44b6ba0d5b9c3b9c09a9a4fb9b0dbad36fc153cd1ad9a4a018a1335eb701a36f897ba2195d0bcad64280c2eac94c41de08 WHIRLPOOL 42fcc34d1610cf517b82a24bb5dc91de4d58ef65bc6703976b2d7f338bd87256d49cb910700258e1c917d64e25b352931e4bb3ca896f4c71d1430755a8a00536
 MISC metadata.xml 881 SHA256 a280fc0f47388260c207e1027f89f05cfb381b4684165dded250b78de22dc0e5 SHA512 09d527b64c5730b72f84c22339ca1561f3b2bca5b22f87106b6b4344258bf0ec27172ffcef3c41359d32c3b66aaf47cf5362164a42238aba25329b7bcefe17e4 WHIRLPOOL c4d6b5e0a1ffd8766b7ee34218dbb7f781e60de592969efab2d7c13a172e3a63ce91cf38fb15b8cabf0e67a2993db75d90946a33e9b0f8a0dc44194c2c73cb69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDxdBoACgkQxeMuLWsGW/vHRgCgvGEMLe783ERcJB7JV3t7JmZ2
-MtkAn0YHGwt5mzSKpGRJoNLLnw1VAeZJ
-=ugJt
+iEYEAREIAAYFAlDxdr8ACgkQxeMuLWsGW/vKJgCgq5/V84TQLcKXw46VYEQwyA1z
+vHkAn1J7e4Fpp0RB3aKTozkspOxry8cB
+=aFkW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index 930a856e224c..8677589d856e 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.5 2012/09/09 17:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.6 2013/01/12 14:43:29 djc Exp $
 
 EAPI=4
 
-inherit multilib toolchain-funcs autotools flag-o-matic user git-2
+inherit multilib autotools flag-o-matic user git-2
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
 EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
@@ -13,15 +13,16 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
 
-REQUIRED_USE="static? ( minimal )"
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			!plugins? ( !pam !down-root )"
 
 DEPEND="
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
 	)
-	!minimal? ( pam? ( virtual/pam ) )
+	pam? ( virtual/pam )
 	selinux? ( sec-policy/selinux-openvpn )
 	ssl? ( >=dev-libs/openssl-0.9.7 )
 	lzo? ( >=dev-libs/lzo-1.07 )
@@ -33,43 +34,24 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
-
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	else
-		myconf="$(use_enable pkcs11)"
-	fi
-
 	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	econf ${myconf} \
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
 		$(use_enable passwordsave password-save) \
 		$(use_enable ssl) \
 		$(use_enable ssl crypto) \
 		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
 		$(use_enable iproute2) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake
-
-	if ! use minimal ; then
-		cd src/plugins
-		for i in *; do
-			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-		done
-		cd ..
-	fi
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
+	default
+	find "${ED}/usr" -name '*.la' -delete
 	# install documentation
 	dodoc AUTHORS ChangeLog PORTS README README.IPv6
 
@@ -89,11 +71,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r sample contrib
 	fi
-
-	if ! use minimal ; then
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe src/plugins/*/*.so
-	fi
 }
 
 pkg_postinst() {
@@ -130,7 +107,7 @@ pkg_postinst() {
 		ewarn "can move your scripts to."
 	fi
 
-	if ! use minimal ; then
+	if use plugins ; then
 		einfo ""
 		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
 	fi