Add prefix support by Christoph Junghans (bug #461296).

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 33 insertions, 26 deletions

diff --git a/net-analyzer/netselect/ChangeLog b/net-analyzer/netselect/ChangeLog
index fc89b17ec292..4aec08580faf 100644
--- a/net-analyzer/netselect/ChangeLog
+++ b/net-analyzer/netselect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netselect
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.40 2012/10/14 21:53:59 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.41 2013/03/10 20:06:00 jer Exp $
+
+*netselect-0.3-r3 (10 Mar 2013)
+
+  10 Mar 2013; Jeroen Roovers <jer@gentoo.org> -netselect-0.3-r1.ebuild,
+  +netselect-0.3-r3.ebuild:
+  Add prefix support by Christoph Junghans (bug #461296).
 
   14 Oct 2012; Alexis Ballier <aballier@gentoo.org> netselect-0.3-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 58c9e73bf16b..bad80843e008 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 AUX netselect-0.3-bsd.patch 1670 SHA256 b351edf5a8acfc6bece5ce0079129aa5896389478aac793e596f70b29db9583a SHA512 4a4a3ca0c6c969dc025a977c946fb5f3e0e0d540ecb09ff6840af68b7d418114d8a452dc39faf4574e587042ebc645e10ad0eafe402376ab042f13776a0d937d WHIRLPOOL a1ffe162b0b5afd9fce307fdd8eaebc92a08cfb67e54520ba7b5de692f0c86ed147287d672a03b88c12f186ed16c7f07636fc34736b46abbbcf6f76edbdc7a2c
-DIST netselect-0.3.tar.gz 22047 SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978
-EBUILD netselect-0.3-r1.ebuild 1083 SHA256 9037cc07cee489366e7927ce35a135a05a2b262ed164c881b2d944a0f8d85bb3 SHA512 b4f28238f76792cd2289ff293fc3c9310067782f627dfa9155e59ad77360e47c24222d631725f92d9a82a8f0e36091b692bedb9ec22af4a696ca746dbb0c25f4 WHIRLPOOL 676d627e42455600d0653758f2c5b4ab166bf40c454a5e9fcb80b13da9c8a10bbb71b0cdeee9366faa115b94e407168220b37d554e29745a0a52f8d27b970e58
+DIST netselect-0.3.tar.gz 22047 SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 SHA512 04a4b79c357a0110dcf377ad04ac729ed7854bec4b064ad16da632367ce1870379546fffc8396ea770bfa580618d7c0495c16b0ba30f736419511b890ce5dca5 WHIRLPOOL 2e49cb22b12c88a1d9f42da19b42284ae98d391739bf7bd1e134661b8780ef733b26f5f4be4ed61dce3a4a9922a6a10d9040698fa3f4910ceacc54df4a42afcc
 EBUILD netselect-0.3-r2.ebuild 1130 SHA256 62988a9cdca6b2bb57dff7509393ff7f3c8e324b209f29e8f192772862639655 SHA512 d1dc837ce87d771bd4f4fc84632ce3aba0c4e657f41d4021735ad17b66e41a7b65589e29de396d5ad51159be6d5c2c5fa0e5eec2edd90fe586bcdab07c6bf5f5 WHIRLPOOL d2dab0e3446a0f5f0d9e22fa6dda995ae3a3efc3f8d8623ad75ce0329f166c556162e7214a34cb453be0f6415c7a0d149eec374d9c481356434decfda71d7895
-MISC ChangeLog 4625 SHA256 aca6b25aba6de0face6dee8f9ac6a1e243566b3ea6d8a1c4d153e38ead46db65 SHA512 44ebf8861a980a4d49d8d8121059da77e1adc7ab436fe539cd63d357b46b4ebeb5a6b614af42655288a09fe83247e778f74d89891b8091c94a2cd0f35853c088 WHIRLPOOL 975d4e1cecd268dd7a213f421d7ba3856185e730776a8435bb21f0ee9d036714eeff28b797ee5610d65c9a0498e27619681051d69715c5d71151c96f182951e5
+EBUILD netselect-0.3-r3.ebuild 1126 SHA256 60cbc82c526da5c820d67fa0203599f15db766345f625bcc25b48a2d861c5a12 SHA512 60034b18b570fee1bc56f1e7c99f87b08692d3a9fe9319aff9e8dab8e162a66b501a9acb1cd793b78d4c8dc95831022563025b228ec2ba7599c9bf707fa288fd WHIRLPOOL 5bd85b67e95e9a35a3a6b53696f6b29c8f439d4dc032f8c262a9ecc3148585af76dd77cf9dfce889f9789bac9ff1e9475f6ac2b11ab677b207fab7fb007ae906
+MISC -.orig 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
+MISC -.rej 1556 SHA256 48b9a389ca589c55b82b5b181f89bcd21ecf278f899fb1a6f573fe4be568aa45 SHA512 b1d3ed28e97143306f332873d4db83056a9e757d39ea17e03d186cba037eec6da52d65daf815ab461adad0fff27a116c5c940e5e4c87b36fe9b03d07eab48357 WHIRLPOOL 3a0ec8948f25d17bef9e309b7da60f3a2822cfe4b10cc909b375e18f586f278fe14def9489f1206d3bc708de01e0a38840fcb6fb01c1c1e15d48fba2f227cca8
+MISC ChangeLog 4813 SHA256 6e9ba624375e2c096096567c86fd9802971450650fb4b0bdf57cafaf78f6a2f3 SHA512 a6eb51d53d0d63a214744d9323469f7494a21b161068b9483ebcfde6895efd3493419e2cc059cb2bb9ed9a29ab7570701f15a9f40dd8528ea4992fe40b70c0c6 WHIRLPOOL 07f336dcf694734cd43de3174ce547ba917900df1b9cc58325324797c695aa4bc0247f2b0762cb3633e88a9c25e070d0a00c8d851377714d115b6c953b5755c8
 MISC metadata.xml 227 SHA256 645ebb9d76e7763a81c4dee499147688e00258373d297ceb0b83b32eeb5fe44b SHA512 d46709db22bc8ed47c98fc00517f42a539a31bf02022e3c2f285efd65c3be70b8f061b631ce951e05385dd904b3e7b44ee65ac061657a82e68ab05859e69609f WHIRLPOOL 1753222bdb48a4affc4d39758aca54f3a70573168e84fdb960402194823dec89dac1bcf00380c7f9b7a306212fc12bbb90a43b0e76188d41de081fe96069e824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7NHgACgkQvFcC4BYPU0pfRgCgt0m+4oeJAa+jqZRcnvOnFogm
-spYAoIxbXqEVFpaWRBxZcqnuoC1Ft4+L
-=2Pos
+iEYEAREIAAYFAlE856kACgkQVWmRsqeSphMtwgCfZhyEcqUDYhFW8LmKwlQ3qk55
+OrwAn0d5BXJ+MT6RpPgiV+t4IhtfVv9d
+=jAxT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netselect/netselect-0.3-r1.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
index e8524ad46fd6..f694ccd0ff9c 100644
--- a/net-analyzer/netselect/netselect-0.3-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r1.ebuild,v 1.21 2011/02/06 07:50:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r3.ebuild,v 1.1 2013/03/10 20:06:00 jer Exp $
 
-inherit eutils flag-o-matic
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping."
 HOMEPAGE="http://alumnit.ca/~apenwarr/netselect/index.html"
@@ -10,34 +11,32 @@ SRC_URI="http://alumnit.ca/~apenwarr/netselect/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${PN}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-bsd.patch"
-}
 
-src_compile() {
 	sed -i \
-		-e "s:PREFIX =.*:PREFIX = ${D}usr:" \
+		-e "s:PREFIX =.*:PREFIX = ${ED}usr:" \
 		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. -g ${CFLAGS}:" \
 		-e "s:LDFLAGS =.*:LDFLAGS = -g ${LDFLAGS}:" \
 		-e '23,27d' \
 		-e '34d' \
-		Makefile \
-		|| die "sed Makefile failed"
+		Makefile || die
+}
 
-	emake || die "emake failed"
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install () {
-	dobin netselect || die "dobin failed"
-	fowners root:wheel /usr/bin/netselect
-	fperms 4711 /usr/bin/netselect
+	dobin netselect
+	if ! use prefix ; then
+		fowners root:wheel /usr/bin/netselect
+		fperms 4711 /usr/bin/netselect
+	fi
 	dodoc ChangeLog HISTORY README*
 }