Clean up.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 18 insertions, 14 deletions

diff --git a/net-libs/netwib/ChangeLog b/net-libs/netwib/ChangeLog
index efe19e333bae..bb081065e7a2 100644
--- a/net-libs/netwib/ChangeLog
+++ b/net-libs/netwib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/netwib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/ChangeLog,v 1.41 2012/07/09 00:11:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/ChangeLog,v 1.42 2012/07/09 00:27:49 jer Exp $
+
+  09 Jul 2012; Jeroen Roovers <jer@gentoo.org> netwib-5.39.0.ebuild:
+  Clean up.
 
 *netwib-5.39.0 (09 Jul 2012)
 
diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest
index 59c1d7614636..dc1d67b777bc 100644
--- a/net-libs/netwib/Manifest
+++ b/net-libs/netwib/Manifest
@@ -6,13 +6,13 @@ DIST netwib-5.38.0-src.tgz 631286 SHA256 1be7cb56b69d94c711d67b9a460239bfec2797d
 DIST netwib-5.39.0-doc_html.tgz 139572 SHA256 983cfc810e1a277b952158d4512c0fba36d3f2a83833213f338952ec0f2fdd18 SHA512 0920642854f71b4c20a8b0844d152aa1107b7cfe927524391626bac97185024261e0efbcb681b978fa612d04cb71a804c7ae604d2040c87d27d118c004940345 WHIRLPOOL c94d3b85781b825fd01b452829f49f99e8cf1bc4e256e22daba77632774add15ad496785cdf8e3a9c7206bd6f4ae2611820373afb7128e3ba574d6a92d74f03e
 DIST netwib-5.39.0-src.tgz 641757 SHA256 574d72d9bf8b0ed0c25a6b5e902b768727d404c44d570f769b4b1219aa66946f SHA512 eeb3c51c48ed22762fa0e4215dfd239fb97fc0b34f28382d77ad863ed1f2f4a1f26195517fcd26c4b1a96195c895bd7b7ed121af975b5dc49b1bc378b11ef234 WHIRLPOOL 540b330b76b3f0e82dbc6468d9b2c578e16c942b1bb6351a03f0ae9c11eee70a44c97f952bf212bcf68568dcf6952b946ae454addc3db605d7c0859289e340a4
 EBUILD netwib-5.38.0.ebuild 1456 SHA256 2b1e149bfaa4ef0525a9ff0e1972cadc63947a49a733290fa36703d89adfe8b1 SHA512 5fc3d95e24f871eab24dc8fd57e299d64fdea2f8686737898d5f7dc21781078917b2bc51fe3d6961fff493bf386f816080910c007f62f717712ef4a950509f76 WHIRLPOOL 9b889cef35b40834cb0ea03fcd12d791d3154edfdf275180dbf90f10046cddd76f5c903cbb496c0550fff42eb962208d5ae60d45f40b4f6d458b0bcdff151bdc
