jer 14/07/14 23:41:43 Modified: ChangeLog ngrep-1.45-r3.ebuild Log: EAPI bump. Set --disable-pcap-restart to avoid more rude e-mails from libpcap upstream. Force --enable-pcre instead of long shipped obsolete GNU regex. Clean up patches. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.74 net-analyzer/ngrep/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?rev=1.74&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?rev=1.74&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ChangeLog?r1=1.73&r2=1.74 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- ChangeLog 17 Mar 2013 16:07:17 -0000 1.73 +++ ChangeLog 14 Jul 2014 23:41:43 -0000 1.74 @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/ngrep -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.73 2013/03/17 16:07:17 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.74 2014/07/14 23:41:43 jer Exp $ + + 14 Jul 2014; Jeroen Roovers <[email protected]> ngrep-1.45-r3.ebuild, + -files/ngrep-1.45-Makefile.in.patch, files/ngrep-1.45-build-fixes.patch, + files/ngrep-1.45-prefix.patch, files/ngrep-1.45-setlocale.patch, + -files/ngrep-1.45.patch: + EAPI bump. Set --disable-pcap-restart to avoid more rude e-mails from libpcap + upstream. Force --enable-pcre instead of long shipped obsolete GNU regex. + Clean up patches. 17 Mar 2013; Markos Chandras <[email protected]> metadata.xml: Add proxy-maintainers to metadata.xml 1.10 net-analyzer/ngrep/ngrep-1.45-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild?r1=1.9&r2=1.10 Index: ngrep-1.45-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ngrep-1.45-r3.ebuild 16 Jan 2013 09:39:22 -0000 1.9 +++ ngrep-1.45-r3.ebuild 14 Jul 2014 23:41:43 -0000 1.10 @@ -1,8 +1,8 @@ -# Copyright 1999-2013 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/ngrep/ngrep-1.45-r3.ebuild,v 1.9 2013/01/16 09:39:22 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild,v 1.10 2014/07/14 23:41:43 jer Exp $ -EAPI="3" +EAPI=5 inherit autotools eutils user @@ -13,35 +13,43 @@ LICENSE="ngrep" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 pcre" +IUSE="ipv6" -DEPEND="net-libs/libpcap - pcre? ( dev-libs/libpcre )" +DEPEND=" + dev-libs/libpcre + net-libs/libpcap +" RDEPEND="${DEPEND}" +DOCS=( + doc/CHANGES.txt + doc/CREDITS.txt + doc/README.txt + doc/REGEX.txt +) + src_prepare() { # Remove bundled libpcre to avoid occasional linking with them - rm -rf pcre-5.0 - epatch "${FILESDIR}/${P}-build-fixes.patch" - epatch "${FILESDIR}/${P}-setlocale.patch" - epatch "${FILESDIR}/${P}-prefix.patch" + rm -r pcre-5.0 || die + + epatch \ + "${FILESDIR}"/${P}-build-fixes.patch \ + "${FILESDIR}"/${P}-setlocale.patch \ + "${FILESDIR}"/${P}-prefix.patch + eautoreconf } src_configure() { econf \ + $(use_enable ipv6) \ + --disable-pcap-restart \ + --enable-pcre \ --with-dropprivs-user=ngrep \ - --with-pcap-includes="${EPREFIX}"/usr/include/pcap \ - $(use_enable pcre) \ - $(use_enable ipv6) + --with-pcap-includes="${EPREFIX}"/usr/include/pcap } pkg_preinst() { enewgroup ngrep enewuser ngrep -1 -1 -1 ngrep } - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc doc/*.txt -}
