jer 14/06/09 03:18:36 Modified: ChangeLog nsat-1.5-r1.ebuild Log: Clean up. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.22 net-analyzer/nsat/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?r1=1.21&r2=1.22 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ChangeLog 6 Oct 2012 19:00:44 -0000 1.21 +++ ChangeLog 9 Jun 2014 03:18:36 -0000 1.22 @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nsat -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.21 2012/10/06 19:00:44 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.22 2014/06/09 03:18:36 jer Exp $ + + 09 Jun 2014; Jeroen Roovers <[email protected]> nsat-1.5-r1.ebuild: + Clean up. 06 Oct 2012; Sergey Popov <[email protected]> nsat-1.5-r1.ebuild: Respect LDFLAGS wrt bug #335951 1.5 net-analyzer/nsat/nsat-1.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?r1=1.4&r2=1.5 Index: nsat-1.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsat-1.5-r1.ebuild 6 Oct 2012 19:00:44 -0000 1.4 +++ nsat-1.5-r1.ebuild 9 Jun 2014 03:18:36 -0000 1.5 @@ -1,9 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.4 2012/10/06 19:00:44 pinkbyte Exp $ - -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.5 2014/06/09 03:18:36 jer Exp $ +EAPI=5 inherit eutils autotools DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner" @@ -15,11 +14,14 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="X" -RDEPEND="X? ( x11-libs/libX11 - dev-lang/tk ) - net-libs/libpcap" - -DEPEND="$RDEPEND >=sys-devel/autoconf-2.58" +RDEPEND=" + X? ( + x11-libs/libX11 + dev-lang/tk + ) + net-libs/libpcap +" +DEPEND="$RDEPEND" S="${WORKDIR}/${PN}" @@ -32,28 +34,28 @@ use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch # Respect LDFLAGS - sed -i -e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \ - src/Makefile.in || die 'first sed for respecting LDFLAGS failed' - sed -i -e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \ - src/smb/Makefile.in || die 'second sed for respecting LDFLAGS failed' + sed -i \ + -e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \ + src/Makefile.in || die + sed -i \ + -e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \ + src/smb/Makefile.in || die - sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ + sed -i \ + -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ nsat.conf || die "sed on nsat.conf failed" - sed -i "s:/usr/local:/usr:g" Makefile.in || die "sed on Makefile.in failed" - sed -i "s:/usr/local:/usr:g" tools/xnsat || die "sed on tools/xnsat failed" - sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ + sed -i -e "s:/usr/local:/usr:g" Makefile.in || die + sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die + sed -i \ + -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ -e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \ - src/lang.h || die "sed on src/lang.h failed" + src/lang.h || die eautoreconf } src_configure() { - econf $(use_with X x) || die "configuration failed" -} - -src_compile() { - make|| die "compile problem" + econf $(use_with X x) } src_install () {
