summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-08-23 13:45:41 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-08-23 13:45:41 +0000
commit71681be99eb47f844297cb7cc47dd85409671554 (patch)
tree86634bb74e3ad46fcb674b0161c37aeb5bc8b471 /net-misc/openvpn/openvpn-2.1.0-r1.ebuild
parentRemove epause calls (diff)
downloadgentoo-2-71681be99eb47f844297cb7cc47dd85409671554.tar.gz
gentoo-2-71681be99eb47f844297cb7cc47dd85409671554.tar.bz2
gentoo-2-71681be99eb47f844297cb7cc47dd85409671554.zip
Remove built_with_use, upgrade to EAPI=2.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openvpn/openvpn-2.1.0-r1.ebuild')
-rw-r--r--net-misc/openvpn/openvpn-2.1.0-r1.ebuild21
1 files changed, 5 insertions, 16 deletions
diff --git a/net-misc/openvpn/openvpn-2.1.0-r1.ebuild b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
index 94820d1c4a3a..c1e0c63a5336 100644
--- a/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.1.0-r1.ebuild
@@ -1,6 +1,8 @@
# 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.2 2010/02/28 16:11:18 cedk Exp $
+# $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 $
+
+EAPI=2
inherit eutils multilib toolchain-funcs autotools flag-o-matic
@@ -22,7 +24,7 @@ IUSE="eurephia examples iproute2 ipv6 minimal pam passwordsave selinux ssl stati
DEPEND=">=dev-libs/lzo-1.07
kernel_linux? (
- iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
+ iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
)
!minimal? ( pam? ( virtual/pam ) )
selinux? ( sec-policy/selinux-openvpn )
@@ -30,20 +32,7 @@ DEPEND=">=dev-libs/lzo-1.07
pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
RDEPEND="${DEPEND}"
-pkg_setup() {
- if use iproute2 ; then
- if built_with_use sys-apps/iproute2 minimal ; then
- eerror "iproute2 support requires that sys-apps/iproute2 was not"
- eerror "built with the minimal USE flag"
- die "iproute2 support not available"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}/${PN}-2.1_rc13-peercred.patch"
epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
use ipv6 && epatch "${WORKDIR}/${PN}-2.1_rc22-ipv6-${IPV6_VERSION}.patch"