[gentoo-commits] gentoo-x86 commit in net-analyzer/netcat: ChangeLog netcat-110-r9.ebuild

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      12/03/01 17:25:32

  Modified:             ChangeLog netcat-110-r9.ebuild
  Log:
  Update to EAPI=4 to handle libmix[static-libs] #406329 by venom00.
  
  (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

Revision  Changes    Path
1.42                 net-analyzer/netcat/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netcat/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	6 Feb 2011 07:48:56 -0000	1.41
+++ ChangeLog	1 Mar 2012 17:25:31 -0000	1.42
@@ -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



1.2                  net-analyzer/netcat/netcat-110-r9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild?r1=1.1&r2=1.2

Index: netcat-110-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netcat-110-r9.ebuild	14 Jul 2010 03:47:51 -0000	1.1
+++ netcat-110-r9.ebuild	1 Mar 2012 17:25:31 -0000	1.2
@@ -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 @@
 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 @@
 	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