Gentoo Archives: gentoo-commits

From: Jeremy Olexa <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/darkside:master commit in: net-misc/openvpn/
Date: Sun, 29 Jan 2012 16:32:09
Message-Id: c199ca8da38f27887da1e318f68d15640f819d75.darkside@gentoo
1 commit: c199ca8da38f27887da1e318f68d15640f819d75
2 Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 16:11:38 2012 +0000
4 Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 16:11:38 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=c199ca8d
7
8 [net-misc/openvpn] EAPI4 helpers die by themselves
9
10 ---
11 net-misc/openvpn/openvpn-2.2.2.ebuild | 14 +++++++-------
12 1 files changed, 7 insertions(+), 7 deletions(-)
13
14 diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
15 index af4c8b9..a060835 100644
16 --- a/net-misc/openvpn/openvpn-2.2.2.ebuild
17 +++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
18 @@ -74,7 +74,7 @@ src_compile() {
19 sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
20 fi
21
22 - emake || die "make failed"
23 + emake
24
25 if ! use minimal ; then
26 cd plugin
27 @@ -82,14 +82,14 @@ src_compile() {
28 [[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
29 [[ ${i} == "auth-pam" ]] && ! use pam && continue
30 einfo "Building ${i} plugin"
31 - emake -C "${i}" CC=$(tc-getCC) || die "make failed"
32 + emake -C "${i}" CC=$(tc-getCC)
33 done
34 cd ..
35 fi
36 }
37
38 src_install() {
39 - emake DESTDIR="${D}" install || die "make install failed"
40 + emake DESTDIR="${D}" install
41
42 # install documentation
43 dodoc AUTHORS ChangeLog PORTS README
44 @@ -97,12 +97,12 @@ src_install() {
45 # Install some helper scripts
46 keepdir /etc/openvpn
47 exeinto /etc/openvpn
48 - doexe "${FILESDIR}/up.sh" || die "doexe failed"
49 - doexe "${FILESDIR}/down.sh" || die "doexe failed"
50 + doexe "${FILESDIR}/up.sh"
51 + doexe "${FILESDIR}/down.sh"
52
53 # Install the init script and config file
54 - newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed"
55 - newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed"
56 + newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
57 + newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
58
59 # install examples, controlled by the respective useflag
60 if use examples ; then