-EBUILD netwib-5.39.0.ebuild 1457 SHA256 76d44e8ade082045e30cdf8415001cf79fdfbf2ccc80fda54d59b35ffffbb687 SHA512 a6570c0e5b54d8bc6364159b2d5835b0858f0553af9b9aaa32ad89d0a072e0cebaab48db972220bb30d44611bbe6aa6815e847d9bee3ae1d2b2ae5f2bd244ddf WHIRLPOOL 4d98ccfca292514dd245f38dd466a6f40ae1078dc3fedc7d0eb2856cc25078703a9daa28def6aa7a3e73af0e533be7a3b36a968066868e5e43ac3dea2099f6e5
-MISC ChangeLog 5268 SHA256 8a247eae875e64500a08b8275cecddd0e077a3815073b10b6a288e1fd8b8505e SHA512 3f689591da303ec0489c92798eae6a897660aa30af716522c26c67346ccc7518053c9a19879a1653861775595e3d5fe70a1bcca53be198081a43a72f69f99b96 WHIRLPOOL e5f1147ce7f141e84696ef566a1c496482c836bf2ae8472be9c1e5b48b596219c89b710ca74591d25dffdba0ac4da77aa7d7a7a95e770c7c025c8f2515270013
+EBUILD netwib-5.39.0.ebuild 1434 SHA256 39edb21009ab05604d7f7368fa19126a44293959783d12535fc0189149baa7cb SHA512 5fba4a24ea8b84241ec09f9e96973cef749b6cb7d88f8729b04fbcd60ed9015ba80a73c2279c7af1ff963615ad12f5376000a0adae003784236fcfd71d3e70c8 WHIRLPOOL 9b99c2906a0f311209fb9a7f017637f2ab26b15e8e7fc64ed124841a7e6aaa6d7bba05db8431384413fc993c41249cbce0c295f5741e23ef4888e3a5fd9d1c82
+MISC ChangeLog 5350 SHA256 b9d855555b5a1517ce567b54ebf4953f4ec2aba5101096a77741a4e7b0bfe995 SHA512 1867c2737a534077991cac7ca75ae55d63f4bc3ab69df872f697d8d5936bd684eb567cb735419dd1c5cf058c74b6d287d886c5a398294b6c12d2644bcd242d13 WHIRLPOOL 46f5b0a39b2ea576ecb9fd94e7bd4a16c4789cf0bae0d0d63c4f61b981d091241b5dabbc273898e08b81822c779ed49cacd2b99eac0323e5b7779c1df1ca5441
 MISC metadata.xml 258 SHA256 3a8b57af87e84b5d5c4ee1c97bc23abe48aca00a1ca2295a69ef2d56c45e9541 SHA512 1ec52e962fe3dbd8231ae5a087f7fbdedd05d761abfad2456eb7a7e5dfe31fd252de53b5d5caff44a54bd3ab64f625ebdb018dfefccfa084751e7763b53df77e WHIRLPOOL 72ed7dfe6fc2f60a24d50a5cbbff59bc3baccff858fa9bb73a83c2484e59d0ec337a2cc8c1226efef80e7ea710f8b921cff9cd22d06202c1e9c5781d285b5084
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/6IZsACgkQVWmRsqeSphOgTACfUBe41vfcZqSo5KbvnF1nWLun
-aFgAn0ENV6Eu2d2v2yS+lCAQ5/CRALky
-=EF6X
+iEYEARECAAYFAk/6JYoACgkQVWmRsqeSphPm3gCeL97kZXy33SRiXgIkrfJt8eyJ
+2sAAnRQjLEtw9ACACCKBSpD9NF52aEO/
+=pofY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/netwib/netwib-5.39.0.ebuild b/net-libs/netwib/netwib-5.39.0.ebuild
index 1dbb2c36937f..222410524b91 100644
--- a/net-libs/netwib/netwib-5.39.0.ebuild
+++ b/net-libs/netwib/netwib-5.39.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/netwib-5.39.0.ebuild,v 1.1 2012/07/09 00:11:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/netwib/netwib-5.39.0.ebuild,v 1.2 2012/07/09 00:27:49 jer Exp $
 
 # NOTE: netwib, netwox and netwag go together, bump all or bump none
 
-EAPI="2"
-
+EAPI=4
 inherit toolchain-funcs multilib
 
 DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols"
@@ -21,11 +20,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="doc"
 
-DEPEND="net-libs/libpcap
-	>=net-libs/libnet-1.1.1"
+DEPEND="
+	>=net-libs/libnet-1.1.1
+	net-libs/libpcap
+"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}-src/src"
+S=${WORKDIR}/${P}-src/src
 
 src_prepare() {
 	sed -i \
@@ -36,7 +37,7 @@ src_prepare() {
 		-e "s:=ranlib:=$(tc-getRANLIB):" \
 		-e "s:=gcc:=$(tc-getCC):" \
 		-e "s:-O2:${CFLAGS}:" \
-		config.dat
+		config.dat || die
 }
 
 src_configure() {
@@ -44,7 +45,7 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	dodoc ../README.TXT
 	if use doc; then
 		mkdir "${D}"/usr/share/doc/${PF}/html