[gentoo-commits] dev/darkside:master commit in: net-misc/openvpn/

[gentoo-commits] dev/darkside:master commit in: net-misc/openvpn/

[Jeremy Olexa]

commit:     c199ca8da38f27887da1e318f68d15640f819d75
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 16:11:38 2012 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:11:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=c199ca8d

[net-misc/openvpn] EAPI4 helpers die by themselves

---
 net-misc/openvpn/openvpn-2.2.2.ebuild |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index af4c8b9..a060835 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -74,7 +74,7 @@ src_compile() {
 		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
 	fi
 
-	emake || die "make failed"
+	emake
 
 	if ! use minimal ; then
 		cd plugin
@@ -82,14 +82,14 @@ src_compile() {
 			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
 			[[ ${i} == "auth-pam" ]] && ! use pam && continue
 			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC) || die "make failed"
+			emake -C "${i}" CC=$(tc-getCC)
 		done
 		cd ..
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
 	# install documentation
 	dodoc AUTHORS ChangeLog PORTS README
@@ -97,12 +97,12 @@ src_install() {
 	# Install some helper scripts
 	keepdir /etc/openvpn
 	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh" || die "doexe failed"
-	doexe "${FILESDIR}/down.sh" || die "doexe failed"
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
 
 	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed"
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed"
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
 
 	# install examples, controlled by the respective useflag
 	if use examples ; then

[gentoo-commits] dev/darkside:master commit in: net-misc/openvpn/

[Jeremy Olexa]

commit:     70e4470c0f1f42a717e83edbb706c5b6d7afd9c6
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 16:20:58 2012 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:20:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=70e4470c

[net-misc/openvpn] install openvpn-plugin.h, bug 340591

---
 net-misc/openvpn/openvpn-2.2.2.ebuild |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index a060835..e3eeee1 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -91,6 +91,10 @@ 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
 

[gentoo-commits] dev/darkside:master commit in: net-misc/openvpn/

[Jeremy Olexa]

commit:     57e4a9b171f7bd4a649a5b4119d4117b1aba06ce
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 16:21:54 2012 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 16:21:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=57e4a9b1

[net-misc/openvpn] Remove ipv6 references better

---
 net-misc/openvpn/Manifest             |    1 -
 net-misc/openvpn/openvpn-2.2.2.ebuild |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 1833126..5ca3567 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,2 +1 @@
-DIST openvpn-2.2.0-ipv6-20110522-1.patch.gz 36029 RMD160 a476ba5581f0920dd5f42b2b22beeccb7ef2cbe8 SHA1 04dbcd44d825949e895d714a97e4e57617037536 SHA256 e3b415b1dd61f7fb823231c32b40516a93efc99c2b6b52e3b9fce03d4ae45053
 DIST openvpn-2.2.2.tar.gz 911158 RMD160 60990f183bdd46933724b3bf39ba5861ed0258a6 SHA1 992373cdf12e1b50655b13765a6d36a87cfd3ca3 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00

diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index e3eeee1..8f1019e 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -8,10 +8,10 @@ inherit eutils multilib toolchain-funcs autotools flag-o-matic
 
 IPV6_VERSION="2.2.0-ipv6-20110522-1"
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
-		ipv6? (
-			http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
-		)"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+#		ipv6? (
+#			http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
+#		)"
 HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2.2-pkcs11.patch"
-	use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
+#	use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
 	sed -i \
 		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
 		-e "s/-shared/-shared \${LDFLAGS}/" \