Bumped EAPI to 5. Removed old

Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

9 files changed, 31 insertions, 277 deletions

diff --git a/sys-apps/netplug/ChangeLog b/sys-apps/netplug/ChangeLog
index 7cadd7737538..717125c87a71 100644
--- a/sys-apps/netplug/ChangeLog
+++ b/sys-apps/netplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/netplug
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.31 2014/03/12 10:10:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.32 2014/03/25 11:03:47 polynomial-c Exp $
+
+  25 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -netplug-1.2.9-r5.ebuild,
+  -netplug-1.2.9.1.ebuild, netplug-1.2.9.2-r1.ebuild,
+  -files/netplug-1.2.9-gcc4.patch, -files/netplug-1.2.9-remove-werror.patch,
+  -files/netplug-1.2.9-warn_unused_result_write_call.patch, -files/netplug:
+  Bumped EAPI to 5. Removed old.
 
   12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> netplug-1.2.9.2-r1.ebuild:
   Stable for sparc, wrt bug #500978
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 1ff51df851a4..fc1a1a756dc6 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,35 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX netplug 1008 SHA256 60ece80219a5ded005c4bfdcc82e66407e68725c373422cddf85f5bef6fabb55 SHA512 c108dd2c204e30a16f2e1e8411f229d4fcd17754a0724cdb95508a0cc06c8dc328d8fa6f62333af202756b45dd2c8f69023d73d14937ca3a0da1fff22a49bc48 WHIRLPOOL a8a0dfc169026dc1f0a7211ff2df3d78d67ac5af290717cec680f14ff2beb7c115f97b9b7de7bb3a304279fb0e35eeac5da34485acf52e79ac2024cc1ce48f0e
-AUX netplug-1.2.9-gcc4.patch 362 SHA256 ad9ac4a60d041decf945861fc41b48ccd2e1c31dc57fc4c9518cd6f495b6f214 SHA512 c28eceae2bbf069a904f9b205caa7786f0e55b86760f64f73a7a277c5a653a337958bc12b827cf77ba168f13c24340f8c66ee0ac4ecd0f9fad1d19d61516db42 WHIRLPOOL 433fcc6e9ec3c99504551f6802f4c7353702c7646c9db53dc27f60e7dc61cf1915ec77714ef2768c007b3d4445bc11bc45a914251f1f02304c5506d731012650
 AUX netplug-1.2.9-ignore-wireless.patch 938 SHA256 75cf296b40316a387c76db51ab2534426a3784ac8ea1ce94b9f32dddd8a3419a SHA512 a045d1a1dfc6d29334aff6ec035244d68e80887bb05f79d0512c87d7ac0dbb3cdf866569762e575b13a6306604e85e0ba951f10d54f88a39ef558ce2a65ddbed WHIRLPOOL 0468db7bb892e78b1313bd2c6dd115b05f84c6b5bd0499919e0d48f49d9a18dd5f9b95089a205bcdd2c8b767d560b596f14053d694f2c264f3bc4420df778156
 AUX netplug-1.2.9-remove-nest.patch 5516 SHA256 282b390c459c1190b55049cc42828916189097faa75695b738a9a6391079a5a4 SHA512 dfcb72f1977cefbdb231c0e7a1ab758e9c753c434d9e5ccc5336a7f606e787fcec943cd1055481d1ba9f2ce9da0e33bf93852a106eeda4b2539d0c66c433945b WHIRLPOOL fcab8a938dacbf8b34ffc91c8efbab459814eac38a2e655589bea2f65d3132bfdd8298197d341a011130160d7877b4fbb26a8610f4796f3305a2db6a2da08c9c
