Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: openvpn-2.1.0-r1.ebuild
Date: Mon, 23 Aug 2010 13:49:54
Message-Id: 20100823134947.3C3762004E@flycatcher.gentoo.org
1 djc 10/08/23 13:49:47
2
3 Modified: openvpn-2.1.0-r1.ebuild
4 Log:
5 Further EAPI=2 updates.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.4 net-misc/openvpn/openvpn-2.1.0-r1.ebuild
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild?rev=1.4&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild?rev=1.4&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild?r1=1.3&r2=1.4
14
15 Index: openvpn-2.1.0-r1.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild,v
18 retrieving revision 1.3
19 retrieving revision 1.4
20 diff -u -r1.3 -r1.4
21 --- openvpn-2.1.0-r1.ebuild 23 Aug 2010 13:45:41 -0000 1.3
22 +++ openvpn-2.1.0-r1.ebuild 23 Aug 2010 13:49:47 -0000 1.4
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild,v 1.3 2010/08/23 13:45:41 djc Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.0-r1.ebuild,v 1.4 2010/08/23 13:49:47 djc Exp $
28
29 EAPI=2
30
31 @@ -44,7 +44,7 @@
32 eautoreconf
33 }
34
35 -src_compile() {
36 +src_configure() {
37 # basic.h defines a type 'bool' that conflicts with the altivec
38 # keyword bool which has to be fixed upstream, see bugs #293840
39 # and #297854.
40 @@ -68,7 +68,9 @@
41 $(use_enable threads pthread) \
42 $(use_enable iproute2) \
43 || die "configure failed"
44 +}
45
46 +src_compile() {
47 use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
48
49 emake || die "make failed"