From 6de8165cd23daac385560e65594ed8a1d9b90d96 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Wed, 29 May 2013 01:43:55 +0200
Subject: net-misc/openvpn: migrate to EAPI 4

---
 net-misc/openvpn/Manifest               |  2 +-
 net-misc/openvpn/openvpn-2.1_rc7.ebuild | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'net-misc')

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 1458a2a8..7c99c5e1 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -14,6 +14,6 @@ AUX up.sh 2594 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b3
 DIST openvpn-2.1_rc7.tar.gz 787379 SHA256 c07fcbc41465bf508caff70dcc4238b8c95e9b2f35bec7bf891f7164027ecbf8
 DIST openvpn-2.2.0.tar.gz 898381 SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567
 DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
-EBUILD openvpn-2.1_rc7.ebuild 4492 SHA256 39cf56b82ce452bb17e352762302dd515f2304a3f21b05c2f74ba8ed8df54686 WHIRLPOOL 0405e0bb945dd98ab814f287411c3e424aa6cffae4f5738cc6a51a31cb31e9e63658e24b9177ef0e7ac15ea49317bf41098ae4e4ee5fea38d1b22494744fef9f
+EBUILD openvpn-2.1_rc7.ebuild 4235 SHA256 fc1db57e0d0336267dabc75249586e1775b2764b7667fa3b0cf8b9271a32d10d WHIRLPOOL ffa4d2d27873e8b6ba6a6a6755be1b6419f587efdf5c3b02bd09926eb0b5cec4978724f81a782784b7db25bfe81855578f651d6afae8921325c17a191ae19c06
 EBUILD openvpn-2.2.0-r1.ebuild 5743 SHA256 0e543a2fffb76b6a8b5d78db98b97fa62213d8d08649180078489fc687dff106 WHIRLPOOL 23905e13ab19c4d95643a0e5bd9a12358db0b551a2f166d1b7d17df9f314bd82cda9d30b487259653550074259136e280b6c14dcab0df84f6ac86817d536ea96
 MISC metadata.xml 362 SHA256 1ae041177bbb0f807aa5dc56f5462fd266260ff2e723af95cfe71f5b1892f371 WHIRLPOOL 15759e50603a6f775537a91844f42978da1331ae9e143b72ab296de10a014b8add0b6a8f63989a1b996297b8ceb021d6a147e132b542a5276d0cf0a3ad5af43d
diff --git a/net-misc/openvpn/openvpn-2.1_rc7.ebuild b/net-misc/openvpn/openvpn-2.1_rc7.ebuild
index 25ea8797..37576958 100644
--- a/net-misc/openvpn/openvpn-2.1_rc7.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc7.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc7.ebuild,v 1.1 2008/02/09 16:20:56 alonbl Exp $
 
+EAPI=4
 inherit eutils multilib
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
@@ -15,7 +16,7 @@ IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11
 
 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 )
@@ -23,25 +24,12 @@ 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() {
 	use ipv6 && epatch "${FILESDIR}/${PN}"-2.1_rc6-udp6.patch
 	epatch "${FILESDIR}/${P}-tap.patch"
 }
 
-src_compile() {
+src_configure() {
 	local myconf=""
 
 	if use minimal ; then
@@ -61,7 +49,9 @@ src_compile() {
 		|| die "configure failed"
 
 	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+}
 
+src_compile() {
 	emake || die "make failed"
 
 	if ! use minimal ; then
@@ -102,7 +92,6 @@ src_install() {
 		# dodoc does not supportly support directory traversal, #15193
 		insinto /usr/share/doc/${PF}/examples
 		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
 	fi
 
 	# Install plugins and easy-rsa
-- 
cgit v1.2.3