-AUX netplug-1.2.9-remove-werror.patch 375 SHA256 08b43d263f8bbd2200a92a6768099c41f8cb02a4c296fc72b6526520995f9d7e SHA512 2a84283bf999de17f5ac746aee9ea58963956e6023c6d1e5c2280c33f030968d9f7a89edcb4e34b50969a06149086178cd9908907c1f7c25ec632db4da5a6931 WHIRLPOOL e99e20dbbf73f266260d5c8c0a93d36ebf8d1233fa6317093441639c9ce7b8bde08f13dab96928bbb4b259136aa72011b71be27c251d5bf5cf023a2a0453bcad
-AUX netplug-1.2.9-warn_unused_result_write_call.patch 612 SHA256 d5f2fb289031464266562d0b6f64befc7ba76132f04f2a9caffa1c97e3afa5cb SHA512 bf8b0dc83d7126073a012ca78d5ab050943709df5737550e82c65fe1166e25a3b28ea110fe1eb8f8be375815b1da9659fa15b31a8a6b2d2672a3d6a0d9d063c5 WHIRLPOOL 0325c9e1cdcefdf69ac97c07bbe5c351a8218fae1b5750a4b2dbf295fd1b67db0a12557eb06fa5fef732b9d2c3c1fb4a3c486051e59e512bdfc1390aaa05cb0c
 AUX netplug-2 715 SHA256 aaa5549bedfa767d594e76c4fde3b29c2e20c8430a24df13c656b1a2a2a16b5c SHA512 11efb8b8916d40615840c5721aba089dc9f81bf30f2af6f47d6df2fd8f2b6f22e0cd59ebd37fd9875c4af31e064128e93acbef5cf859b3cabb553fbdd2f3c9ee WHIRLPOOL 956f75b28b23ecb862454d05d41148e3f4acf43f249e97325b40433ba58da3852cd300bc40a0a3f27d3474f82d391ee102e4768e6ab869acab612394feec61f6
-DIST netplug-1.2.9.1.tar.bz2 22288 SHA256 bcc7d83975e25b8b2148835f21da3e722c1a0d8a84e828b4dbbf685b3086d056 SHA512 da6a50c3b837d5df9c7736e87782cdf3bb4e493943dab61dac45265f7eb998041efbc5b0cf5a105c4040c44c5a9455374ed0f2a4fa84d8e6a5df1b0cf0294efc WHIRLPOOL 51c3cebd1bfd5278f8c54024d793c79ce313068c0048ee991e0a1946c499932d604f6fa5d01a4de52bd4a5dd0f533ae7fe85c230d3605d860534d478e196786a
 DIST netplug-1.2.9.2.tar.bz2 22332 SHA256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c WHIRLPOOL 51d54d4c7784b82b71b3a8964c9df3f17e8df1b21b11a95250f911c6f0917aabab1bf0fe5117884623b3222b1df0c443ce4416ad74f63c0d761f762e5f39216f
