Cleanup: bump to EAPI-4, make kernel-related error message more accurate and informative, fix dodoc QA warnings (bug #377235 by flameeyes).

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 64 insertions, 69 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 8ae3f0f70de3..32a2a0b687f6 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.77 2011/06/06 00:24:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.78 2011/11/06 16:30:17 phajdan.jr Exp $
+
+  06 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  ipsec-tools-0.7.3-r1.ebuild:
+  Cleanup: bump to EAPI-4, make kernel-related error message more accurate and
+  informative, fix dodoc QA warnings (bug #377235 by flameeyes).
 
   06 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> ipsec-tools-0.7.3.ebuild,
   ipsec-tools-0.7.3-r1.ebuild:
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 7e391b1e9745..76306c2429d3 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ipsec-tools-duplicate-header.patch 440 RMD160 0a9f53ad68232b382388447c3c4aa7c81f5b6de1 SHA1 1d48f49fae5e7c5278d52a512e6b06998f24eacf SHA256 47d31a605a48fc7168cd579f62217316a12b153177bc6b16618d46c38e6936d1
 AUX racoon.conf.d 621 RMD160 773a21f70bd4786eb6758f052bb54cc40273c259 SHA1 1291dbe1639cbb72a161e3af727c9c65c6ae0132 SHA256 bc7cf9c0fe8bd5f99c9353aa3c19e3314b3da21a7a2138fc6e901375be21b109
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 DIST ipsec-tools-0.7.3.tar.bz2 776096 RMD160 e0ff32f0daa845934ac868ad5f36d58b25919c30 SHA1 19dc160643547a0bfabf0fe0ad1a181d3c28f410 SHA256 e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67
-EBUILD ipsec-tools-0.7.3-r1.ebuild 5769 RMD160 042edef20a8f8a37909b4014d3ffd1012e27c1c9 SHA1 fbdde0478f5572c9f8cb6b8afc5cd3ebaad74d59 SHA256 6c5ecf0fc3d00a9f30897b99729cc014645c082f1169ce3fbfb678283fdba7db
+EBUILD ipsec-tools-0.7.3-r1.ebuild 5504 RMD160 c80cca70aec3efa13f87c3c66bec051cc581a6da SHA1 afd5f1d981ab75cb640aa3825b3c377a8403eefd SHA256 fb8f045eb7bde9e20eb9c634337e1b23caf64128ff84aa81af4faed2cdc16fed
 EBUILD ipsec-tools-0.7.3.ebuild 8375 RMD160 990aa70c71acc7f3c523aaa1abcfef4f8999e7c7 SHA1 f65d04115cce6277297953cfbac91ce89a3ce83b SHA256 fb7cd6ae897526e409bb9799c9594955577894f87cf79fef27fe8f673d4eaafd
-MISC ChangeLog 12631 RMD160 2b06a42d4b030554f8da133d2c5c90fb1154a31c SHA1 1ae3360cf6e9d86f31e2e6442ca29534f568a55d SHA256 4999604100afae6f2b0c0920f4652793404fca72e0da388b11c2601e2eac3153
+MISC ChangeLog 12865 RMD160 c6daf435f76f964fbd55a5cbfa81cf5ab25b749f SHA1 ac24f51d869019f2beeab4bfff2a2adee336e852 SHA256 18a03565b8df85d1e6dd318c02d07122125475be0596597047d09555139ba352
 MISC metadata.xml 502 RMD160 e01a763e988fab1895b90f0281a8d03199101d12 SHA1 417beadea073adf7ea5a802ac9ecff6a57d5ebb7 SHA256 3b981e31c1af9f41b03a72b7a2ae87daf437ff872ddd5ad5641f0f7364566447
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59qT4ACgkQfXuS5UK5QB0aVgQApUDSzPWI3D5oUe5XNpi5BDfR
-ibUeCDKdmwO3vsnQltLi9EliKz8b/esbvl93/WM735D2s/tAF5NSsae7X59NctoY
-QekdGur497u1wDvXMoHg7+cwuT+1Xr+JVe4Qe1jWDbetyklUmf92S8vEWp+roF5y
-ePKXbNJmNBQ8f5Yp4lk=
-=gVV/
+iEYEAREKAAYFAk62th0ACgkQuUQtlDBCeQKqewCeKCSzdwWdWiEEL05Vexpae3gN
+2DEAn3T4JzqRpoR96JGoP1tjXxEzR8nF
+=QhOe
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
index eb77f7159440..400a6d972986 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild,v 1.4 2011/06/06 00:24:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild,v 1.5 2011/11/06 16:30:17 phajdan.jr Exp $
+
+EAPI="4"
 
 inherit eutils flag-o-matic autotools linux-info
 
@@ -31,66 +33,61 @@ DEPEND="${DEPEND_COMMON}
 
 pkg_setup() {
 	get_version
-	if kernel_is -ge 2 6 ; then
-		if test "${KV_PATCH}" -ge 19 ; then
-		# Just for kernel >=2.6.19
-			einfo "Checking for suitable kernel configuration (Networking | Networking support | Networking options)"
-
-			if use nat; then
-				CONFIG_CHECK="${CONFIG_CHECK} ~NETFILTER_XT_MATCH_POLICY"
-				export WARNING_NETFILTER_XT_MATCH_POLICY="NAT support may fail weirdly unless you enable this option in your kernel"
-			fi
-
-			for i in XFRM_USER NET_KEY; do
-				CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-				eval "export WARNING_${i}='No tunnels will be available at all'"
-			done
-
-			for i in INET_IPCOMP INET_AH INET_ESP \
-				INET_XFRM_MODE_TRANSPORT \
-				INET_XFRM_MODE_TUNNEL \
-				INET_XFRM_MODE_BEET ; do
-				CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-				eval "export WARNING_${i}='IPv4 tunnels will not be available'"
-			done
-
-			for i in INET6_IPCOMP INET6_AH INET6_ESP \
-				INET6_XFRM_MODE_TRANSPORT \
-				INET6_XFRM_MODE_TUNNEL \
-				INET6_XFRM_MODE_BEET ; do
-				CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-				eval "export WARNING_${i}='IPv6 tunnels will not be available'"
-			done
-
-			CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_NULL"
-			export WARNING_CRYPTO_NULL="Unencrypted tunnels will not be available"
-			export CONFIG_CHECK
-
-			check_extra_config
-		else
-			eerror "You must have a kernel >=2.6.19 to run ipsec-tools."
-			eerror "Building now, assuming that you will run on a different kernel"
+	if kernel_is -ge 2 6 19 ; then
+		einfo "Checking for suitable kernel configuration (Networking | Networking support | Networking options)"
+
+		if use nat; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~NETFILTER_XT_MATCH_POLICY"
+			export WARNING_NETFILTER_XT_MATCH_POLICY="NAT support may fail weirdly unless you enable this option in your kernel"
 		fi
+
+		for i in XFRM_USER NET_KEY; do
+			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+			eval "export WARNING_${i}='No tunnels will be available at all (${i})'"
+		done
+
+		for i in INET_IPCOMP INET_AH INET_ESP \
+			INET_XFRM_MODE_TRANSPORT \
+			INET_XFRM_MODE_TUNNEL \
+			INET_XFRM_MODE_BEET ; do
+			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+			eval "export WARNING_${i}='IPv4 tunnels will not be available (${i})'"
+		done
+
+		for i in INET6_IPCOMP INET6_AH INET6_ESP \
+			INET6_XFRM_MODE_TRANSPORT \
+			INET6_XFRM_MODE_TUNNEL \
+			INET6_XFRM_MODE_BEET ; do
+			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+			eval "export WARNING_${i}='IPv6 tunnels will not be available (${i})'"
+		done
+
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_NULL"
+		export WARNING_CRYPTO_NULL="Unencrypted tunnels will not be available (CRYPTO_NULL)"
+		export CONFIG_CHECK
+
+		check_extra_config
+	else
+		eerror "You must have a kernel >=2.6.19 to run ipsec-tools."
+		eerror "Building now, assuming that you will run on a different kernel"
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# fix for bug #76741
-	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
+	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c || die
 	# fix for bug #124813
-	sed -i 's:-Werror::g' "${S}"/configure.ac
+	sed -i 's:-Werror::g' "${S}"/configure.ac || die
 	# Fixing duplicate specification of vmbuf.h #300161
 	epatch "${FILESDIR}"/${PN}-duplicate-header.patch
 	# fix for building with gcc-4.6
-	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac
+	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
 
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx
 }
 
-src_compile() {
+src_configure() {
 	# fix for bug #61025
 	filter-flags -march=c3
 
@@ -136,28 +133,23 @@ src_compile() {
 	# See bug #77369
 	#myconf="${myconf} --enable-samode-unspec"
 
-	econf ${myconf} || die
-	emake -j1 || die
+	econf ${myconf}
+}
+
+src_compile() {
+	emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	keepdir /var/lib/racoon
 	newconfd "${FILESDIR}"/racoon.conf.d racoon
 	newinitd "${FILESDIR}"/racoon.init.d racoon
 
 	dodoc ChangeLog README NEWS
-	dodoc src/racoon/samples/*
+	dodoc -r src/racoon/samples
 	dodoc src/racoon/doc/*
 
-	docinto roadwarrior
-	dodoc src/racoon/samples/roadwarrior/*
-
-	docinto roadwarrior/client
-	dodoc src/racoon/samples/roadwarrior/client/*
-	docinto roadwarrior/server
-	dodoc src/racoon/samples/roadwarrior/server/*
-
 	docinto setkey
 	dodoc src/setkey/sample.cf