From: Jonathan Callen Date: Wed, 26 May 2010 16:31:13 +0000 (+0000) Subject: Bump to EAPI=3, add prefix keywords, add patch to not search everywhere for includes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=670f8b4d2667ebc35ffac51ca5a14d5c83f7e946;p=gentoo.git Bump to EAPI=3, add prefix keywords, add patch to not search everywhere for includes Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog index 7ce16a4a9ae3..ab05d6cfc1b2 100644 --- a/net-analyzer/ngrep/ChangeLog +++ b/net-analyzer/ngrep/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/ngrep -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.61 2009/06/01 09:45:49 pva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.62 2010/05/26 16:31:12 abcd Exp $ + + 26 May 2010; Jonathan Callen ngrep-1.45-r2.ebuild, + +files/ngrep-1.45-prefix.patch: + Bump to EAPI=3, add prefix keywords, add patch to not search everywhere + for includes 01 Jun 2009; Peter Volkov -ngrep-1.45.ebuild, -ngrep-1.45-r1.ebuild: diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest index 6a84e5a873f3..b20bfd7d1d62 100644 --- a/net-analyzer/ngrep/Manifest +++ b/net-analyzer/ngrep/Manifest @@ -1,8 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX ngrep-1.45-Makefile.in.patch 395 RMD160 a05ea1cc784ef271d424aa0cbb695f2289f7c4d7 SHA1 f0b89b01e4a6ba60e4256f5c506cda26643dfd66 SHA256 25bc9e8de6d9396220d7c07d662b43121d2f025648c841f6b96ff3dc592b89e9 AUX ngrep-1.45-build-fixes.patch 5246 RMD160 61c33a509132197a8a2ea7dfddc0f14d14d03bd0 SHA1 f1f358d35f4c005c7e0bc39e06416b9523635e23 SHA256 4af21aef682c00b78fbf0d93355609ad801f6662e8c38ecd4fc1b24b67787167 +AUX ngrep-1.45-prefix.patch 628 RMD160 b47d0e776ba555907624dc627dbb3aef42bbbaf7 SHA1 6e95724dc8a914a4180b906d8401730a0d50ff74 SHA256 e822752e50558a672c4b63ff982378b0700cc350bb5912a3daba54c14d16aba9 AUX ngrep-1.45-setlocale.patch 526 RMD160 cf85c9168a922182e2eafb3dc600209003548d1c SHA1 2340c79cc0a1a763e79aafe408c307e10da4f542 SHA256 46fbee8a32f168838afdaf147b614149fec673abc1181a18ae49ba357596723c AUX ngrep-1.45.patch 911 RMD160 24b2b968bc547f73f2c0d31e711519d8b3627fad SHA1 ba188bd25da03fd43133f03e8d417208f1d3fb03 SHA256 586349b83f9d61a8791be62b26c1ee816b20f5eaf6b8b3671c4833f730dda333 DIST ngrep-1.45.tar.bz2 463361 RMD160 d4b89dfa23f6a7c65d3ccefc846362054a46605f SHA1 f26090a6ac607db66df99c6fa9aef74968f3330f SHA256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 -EBUILD ngrep-1.45-r2.ebuild 1106 RMD160 2b1a9f7657b6a6cdd93f86e999dc09d190800e24 SHA1 275ca6d5a51661190412840bb8e49ecaffbef15c SHA256 682e2f2cc9deef57071fff0478c2fbb7d17acc5ba71cb69bf797d67e0346e58a -MISC ChangeLog 7563 RMD160 4d089422d594ea1bf50182c1ba51cbdfff38d50a SHA1 d748624af6567baaa2ca2f23d820fa47012b933c SHA256 48b465968c563e6a5e85a1b21d5b259062d42369096e8c8cfd27dd1beef455fd +EBUILD ngrep-1.45-r2.ebuild 1164 RMD160 062fb928014e9d5b7bb22cb1f48699227e26c67b SHA1 cc98a72c8c1485c1f8c2e6e5695ccbcf1785ecfa SHA256 19eda99967d833aa2e89624bb575db1b3cfc7dc267d454f3d3a42e3b40067212 +MISC ChangeLog 7759 RMD160 37ce6fe702a58580b8c34eade190a04daf53e86a SHA1 73f287e311fcc70148ea9a8a958f067096998c41 SHA256 4c1cc526ce044c4a4bef55f61761dbf4edd0691b49ebbdcd7ddb999452328b7c MISC metadata.xml 501 RMD160 26af8f66fce54937141d226342ed7bb3101a423c SHA1 6e5cda83d6cdeaa782c830c02b12e211acea6102 SHA256 19f8270fac394a4ad440ceaef68850f7b3add04bbaee3e77170de26def82ac0d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iQIcBAEBCAAGBQJL/UzXAAoJELHSF2kinlg4QuEP/2dFbwwE2lfvy0nAvrd9QZR2 +BDgiYuyZOXVtiJ6MVcLAT9bW6mf/HSPwIJMRO1CnRB96oPPJChaujnmV9DMQW4X/ +fGmrIltZVAbv8m6JKGOLEcKAs+HkM+McJ3dZ1zDDUPFawoQMY1TzL4ZKN5LciDsp +Y8D8FwF3uw0r2ZsCNTljy6mUK3meWnbOEWTT/fxj7TWeaSFjGZkIuH6g8NU220D7 +VNH0X/vvOJK2Hj/D5yn/yu8Jtm0EybmBTReS1xPHpa2UJpizH5I/wg7xDPhG26oi +GrHy5cmHXtxSAD/v2/SfWi3arAFCNLN9tOknWRFmsQlM54+of3NGLa7zZBz7y/mW +wcmJ49E5mVFiqHE70DbB9BGwG8Qg1CtRgcL8GCXsZjvGNsbbtJCvsrNCsgd0A+HD +FVl8fvobBZgXq8dpFtuU7H3LSK5dmhUX+4S8FUfrqUMVUd46RTydlfvSL58xsMEE +14D6fI2oTox9YaJx27hkAct33zxs/qJ84+u8GpcysmxA8ezpQ42sRLGKH+mG2iGC +TvblhKKeirJKwl96rMbVtJxq06K+3eFE6Ug3cImtdn4Bc5tDyVID2kxJLkLbajFL +7HB1V9/fwTeUs6DBBoKeu6tAbvhRfQHGS5SqnxHOGMvtJFA1rash/B4RfbYOjowE +Rdsa/Sftk45uTsI4A7B8 +=pC6H +-----END PGP SIGNATURE----- diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch new file mode 100644 index 000000000000..afd2a2362395 --- /dev/null +++ b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch @@ -0,0 +1,17 @@ +* refrain from doing an absolutely insane check (to see if pcap is + installed in more than one place) + +--- configure.in.orig 2008-01-16 21:30:55 +0100 ++++ configure.in 2008-01-16 21:32:42 +0100 +@@ -268,10 +268,7 @@ + + AC_MSG_CHECKING(for a complete set of pcap headers) + +-possible_dirs="`eval echo -n ${includedir}` \ +- /usr/include /usr/include/pcap \ +- /usr/local/include /usr/local/include/pcap \ +- /usr/share/include /usr/share/include/pcap" ++possible_dirs="`eval echo -n ${includedir}`" + + AC_ARG_WITH(pcap-includes, + [ --with-pcap-includes specify the pcap include directory], diff --git a/net-analyzer/ngrep/ngrep-1.45-r2.ebuild b/net-analyzer/ngrep/ngrep-1.45-r2.ebuild index cc599b5f16a3..ad1d814193c1 100644 --- a/net-analyzer/ngrep/ngrep-1.45-r2.ebuild +++ b/net-analyzer/ngrep/ngrep-1.45-r2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.7 2009/05/31 15:35:57 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r2.ebuild,v 1.8 2010/05/26 16:31:12 abcd Exp $ + +EAPI="3" inherit eutils autotools @@ -10,28 +12,26 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2" LICENSE="as-is" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +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" DEPEND="net-libs/libpcap pcre? ( dev-libs/libpcre )" -src_unpack() { - unpack ${A} - cd "${S}" +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" eautoreconf } -src_compile() { +src_configure() { econf --with-dropprivs-user=ngrep \ - --with-pcap-includes=/usr/include \ + --with-pcap-includes="${EPREFIX}"/usr/include \ $(use_enable pcre) \ $(use_enable ipv6) - emake || die "emake failed" } pkg_preinst() {