Update to EAPI=4 to handle libmix[static-libs] #406329 by venom00.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 38 insertions, 11 deletions

diff --git a/net-analyzer/netcat/ChangeLog b/net-analyzer/netcat/ChangeLog
index 50ecdcd755b0..f63fe5caa923 100644
--- a/net-analyzer/netcat/ChangeLog
+++ b/net-analyzer/netcat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/netcat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/ChangeLog,v 1.41 2011/02/06 07:48:56 leio Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/ChangeLog,v 1.42 2012/03/01 17:25:31 vapier Exp $
+
+  01 Mar 2012; Mike Frysinger <vapier@gentoo.org> netcat-110-r9.ebuild:
+  Update to EAPI=4 to handle libmix[static-libs] #406329 by venom00.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> netcat-110-r8.ebuild:
   Drop to ~mips
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index 3b6c7f68e38b..3c711af90746 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nc-v6-20000918.patch.gz 8740 RMD160 f2506613b4ed89362c82bb9b9e8d7507c0d389f5 SHA1 e1a559792ac117074d3809e523e07d5157f3af5c SHA256 7f0d5d05f4ed98f61f7efb167ef29cb25aa71e0df42c1f0cc8472e1ed660cb9a
 DIST nc110.tgz 75267 RMD160 3e891fa094d921940e53035fb6721e2f0c04efdb SHA1 f8ec3a39796b141b6654d39b7957b863c7f79a95 SHA256 5b3fda14e972d908896a605293f4634a72e2968278117410e12d8b3faf9a3976
 DIST netcat-110-patches-1.0.tar.bz2 25751 RMD160 543647b3a3919059dbd8a03e4223379719ef0617 SHA1 d32aac7357c60b7c798baa9dd5fb0e0470b96f31 SHA256 809517592616b4ca81c7b49541faa6a252ceb93384886d99b83163e9feeca96c
 EBUILD netcat-110-r8.ebuild 1558 RMD160 6d9ec065b879b85cefe3af9c27fbe1871278b087 SHA1 3540e5a518d5a0a5cefad372b06568ef255476f8 SHA256 47b68aeb49f63aad4e0874f2d72be74cfefae80e59ddfc5743e25c56677e3c7a
-EBUILD netcat-110-r9.ebuild 1579 RMD160 6fab36d644798698af78a5944ec991e907ed3bb8 SHA1 7c7a987717729dd6060624047c81823a24053662 SHA256 441544c88fb170def18ac0b4440f839ad3001015f793573e887784f7142bd907
-MISC ChangeLog 5536 RMD160 6767f50bd1c0c8b32725aee4f84e1875fa334178 SHA1 7f04772e46c696edec03a48ac5bb8feda3530540 SHA256 b283cfcc42fbbc5b6d4bc4db861d21ed4e19f1ebdfa6883f664eaa3e96f1e855
+EBUILD netcat-110-r9.ebuild 1634 RMD160 752e58f4d842815d29e060e8b83708a8c063af3b SHA1 2817f27775cd71bf42d21676512bda0ae3c4cf88 SHA256 2aa2c21ff5f8ca12ee5cb35f3b13b1509471ac1e543ee0d1a4ee35d792171ee8
+MISC ChangeLog 5680 RMD160 0b0b760327838fe08c9bca93fcfa4f4dd836feb3 SHA1 a227a39901766879d94a4d94c9202f37bea29c2b SHA256 6708a532188a6b896dc83360ddb8a53c5c3f9ec921bccb72ac59ac1558079fd6
 MISC metadata.xml 284 RMD160 cf6d467583778d0d506f54bc10c62a8fb7da08c5 SHA1 ec9612af16e1e66f71f5d032214549bdda3b5e75 SHA256 59de75dd5bf2ff23dae284268c6ecf2035a0517a0a6b7974acbbc9d9d549692a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPT7EZAAoJELEHsLL7fEFWSlMQAKHiOu8BGCnENkk3BSpdg/ZE
+HDVuFhaM+mXRZKmnacsuuSIBUahGao3ZxhgC9RkinVJWyw7jhmcWBy2/WLOP9q7D
+fpqmWmqTzckaR22LQDPFklOvb3JPdl8xuM/xsDLhRh0lcTuadwkPzebYLeYxEHQJ
+hfZ/XeoE/fTRU1kYlch+PcGHLv7+nAKoqCPbfCcal9biuk8uAUWx4Am+ZzvEk1iV
+KdH5Co9LVzzvXOeQBybTVwrJzQIeMVCUu9kgKC/iDT2wp/emhskYQn9B7oucLLmk
+Ps5PFw+9bNcfDZkuFTl5h82S9iXbNtHBpMXwVZWlYtdbuI1CTdFkRHgd+YcihR29
+GxYtH5/vWk7kqX1nDHqgO8QdAgh7zGkA78JCPEQylq+Tz1SpynGGG9kUrvxU85eI
+/rIXkDSGWQe5PMAr/AhkKUAL3pYJjVeVxyEzkyFXXowXDx8ZmrrVh+y4TDeeqgzz
+8ofLiL3xg1XHPRMuWBXxLGQW7XFkamR2oAl18ChBBiChfxjSMCXpXFf694GMFh6N
+c+YfkTtkkTXdJE8wXvRQfqOaaUCJmmp+dRv/flcW97XGflbOFDNhwWP4Br210+rp
+++oaYRHBUgsKX/6QVWtPucwr8IsGxUuckgahQiejO6CJFOkKJHTMUbkgXp4KUJfR
+HTIP8ef/VPtJ9SEo4vbn
+=Sz0B
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index c8cb3d7026d5..08ddbc187add 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild,v 1.1 2010/07/14 03:47:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild,v 1.2 2012/03/01 17:25:31 vapier Exp $
+
+EAPI="4"
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -17,12 +19,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 IUSE="crypt ipv6 static"
 
-DEPEND="crypt? ( dev-libs/libmix )"
+LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${MY_P}.tgz ${P}-patches-${PATCH_VER}.tar.bz2
+src_prepare() {
 	epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
 	sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
 	sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
@@ -35,11 +39,11 @@ src_compile() {
 	use static && export STATIC="-static"
 	use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
 	[[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
-	make -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc || die
+	emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
 }
 
 src_install() {
-	dobin nc || die "dobin failed"
+	dobin nc
 	dodoc README* netcat.blurb debian-*
 	doman nc.1
 	docinto scripts