EAPI bump. Clean up and repackage patches.

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

4 files changed, 38 insertions, 81 deletions

diff --git a/net-misc/netkit-rwho/ChangeLog b/net-misc/netkit-rwho/ChangeLog
index 0bb710f85223..3c56d7f54fdb 100644
--- a/net-misc/netkit-rwho/ChangeLog
+++ b/net-misc/netkit-rwho/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/netkit-rwho
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.29 2012/02/06 18:28:19 ranger Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.30 2014/07/18 19:45:52 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -netkit-rwho-0.17-r3.ebuild,
+  netkit-rwho-0.17-r4.ebuild:
+  EAPI bump. Clean up and repackage patches.
 
   06 Feb 2012; Brent Baude <ranger@gentoo.org> netkit-rwho-0.17-r4.ebuild:
   Marking netkit-rwho-0.17-r4 ppc for bug 393691
diff --git a/net-misc/netkit-rwho/Manifest b/net-misc/netkit-rwho/Manifest
index a3c409c7cc9f..c0527b5e56d9 100644
--- a/net-misc/netkit-rwho/Manifest
+++ b/net-misc/netkit-rwho/Manifest
@@ -1,9 +1,18 @@
-AUX netkit-rwho-0.17-confd 93 RMD160 aa47496f71fc053b8f7d0d0a280e3146ab192c21 SHA1 4464e34bbe14c30133e9e32d9e71feaddd27a5bb SHA256 6ad0939f180cc4a758b81bb40d3c74472ffb18f59d5222d04b2d3a4f5fa63208
-AUX netkit-rwho-0.17-cron 402 RMD160 07cda80b3c9ac34b35fd5792bab560f86573b1b3 SHA1 719aea9abb846834dabc4e504d85a390ca5d1b0b SHA256 17379a9c9feac2c5928bfd654259db954f7ad928a9dcff414fe96d62f49a3394
-AUX netkit-rwho-0.17-rc 270 RMD160 47153fb9daf7f76c5b6ae537cf3ac27364103f66 SHA1 460953472f57a52da20a22391a6210733f9fcbe4 SHA256 e906fd9bbc248bd75e694a25d8c8681c8739e3e0c35c4d13c331a155d5abc971
-DIST netkit-rwho-0.17-patches.tar.gz 8077 RMD160 c394cc6e0d6a3641d497841175159418f20d2056 SHA1 6c98fcffac887d571022f36960d4fcb4c4656fb6 SHA256 e10fadd2d32981723ac0d0c22c93f7ba0398b463dfab6f39871cdcf0e13911f5
-DIST netkit-rwho-0.17.tar.gz 20610 RMD160 537786b51927c8235e5cfa92683ced6870d54747 SHA1 19dcd517bec846c788aee6307dfd4bf451793ec6 SHA256 0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7
-EBUILD netkit-rwho-0.17-r3.ebuild 1297 RMD160 3c3e99e23600abdf160364a88bbb40b5e658e68e SHA1 37ecad7f6acc031d64320030817c415188fec031 SHA256 09d5bab816336730627b0716b8d06afcf5673b248d11b8c0af2fb47a27b18468
-EBUILD netkit-rwho-0.17-r4.ebuild 1376 RMD160 a35ff93db8bb0fac0419b31077bd299e08773881 SHA1 f31a95babb2a2502f7da76c017265ed6e1133601 SHA256 03f283a5b092dd7733c96214581509522f5975327984ed65411e387eb711e979
-MISC ChangeLog 4256 RMD160 f61b1566948866df19a7e2db738df7692f64ce19 SHA1 59019a10c68efc3fba3c1f7f3ada7db43a2b044c SHA256 eef0f9767382c311412de9b2372c5c2029f89cde14aecc53adae168009344124
-MISC metadata.xml 161 RMD160 404fe32f194325ecc180c31feaed3b71cff5e438 SHA1 aa4aff2479db4b6a96f99889365cb17375ba8c4d SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX netkit-rwho-0.17-confd 93 SHA256 6ad0939f180cc4a758b81bb40d3c74472ffb18f59d5222d04b2d3a4f5fa63208 SHA512 c6c0a074c1b41272706f913c822b95ad1edba82a7fbf9ec0e4f3859622d5526203e18ed84d253e190a73b0275d0b9f6ea693fa5c933866f2c03ea18dee9e7a16 WHIRLPOOL 1a0f9658aab0f23e1da8610821d9901cf21afaea4222423a3e376f5b8719c0f13213f8debd5b5f3af7413e18272b17d6d1fc65be288a6a2929506a12506bbae8
+AUX netkit-rwho-0.17-cron 402 SHA256 17379a9c9feac2c5928bfd654259db954f7ad928a9dcff414fe96d62f49a3394 SHA512 537f7d3cb40a302351c4c6aee9bbd760060eea2a70b52d015e9aa76c6aabafcea2f020bd1af23c765e7d62729405e999859b36c9dee0fd37ad412927ff1b165b WHIRLPOOL 8079e173e50cb07ee81d73e59b2fe8bd8cab30b9f832bf3fd492a920fa08f708fcab63959f99473e2f8750414c7614d94ced22dcdd6847d4971467fbc78c4a82
+AUX netkit-rwho-0.17-rc 270 SHA256 e906fd9bbc248bd75e694a25d8c8681c8739e3e0c35c4d13c331a155d5abc971 SHA512 2d29d01311f4a366f355b5396e274eb2101c03b10f4eeee9d2dcd39a31173cd7657390a94afecaae930f02e87c02d344c8f1f8d368744bb87832313e2751c85b WHIRLPOOL f0a840c5d0ef1664609fbed2727aadda2e36b3bceac08a2c53e5a1567be7dc49610bb411eb93d89933fd33bfebd7fa02b13b8b0f9e9e1890c738ea86f2055005
+DIST netkit-rwho-0.17-patches.tar.bz2 7725 SHA256 c666d60fa21538f909374cdc1a3e661875559c3859f759fe060f35047dc3e54e SHA512 947f62316220791af7f36eee3d44481224ebda3410fb3e527fb1f066a663f56d6aec44483955edbbff1936972e86aeff9d6905d123ed78cb10d72ee6cb0f7454 WHIRLPOOL 5b8c47050a44ee3a80b6b622da9b947e30176d535cce2682a160df3c46153a321d279a30386df4aa21c69bdb12ecbaf20e0fa5867648e96917697f3ede394842
+DIST netkit-rwho-0.17.tar.gz 20610 SHA256 0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7 SHA512 ea1444b613d95f53100cf8f8d374dd132611432380b9142182c4fb5595014605896656b9a272945534371265e226fe591c22c12a9bdde9c763794249660e7b58 WHIRLPOOL 65a7d4851cba7c94d240e56e254df4978741eb780dd269063773620289894cc7269e5491e5955c22746345f4e4191379d10a022a1317a091a1e3a13210de1418
+EBUILD netkit-rwho-0.17-r4.ebuild 1145 SHA256 d491c5599971ebe8bcedc490a372650585866bb96d6e67f7666064dcc339e8ba SHA512 2653303c71eee1a383243b4c310d73acceecc247182752d5e3783ed9990b8e350fdb87f4c1af2359444487ca2a84f506a05ca8489cef1c275bef14848e5c1433 WHIRLPOOL 2fb25f4bc08626efdfe2a1104b8565bc5bd1f2165157aba1d89391456f81038e24c92f6df02397b508434f607db79899f40e6110da7ff17b6765305114fd75f1
+MISC ChangeLog 4405 SHA256 c9999b1773bded89fb7680cc2bb99d4f9044d6c80066952e15a702198bd905da SHA512 be3cafd8d5a9a1f26bfb6b91578568ca62e9d478c1ca6bcb8b218a80934fd11db6946149fc0ed5684303136155f6c8d1e1a268b53ef3c7eab5171565e2595b21 WHIRLPOOL 3bf13906f700c429550d2a6c28b628a69de2313e365a34a5a7df2d6d98a7a08d03fcc42f55a1e356e42c08e900802eefda7459d1a8b4b2525f08313dc6108f40
+MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPJeXEACgkQVWmRsqeSphODNQCfYRdAV5JvYDwYX/9F8hA0LAN3
+aMsAn0qJ0qpedhHypLH8jrn0xy3NuObe
+=fK0h
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild
deleted file mode 100644
index f68447333dec..000000000000
--- a/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r3.ebuild,v 1.3 2010/10/18 13:39:05 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="Netkit - ruptime/rwho/rwhod"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
-	mirror://gentoo/${PN}-0.17-patches.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~mips ppc s390 sh sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-tiny-packet-dos.patch
-	epatch "${WORKDIR}"/${P}-gentoo.diff
-	epatch "${WORKDIR}"/${P}-debian.patch
-}
-
-src_compile() {
-	./configure || die "configure failed"
-	sed -i \
-		-e "s:-O2::" \
-		-e "s:-Wpointer-arith::" \
-		MCONFIG
-	emake || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/spool/rwho
-
-	into /usr
-	dobin ruptime/ruptime rwho/rwho || die "dobin failed"
-	dosbin rwhod/rwhod || die "dosbin failed"
-	doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
-	dodoc README ChangeLog
-
-	newinitd "${FILESDIR}"/${P}-rc rwhod
-	newconfd "${FILESDIR}"/${P}-confd rwhod
-
-	exeinto /etc/cron.monthly
-	doexe "${FILESDIR}"/${P}-cron
-}
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
index d2c6fbb8b086..6e4421b8f84e 100644
--- a/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
+++ b/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild
@@ -1,45 +1,41 @@
-# 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-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild,v 1.6 2012/02/06 18:28:19 ranger Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r4.ebuild,v 1.7 2014/07/18 19:45:52 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Netkit - ruptime/rwho/rwhod"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
-	mirror://gentoo/${PN}-0.17-patches.tar.gz"
+SRC_URI="
+	ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
+	https://dev.gentoo.org/~jer/${P}-patches.tar.bz2
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~mips ppc s390 sh sparc x86"
-IUSE=""
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-tiny-packet-dos.patch
-	epatch "${WORKDIR}"/${P}-gentoo.diff
-	epatch "${WORKDIR}"/${P}-debian.patch
-	sed -i configure \
-		-e '/^LDFLAGS=/d' \
-		|| die "sed configure"
+	epatch "${WORKDIR}"/000{1,2,3,4}-*.patch
 }
 
 src_configure() {
 	# Not an autotools build system
-	./configure --with-c-compiler=$(tc-getCC) || die "configure failed"
-	sed -i MCONFIG \
+	./configure --with-c-compiler=$(tc-getCC) || die
+	sed -i \
 		-e "s:-O2::" \
 		-e "s:-Wpointer-arith::" \
-		|| die "sed MCONFIG"
+		MCONFIG || die
 }
 
 src_install() {
 	keepdir /var/spool/rwho
 
 	into /usr
-	dobin ruptime/ruptime rwho/rwho || die "dobin failed"
-	dosbin rwhod/rwhod || die "dosbin failed"
+	dobin ruptime/ruptime rwho/rwho
+	dosbin rwhod/rwhod
+
 	doman ruptime/ruptime.1 rwho/rwho.1 rwhod/rwhod.8
 	dodoc README ChangeLog