-DIST netplug-1.2.9.tar.bz2 21786 SHA256 15e7928c819c72108432b0d573110630ff6eb2f7be05e5a6dc1dc04fa05f63b1 SHA512 fb3feb2658e3314b04c2922b9fa461df9560be54a502307f090b4a86b3c4109e68bfd6fdf5a574199fa527de52002dfbc935994cb667c9242194c82499ac746e WHIRLPOOL 2844f99b3557f299cf43402bf0ba1e18c22efe1801dee5ebe660418cc92a297366fd4efaecff049464a40be858c02ef82f147212109b43cac97c98ec604ee953
-EBUILD netplug-1.2.9-r5.ebuild 1831 SHA256 44402fd8b36da08262c525ab48d3ac2e70e26c7dbd1525c3915fff88ce904c52 SHA512 bf03717f210a6b1699510b36016eba321f939af6d30c8b1178148eb65c57f96e2d7573f5ad9b37369ab498b272a84d2b8aba279b5a35a0e5dae4cf33050798c3 WHIRLPOOL a16c4779ec35a1e16201b2632e7a9675946c35a01d5abb6fe7569f5c9cccf79246988f7310c106fdb97cda2c1fe64bd4972c66894ad2183b51bd3bab500825d9
-EBUILD netplug-1.2.9.1.ebuild 1636 SHA256 8f097d9f49f2f19546889dbcb46237df4b82adf192fc880cea7feab8d73740e9 SHA512 150fed4f5fccda7456df06cdb042247ff307920edc620255c272f1ab2b45e9f99fed3ea1c68c857c049ab298e78989394d31c134b6605ce6d04e2e3a94e6f158 WHIRLPOOL 02b3349637effaeb5381f06d29fe78c143f4c9f35ba0984c0ec902f87ba901aa5622167e7bfc604a531501e39086f493d9e0c7fdd523ea652318c8fe0bab72b8
-EBUILD netplug-1.2.9.2-r1.ebuild 1510 SHA256 86514801df8dc2bbb6ec66c3061c01f83093571c798230a1fc652492a2c50747 SHA512 457f0780f8a60cac2a6d275db9468adc784eff2ad000f629ce5d10b5e832265eca9a59ec40f9b60d27bc87c5a151baa10fb70d8e07a5e8baa2bf2a2a015c104f WHIRLPOOL 9703ea6cf366f0e839eb717fcd0840cfe9b36d7bbaf728c4dc93d039c09a02ebeaa4f3878651ea337dae65d9c093df93d48fabb421274b5c9e84bd184961ed7e
-MISC ChangeLog 5085 SHA256 5e891551c42e264ac0534f8f00d37dfeb3aa8b1cd1e9b84c02f0eeb7859a020d SHA512 861c6131269f04b4083c2176bcd63358937c6a5932c297082142749527061de317cb06eda247fdc13be5b70c90f7ea5a30e2520a103dcd0cfd586a7987c9c73a WHIRLPOOL b35991e9092433ddec7255f559c5027962bc14fa7b4c2467ffd0a0b2e3c55092ce2ea43930f122aba8c1e6ca755231673555fe4ef98a5799c13bcb4889d17a0b
+EBUILD netplug-1.2.9.2-r1.ebuild 1412 SHA256 0e7791be7008609bfa13c7d37d376cc32d9bedce99fbf8435f0904d1e375ea40 SHA512 08fb8aa38b25d8fc3c270a14c767e6cd734569685b7187462b577f74d7570ed459276974230598b3277eb2b0fc130c6376003c4f9b465b5303ef3a7b2e25aa63 WHIRLPOOL d490d5f6b55b8f15732efedd89355da5342462ea4209c22bf4b5314671510a3ca80b48ef19b8a90291fd8ae6dcc69b34c29d725b734131072cd0171aafe4f3ac
+MISC ChangeLog 5415 SHA256 600478475c32b243904b680311920239fb093cf68694045fe4fc3ee86191c6b0 SHA512 268f20f234016ef0a94d81dec7705756601db257d4da183ad7bd54d3eea22b79b4714f46c516577b14a5e9ddcf073c580d583d815360c71311435ca405e01e5a WHIRLPOOL 5b5c5dc97eefcf7e83348901b92bef9c853d169936c63428bfc81727faaaa97dc83b83dec14d7e936d6ba1158af79a5e696cd3a26b5737465e0cb0280640dfa4
 MISC metadata.xml 353 SHA256 0907dec553f7f4a30b21a2ec89f3574f443dbdda52f066ef47e85de60dc5d257 SHA512 7c41755615ff5d723225b913567f8598d2cae314f4d71c942ca2a87d6dbc29d715cf0c51048fae3829c65c6c5ed9491b4eab078336c03f8ef83934979abccf9c WHIRLPOOL 9ebc49b8cd9407a443017785ad54442704aa01e01c4349fb8cac33017be0b1b269709292c51d85234489d9a65043a32374f381dd599b78c9a7470f135b8d4567
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIDKqAAoJELp701BxlEWfHD8P/1PV+AuEtIyftPZGIbK+p9Hx
-DYRYFSp3YLkZ/vglai6AuLil9bE34clH/Asxw0dvw1fq6LFhRIK9UeZED4p+c26w
-7cEqJUjFReJfSiqYmfO9/9+iNGBA1K69ODpzbwlvAexHRIGtyLtvNPYUpmuRrzfr
-o59uVkk/MaVQ6FhFZxDN05yAsJ7cEb3UCSOGT/dfUsrfzV9ivrXvGESlIK5VIDet
-/7/KzGVb92WQuZC45CYEwwk1z94kxJ9FFv46Px5NGKcdMn4vToc4W3tIWYzAAkdU
-vjxwbnghjkLIpInFLcnSEWbydBTsj2E8aI/lajylOqU7EZARNTzhj4IdITisEJE6
-C1en4/ZI+pwi5T2rcmNxgE7+kpVhQrEEWk7D43ESuSC+PFt922yO6Xak7xpFTE++
-IkFTQnOtjlz9JsDVquHuaYmo+E2V4lDw4P505R901bZzBQhVx/Yx0nvp9kdxeRIu
-LLW2u711Hu4Yeua4NTDcQO4VIwBEZa4DCYTSHPnKbuosTwXJRdVSfoDdYAKriOuK
-mDmMgujh6p19U9zqxhEr6LqZpgZTn9mIsdHMEwF2AIUA3GWyRXDW3um4y+GbIkdo
-WjiHGolR2p8algKcQbf50fmNV3k81kZ10V6vt0qqRvxbVrnFBwa25RrL4kHg+ld8
-KQ8488aGF1oBJ94zAqYY
-=icoi
+iQIcBAEBCAAGBQJTMWKUAAoJEPiazRVxLXTFlh4P/RJokknjNZC4WnqOvpAuFDEh
+pq0Gm5fNDbBU/UNsHHcaMLQftoadR1B1jVJSESyzsw2EpnRJdHHDTWR0gLlKNl9q
+a8wSX+Gtdeor1O4Xj9/1TDmR5bV0XcOpkIfnZAn4y6e3utscmHObyvXD0sDOF3X5
+2Pyn72yw7YJCWBCrrz+isCuE5XMBL3RySDzQ1bD/1+xl28BJBejMpiThZ/h54sT9
+bdwagyxvnA/yEzPqsXAzkMHYwi9dHbCIMEnO96VhGddnpCoAQ2Z6O5Png74iL/xP
+4l60tutillV/hMshRpxWNACqA+orMJAKlC/WBIy9SW5ONt4BTD0u950g+djsLjcV
+W0oRkarunSNPi63pqttCmQnejuY1LiTSaKH6E11A3igcVuUKoIMYOXewA1wg2xhi
+3UIIZPF0JCQNs0rKhxR/wbvjbMME/YAbRgq3jj4hNrVlZELspi3IOb7fIbgchcxP
+f/hkxOntviy6ah7iGS6ynf8EH5jY8PHqFLPrtwOAGghG0Xu8ZiR35uZPZbY+LGJU
+rF5J7ZoBs+zJyhO4dviZixmdnU79/E9bWF4JPMRhMVX0lMN4pznRqLeIJGAzvuBZ
+nFGsf/uBcBi18PXmbfa5+Td//dDaS3LjWabXZUH2iZBOPFLy2AJwzuaV9hf/A5jO
+uWoyX+WmWgHWM1eqKF5b
+=Z34y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/netplug/files/netplug b/sys-apps/netplug/files/netplug
deleted file mode 100755
index 9105656d9c57..000000000000
--- a/sys-apps/netplug/files/netplug
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# Gentoo-specific netplug script 
-#
-# This file gets called by netplug when it wants to bring an interface
-# up or down.
-#
-
-IFACE="$1"
-ACTION="$2"
-
-if grep -q initng /proc/1/cmdline 
-then
-    EXEC="/sbin/ngc"
-    INITNG="yes"
-else
-    EXEC="/etc/init.d/net.${IFACE}"
-    INITNG="no"
-fi
-
-case "${ACTION}" in
-    in)
-	if [ "${INITNG}" = "yes" ]
-	then
-	    ARGS="-u net/${IFACE}"
-	else
-	    ARGS="--quiet start"
-	fi
-	;;
-    out)
-	if [ "${INITNG}" = "yes" ]
-	then
-	    ARGS="-d net/${IFACE}"
-	else
-	    ARGS="--quiet stop"
-	fi
-	;;
-    probe)
-	# Do nothing as we should already be up
-	exit 0
-	;;
-    *)
-	echo "$0: wrong arguments" >&2
-	echo "Call with <interface> <in|out|probe>" >&2
-	exit 1
-	;;
-esac
-
-export IN_BACKGROUND=true
-
-if [ -x "${EXEC}" ]
-then
-    ${EXEC} ${ARGS}
-    exit 0
-else
-    logger -t netplug "Error: Couldn't configure ${IFACE}, no ${EXEC} !"
-    exit 1
-fi
-
-# vim: set ts=4
diff --git a/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch b/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch
deleted file mode 100644
index 6a9d420400a7..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netlink.c.orig	2005-09-02 11:06:57.045223697 +0100
-+++ netlink.c	2005-09-02 11:11:30.637151062 +0100
-@@ -284,7 +284,7 @@
-         exit(1);
-     }
- 
--    int addr_len = sizeof(addr);
-+    socklen_t addr_len = sizeof(addr);
- 
-     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) {
-         do_log(LOG_ERR, "Could not get socket details: %m");
diff --git a/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch b/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch
deleted file mode 100644
index a15fdd269d9e..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2009-02-25 23:31:40.000000000 +0000
-+++ Makefile	2009-02-25 23:30:52.000000000 +0000
-@@ -9,7 +9,7 @@
- 
- install_opts :=
- 
--CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
-+CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
- 	-DNP_SCRIPT_DIR='"$(scriptdir)"' -DNP_VERSION='"$(version)"'
- 
- netplugd: config.o netlink.o lib.o if_info.o main.o
diff --git a/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch b/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch
deleted file mode 100644
index 023fbe8e55c9..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/main.c	2005-01-08 06:57:09.000000000 +0100
-+++ b/main.c	2009-02-07 11:30:37.017300663 +0100
-@@ -155,13 +155,22 @@
- {
-     struct child_exit ce;
-     int ret;
-+    ssize_t s = 0;
- 
-     assert(sig == SIGCHLD);
- 
-     ce.pid = info->si_pid;
-     ret = waitpid(info->si_pid, &ce.status, 0);
-     if (ret == info->si_pid)
--        write(child_handler_pipe[1], &ce, sizeof(ce));
-+    {
-+        s = write(child_handler_pipe[1], &ce, sizeof(ce));
-+
-+	if (s == -1)
-+	{
-+	    do_log(LOG_ERR, "can't write into pipe");
-+	    exit(1);
-+	}
-+    }
- }
- 
- /* Poll the existing interface state, so we can catch any state
diff --git a/sys-apps/netplug/netplug-1.2.9-r5.ebuild b/sys-apps/netplug/netplug-1.2.9-r5.ebuild
deleted file mode 100644
index 9c78a56de05e..000000000000
--- a/sys-apps/netplug/netplug-1.2.9-r5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9-r5.ebuild,v 1.5 2012/03/17 22:49:47 mattst88 Exp $
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.red-bean.com/~bos/"
-SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86"
-IUSE=""
-
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir "${T}/fakebin"
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}/fakebin/bk"
-	chmod a+x "${T}/fakebin/bk"
-	export PATH="${T}/fakebin:${PATH}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove debugging from Makefile
-	# Remove -O3 if we have -O[0-9,s] in our CFLAGS
-	local remove=" -ggdb3 "
-	[[ " ${CFLAGS} " == *" -O"[0-9,s]" "* ]] && remove="${remove}-O3 "
-	sed -i -e "s/${remove}/ /" Makefile
-
-	# Use correct structure for getsockname arg 3
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${P}-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${P}-ignore-wireless.patch"
-
-	# warn_unused_result of write POSIX function (which can fails)
-	epatch "${FILESDIR}/${P}-warn_unused_result_write_call.patch"
-
-	# remove -Werror from makefile
-	epatch "${FILESDIR}/${P}-remove-werror.patch"
-}
-
-src_compile() {
-	tc-export CC
-	hax_bitkeeper
-	make CC="${CC}" || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-}
diff --git a/sys-apps/netplug/netplug-1.2.9.1.ebuild b/sys-apps/netplug/netplug-1.2.9.1.ebuild
deleted file mode 100644
index b2caa161ce93..000000000000
--- a/sys-apps/netplug/netplug-1.2.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.1.ebuild,v 1.1 2010/02/22 09:50:14 volkmar Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.red-bean.com/~bos/"
-SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="debug doc"
-
-DEPEND="doc? ( app-text/ghostscript-gpl
-		media-gfx/graphviz )"
-RDEPEND=""
-
-src_prepare() {
-	# Remove debug flags from CFLAGS
-	if ! use debug; then
-		sed -i -e "s/ -ggdb3//" Makefile || die "sed failed"
-	fi
-
-	# Remove -O3 and -Werror from CFLAGS
-	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die "sed failed"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${PN}-1.2.9-ignore-wireless.patch"
-
-	# warn_unused_result of write POSIX function (which can fails)
-	epatch "${FILESDIR}/${PN}-1.2.9-warn_unused_result_write_call.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake CC="${CC}" || die "emake failed"
-
-	if use doc; then
-		emake -C docs/ || die "emake failed"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-
-	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
-
-	if use doc; then
-		dodoc docs/state-machine.ps || die "dodoc failed"
-	fi
-}
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
index f49577c25ab0..d505050c44b0 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild,v 1.7 2014/03/12 10:10:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild,v 1.8 2014/03/25 11:03:47 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -22,11 +22,11 @@ RDEPEND=""
 src_prepare() {
 	# Remove debug flags from CFLAGS
 	if ! use debug; then
-		sed -i -e "s/ -ggdb3//" Makefile || die "sed failed"
+		sed -i -e "s/ -ggdb3//" Makefile || die
 	fi
 
 	# Remove -O3 and -Werror from CFLAGS
-	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die "sed failed"
+	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die
 
 	# Remove nested functions, #116140
 	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
@@ -37,10 +37,10 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CC="${CC}" || die "emake failed"
+	emake CC="${CC}"
 
 	if use doc; then
-		emake -C docs/ || die "emake failed"
+		emake -C docs/
 	fi
 }
 
@@ -54,11 +54,11 @@ src_install() {
 	newexe "${FILESDIR}/netplug-2" netplug
 
 	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
+	echo "eth*" > "${D}"/etc/netplug/netplugd.conf || die
 
-	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc ChangeLog NEWS README TODO
 
 	if use doc; then
-		dodoc docs/state-machine.ps || die "dodoc failed"
+		dodoc docs/state-machine.ps
 	fi
 }