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:14
Message-Id: 57e4a9b171f7bd4a649a5b4119d4117b1aba06ce.darkside@gentoo
1 commit: 57e4a9b171f7bd4a649a5b4119d4117b1aba06ce
2 Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 16:21:54 2012 +0000
4 Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 16:21:54 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=57e4a9b1
7
8 [net-misc/openvpn] Remove ipv6 references better
9
10 ---
11 net-misc/openvpn/Manifest | 1 -
12 net-misc/openvpn/openvpn-2.2.2.ebuild | 10 +++++-----
13 2 files changed, 5 insertions(+), 6 deletions(-)
14
15 diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
16 index 1833126..5ca3567 100644
17 --- a/net-misc/openvpn/Manifest
18 +++ b/net-misc/openvpn/Manifest
19 @@ -1,2 +1 @@
20 -DIST openvpn-2.2.0-ipv6-20110522-1.patch.gz 36029 RMD160 a476ba5581f0920dd5f42b2b22beeccb7ef2cbe8 SHA1 04dbcd44d825949e895d714a97e4e57617037536 SHA256 e3b415b1dd61f7fb823231c32b40516a93efc99c2b6b52e3b9fce03d4ae45053
21 DIST openvpn-2.2.2.tar.gz 911158 RMD160 60990f183bdd46933724b3bf39ba5861ed0258a6 SHA1 992373cdf12e1b50655b13765a6d36a87cfd3ca3 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00
22
23 diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
24 index e3eeee1..8f1019e 100644
25 --- a/net-misc/openvpn/openvpn-2.2.2.ebuild
26 +++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
27 @@ -8,10 +8,10 @@ inherit eutils multilib toolchain-funcs autotools flag-o-matic
28
29 IPV6_VERSION="2.2.0-ipv6-20110522-1"
30 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
31 -SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
32 - ipv6? (
33 - http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
34 - )"
35 +SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
36 +# ipv6? (
37 +# http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
38 +# )"
39 HOMEPAGE="http://openvpn.net/"
40
41 LICENSE="GPL-2"
42 @@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
43
44 src_prepare() {
45 epatch "${FILESDIR}/${PN}-2.2.2-pkcs11.patch"
46 - use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
47 +# use ipv6 && epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch"
48 sed -i \
49 -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
50 -e "s/-shared/-shared \${LDFLAGS}/" \