summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-08-23 13:49:47 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-08-23 13:49:47 +0000
commitebc8355db35395dbbb7edfe36cec3bd9c163805b (patch)
tree84443618e07d53535857640995517137352134d3 /net-misc/openvpn
parentMove ree18 support to -r2. (diff)
downloadhistorical-ebc8355db35395dbbb7edfe36cec3bd9c163805b.tar.gz
historical-ebc8355db35395dbbb7edfe36cec3bd9c163805b.tar.bz2
historical-ebc8355db35395dbbb7edfe36cec3bd9c163805b.zip
Further EAPI=2 updates.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-misc/openvpn')
-rw-r--r--net-misc/openvpn/Manifest2
-rw-r--r--net-misc/openvpn/openvpn-2.1.0-r1.ebuild6
2 files changed, 5 insertions, 3 deletions
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index b070960795b1..3c472efd245f 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -13,7 +13,7 @@ DIST openvpn-2.1.0_eurephia.patch 2774 RMD160 6d65df5110dff6c9b28262dc40ada15fc3
DIST openvpn-2.1_rc15.tar.gz 833429 RMD160 90333139815a1681ab7a6aeba9bc5a005c5a9713 SHA1 a07f9b24947428e905d0c41339b9ed522358c672 SHA256 66cfe347da6ab29ae39c80527714079cdb5699fdf453f7e031dd2ec0172d13a5
DIST openvpn-2.1_rc22-ipv6-0.4.10.patch.gz 21090 RMD160 34c4c2ebeef129230643ab40998b6546b2c832ea SHA1 41710ada46592507f6a64cf74e78bd06da232ced SHA256 da47f9599c3251bd39e3553f3fdab2581462092e22069de4e4d458c80f383da4
EBUILD openvpn-2.0.9.ebuild 4266 RMD160 21afbb0a8dc307ccfc989f10bb934895f2a9b0c6 SHA1 42aa8365eb6903dc164d1ff4661067ddecef9bf4 SHA256 1281eab97a97d8212659ce494ddb66e8c992ad59a7a2d3adca81a6f033b9e6f2
-EBUILD openvpn-2.1.0-r1.ebuild 5598 RMD160 233861e8b54375f5db11d723b64abada740ba0a1 SHA1 4e3566ab497872534276fef88547793087e728d1 SHA256 1d9a8677ee81bab4c260cee22d48985806f7f5ebb5f7d9aa6fbcd0e431b64f47
+EBUILD openvpn-2.1.0-r1.ebuild 5618 RMD160 c6a1376f546c39e111a04249518e211e093cda06 SHA1 c12f61e4fea6b0772fa1fd2140effe7e859d0f66 SHA256 a5b85e176bcae5fc9a2b094940768ead82d533c911e79f95eacef2c600d7c308
EBUILD openvpn-2.1_rc15.ebuild 4679 RMD160 f814096d99990986e910c1ecc933df636a586a71 SHA1 8ffbab4ca728b933029f7bf9876e862477401b06 SHA256 66012cc09038cc22dc33962cbe6cea5051e1106141f21b9dad202da51ab2e7db
MISC ChangeLog 26834 RMD160 ec7d58172e775f89e93b4d844f4b51efe3e62866 SHA1 b62096d9eb45b4bc0fcee79c46eba8c4a7c99156 SHA256 d928892bb14e6fbcc5140095c0aecd43297b70bd5d1ceee47d7b23f6decf6b5f
MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385
diff --git a/net-misc/openvpn/openvpn-2.1.0-r1.ebuild b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
index c1e0c63a5336..198372a47486 100644
--- a/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=2
@@ -44,7 +44,7 @@ src_prepare() {
eautoreconf
}
-src_compile() {
+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.
@@ -68,7 +68,9 @@ src_compile() {
$(use_enable threads pthread) \
$(use_enable iproute2) \
|| die "configure failed"
+}
+src_compile() {
use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
emake || die "make failed"