Update openvpn live ebuild for new build system.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 31 insertions, 56 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 2290ba01fd06..220ee628559e 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.226 2012/04/14 05:48:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.227 2012/05/14 08:23:50 djc Exp $
+
+  14 May 2012; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+  Update live ebuild to deal with new build system (thanks Alon Bar-Lev, bug
+  409577).
 
   14 Apr 2012; Zac Medico <zmedico@gentoo.org> openvpn-2.2.2.ebuild:
   Add ~amd64-linux keyword.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 6ee839e7775b..0046c1efa66b 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 65openvpn 45 RMD160 580e7f52f0c5ba91d3bc91f1155afc43fb153a96 SHA1 0d58cc3a3093e8df4b6e423934e93691722739b3 SHA256 d5758e39fdc75dcbb5a788b1afa743c3c1f08c63c535aa32c300b965474d765c
 AUX down.sh 943 RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de SHA1 261acc68a24108526345a7d117bba15dbcebaa6e SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7
@@ -21,13 +21,13 @@ DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b9
 EBUILD openvpn-2.1.4.ebuild 5731 RMD160 0043436908aa35297420df45c1cdb1060f305663 SHA1 9d2fc4af9349434db07d41cabcb5c776de348ad7 SHA256 d4799b8908f3fb42ae5e1ecf3635e8f81bd2ce5110a109dda63e2b0389a3aa87
 EBUILD openvpn-2.2.0-r1.ebuild 5306 RMD160 0124761ec5e2ddd7a42e7277cbb38dbb142c591d SHA1 f71a68b6e28869f08144b08ec5ed3a8ce5346d50 SHA256 8cf58bb8252cb7fb277fc258ef0050e862456129d951444b5e8ad98b1f9dafad
 EBUILD openvpn-2.2.2.ebuild 4798 RMD160 68af68c3ee13e86b16e0d5665170ded280bb7edb SHA1 6d2783e4e67d6cf2799100d5e9fd17d31859f31f SHA256 aaea5cd8b5e3381a026dd3cc57130c34478f89431d0f64906321629b626dd07a
-EBUILD openvpn-9999.ebuild 5123 RMD160 f55f25cec57e3649f62b14ab7801938e8b354d1e SHA1 f807c9ae80d41ae5fc7a61ac66797f4f1a633663 SHA256 eea6497b60d4caddecaed9e564fe0c91e42fb161553c6b29784d46d19e3e7992
-MISC ChangeLog 33035 RMD160 9d1adec24ad448199956d7fb95fcfb62f01d08ee SHA1 59e93228db6ca89b9284917c048eee217c45d9c3 SHA256 7d278030f201f4a966ef7c7b94a05e5c4fd4a8f7067b0dae4ff1d607d19551e0
+EBUILD openvpn-9999.ebuild 4166 RMD160 6aa0d2926b6130fe513c9f4d878fb8142430a809 SHA1 cc8ddecb8c410ba33660d667176942e79d981ba2 SHA256 6544d5ed281320a8853596f09bdd97345e3fa0984e05ef6864e395891d7cdb53
+MISC ChangeLog 33189 RMD160 8b87f2ddfdc9f42e93b19c9c3afd00bc4e9d6a72 SHA1 6dffa174bfad17be46f2facf39dd0b23633ef68c SHA256 20c3c3201db36a4237474e878a58e5fb91a7b0a5dabaf05ccd204188c8c33195
 MISC metadata.xml 808 RMD160 40e1ada3063edc2ae986c33b1ad78d150bcb4523 SHA1 5a8edc3cf4a935ebc255b71327c4e5cc8362f0ed SHA256 06fb4ae72a9389520966db3f497088b9d23de0ef0b1e74d5c2066980bef221a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+JD6oACgkQ/ejvha5XGaN6ZgCfXU0VC7hc3UJb5e/yiT+rCpCg
-r9cAoO15pUF1tsbXNrCWIqneQoK1gCSL
-=zvIk
+iEYEAREKAAYFAk+wwR4ACgkQxeMuLWsGW/vktgCfazOhYbT04nA4+YMpeP4y9cxz
+AT4AniZWIpqFtyUkIfLXko+iG+VQarXb
+=bhxT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index cf67848acc3e..97b52deea387 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -1,52 +1,38 @@
 # Copyright 1999-2012 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.2 2012/03/01 12:10:51 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.3 2012/05/14 08:23:50 djc Exp $
 
 EAPI=4
 
 inherit eutils multilib toolchain-funcs autotools flag-o-matic git-2
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
 HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
+IUSE="examples iproute2 minimal pam passwordsave selinux +ssl +lzo static pkcs11 userland_BSD"
 
-DEPEND=">=dev-libs/lzo-1.07
+REQUIRED_USE="static? ( minimal )"
+
+DEPEND="
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
 	)
 	!minimal? ( pam? ( virtual/pam ) )
 	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	lzo? ( >=dev-libs/lzo-1.07 )
 	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-pkcs11.patch"
-	sed -i \
-		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-		-e "s/-shared/-shared \${LDFLAGS}/" \
-		plugin/*/Makefile || die "sed failed"
-
-	# Add GIT commit ID to Product Version
-	sed -i \
-		-e "/^define(PRODUCT_VERSION/s/])/-git-${EGIT_VERSION}])/" \
-		version.m4
 	eautoreconf
 }
 
 src_configure() {
-	# basic.h defines a type 'bool' that conflicts with the altivec
-	# keyword bool which has to be fixed upstream, see bugs #293840
-	# and #297854.
-	# For now, filter out -maltivec on ppc and append -mno-altivec, as
-	# -maltivec is enabled implicitly by -mcpu and similar flags.
-	(use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
-
 	local myconf=""
 
 	if use minimal ; then
@@ -56,29 +42,26 @@ src_configure() {
 		myconf="$(use_enable pkcs11)"
 	fi
 
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
 	econf ${myconf} \
 		$(use_enable passwordsave password-save) \
 		$(use_enable ssl) \
 		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
 		$(use_enable iproute2) \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
 src_compile() {
-
-	if use static ; then
-		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
-	fi
-
 	emake
 
 	if ! use minimal ; then
-		cd plugin
+		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)
+			emake -C "${i}" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 		done
 		cd ..
 	fi
@@ -87,12 +70,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# install openvpn-plugin.h
-	insinto /usr/include
-	doins openvpn-plugin.h
-
 	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6 TODO.IPv6
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
 
 	# Install some helper scripts
 	keepdir /etc/openvpn
@@ -108,18 +87,12 @@ src_install() {
 	if use examples ; then
 		# dodoc does not supportly support directory traversal, #15193
 		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
+		doins -r sample contrib
 	fi
 
-	# Install plugins and easy-rsa
-	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
 	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
 		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
+		doexe src/plugins/*/*.so
 	fi
 }
 
@@ -162,10 +135,8 @@ pkg_postinst() {
 		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
 	fi
 
-	if [[ ${PV} == "9999" ]]; then
-		ewarn ""
-		ewarn "You are using a live ebuild building from the sources of openvpn"
-		ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
-		ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net"
-	fi
+	ewarn ""
+	ewarn "You are using a live ebuild building from the sources of openvpn"
+	ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
+	ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net."
 }