Update to EAPI=4 and drop custom patchsets as all changes are merged upstream now.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 31 insertions, 32 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 00501e350061..ed5b63236739 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.156 2015/07/21 21:19:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.157 2015/08/06 16:41:53 vapier Exp $
+
+  06 Aug 2015; Mike Frysinger <vapier@gentoo.org> net-tools-9999.ebuild:
+  Update to EAPI=4 and drop custom patchsets as all changes are merged upstream
+  now.
 
   21 Jul 2015; Manuel Rüger <mrueg@gentoo.org>
   -net-tools-1.60_p20110409135728.ebuild,
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 31924695ca2a..12bdc450c1b6 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce
 DIST net-tools-1.60_p20130513023548-patches-2.tar.xz 14780 SHA256 4eba8545c64db6d2b0eedca45ff7346e4c0b6f1b526ca31b2db6462a0ec0be1b SHA512 6cb4ce7324bae696997839492edd3578e8c9971395de5d499a735ef6421aacc37d24311ada4b94e596c61b55660e2a4babb58f2403ef83da7ac32d2ccbf23201 WHIRLPOOL 200f0a5a88c1e637d183dd098ec1077ee565f0cac1b021b9500a803e2717143184d2c6c597158d73867331b1dc5e474e4858654b6927c314522cd228f660c00a
 DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa
@@ -8,6 +11,23 @@ EBUILD net-tools-1.60_p20130513023548-r2.ebuild 2768 SHA256 b47d0d1fa80a42574cbf
 EBUILD net-tools-1.60_p20130513023548.ebuild 2750 SHA256 841667628d6f50efb72781ab8e7237d7e24467b94b1f1932e43309400161a150 SHA512 a3be11018a60ff9bc1ffdf5ed32b4e9b9a03fc60d1ee086d6fe7c62bb113df9f318fbd28d5d6517d894d8b45fc15321d99174e2eee5bf06b8e752e2eb1810923 WHIRLPOOL 99f6498ff5506e26784050b6e17a54e7dc4eaebfab737aaf43c876fc70d344ed78b1b200acf6ff45762967580e7063edbc7f46800b069ad0be2d5ce0f706ce2e
 EBUILD net-tools-1.60_p20141019041918-r1.ebuild 2768 SHA256 0e9aea08031f2ece2cfd5ff32dcedd97ca559eb9c5a66d0b55c3b831bd039ef9 SHA512 b40d19bd148653e131f38d73d4f480878ee91c6dad3ec3b835f82528d20f44d15e60488da4f125cad59c196e6b817a5cb27af483d675b18bfc480cb542e37b4f WHIRLPOOL 5a8ac3bdcba17029e2cb6c6eb98427f48a45494d4e3c4b2d7139ec7e5daff21238ebf3584be33eaab54c9ca75fe70f9f8ae8b81248438ec14d0eebd69cd6609f
 EBUILD net-tools-1.60_p20141019041918.ebuild 2762 SHA256 ce6a04c70d73b8f87e5d2a351f2b5b62dda342f8752bae6c43df67d7755315a7 SHA512 14db3ec825bd3b33d3872e127b490e04a3d37dfbda14637e2946f4740c76b3487e9033cec88c7d0b75bc07b04e3914e9eab34bd12970816199fcc42ec3a4cbc6 WHIRLPOOL c7158dee8644c113414607d579c96acb1b2a24749c22d1f4dcb5f7e27f4fc7efda4e1f1eb76f461e8a9a957982188e05e7cb7286fd20af383a0780edd7b11465
-EBUILD net-tools-9999.ebuild 2639 SHA256 94e2f44d3e21f6f93a55cc23f53d616fe7eb0b3315ea674af4410a9c1af574ac SHA512 e27238fc8811f2ca62e9a9807ce3a8ce6212b506fd0482b74e692dc3c6fba818602cfa37fe2b93c107f83800655255a5780e46e64de6478f51bdaea61bb90308 WHIRLPOOL c0fad392c57d3e9495fef7bb6f71518deaca153c1b1b408b9e0d24ce676f9ac302b3fee4e7f6f5a53286d5f26cc995ce1ac03ab32e792398d7938578eee847f6
-MISC ChangeLog 24844 SHA256 6c7e8a3bff9b17628a0968d7335aad126f7d7c0e4e88e8c15bf3a87afb0b6fac SHA512 ee901887d11c798f8435e66e262ae5bc4110cf70a4501bd890eb3ca68bc8174f5ee4f0806a437b6334d893695b64492decd81e7c02a4b9f09e0c5d228b8e4f09 WHIRLPOOL d4505ed25da350c5fcf44542f554dd78492649320d2c790b0058f754762d9ffb2387f2690f276703a01ebb0781bd4ea39a97e182d3ad96c7108317af1b9c7e29
+EBUILD net-tools-9999.ebuild 1950 SHA256 f77cc5462b2cd061804032920c90a2cab3c993a3a2e71c951de43bfcd4be97d6 SHA512 3f0644add929994ff5c74d1ce04f9a890421930eb13f64164e75fb1ae55a831fda3946d06c7a7b17fecc2279c820c820d15f74615df1e2c1e3f0d1af7faa277d WHIRLPOOL 8af0722b10e95009cbcb3c7650e8581fb694a59fe17cedebbc8dd3425ad6692e7195aa08e98d2536def4c4a0c7c00a2c45112b50ddd82a286ba013cc920496d4
+MISC ChangeLog 25006 SHA256 48a7f6ba1885082cc136ec093bb0fa60fdd15f750568b431008592701dd89b9e SHA512 9b862acae7f12b8197477fdfd5f18d18791a2d625f2bc9efacacd3d1dc50ce2818f4515af83f5f2a760c2829eaacf17449d8a56a5b5e85ee1a96242234d9e235 WHIRLPOOL 9a4dd77390d2dd49a004299dce7ce424cd94d6e98e7413ab4a2acec5afe9dd17ea8de02833326ec843de99f8425e5e56c26516dda7eb6438624eef9aacbfafa5
 MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVw45SAAoJEPGu1DbS6WIA178QAIEBXIUjpnNbW+Je5wsyS3V8
+l9vcQlN+la3Ap8i65SwFKGIEgvxrFdGh+9wY3qlKDWx5jDEl06Aj1K0h+IfX7NL9
+cn4AyLsqxxdBTUaOoTC8A04/MM3NpmRgy3yHowYKn5gmZznQBGGmfhbfAjcOXeqR
+QDrhOrU1Q+dL/BxMRZcDpEdlkRjXN1JDS/eMk9TKThkAtG8VrV3/ALvO8l8IAz/m
+vSNBJq14J6d6U7XZJfsoQ6TB2SrAKkNiYqlKDfATWuWRJg96A3tNhJ2OHnuG7MHH
+ACEn8mx8s8Vm6wByBVX/4ulWyCY3IU07qP9OXdE2oC/ENYm++NVR5/A4tNiSEuIh
+YdoJqJojwTLM2fq74Jkfox88VjIDyXfsID4drStEhSGcC00NmDpXk1op5d9w8iA0
+OHQ3XqWF+ibF4MG6ZFlusHQwyPjMDWGVXk1V0A+JLPpTZk8W9MtnryOEUoVYCad+
+gLA1ijO4djUKHtiS3pqEueGkEMS4UmjEr7w2t3tSv7AJpCt6yE4JzvvJMjF/SKxQ
+mUUKRFlHaXkVg3WmTR8Z0pnGd4rlieWN5XcljklADW/nvmS/xfnrPGOGhVUoh2jT
+AOcC3PsEEztaKu/nVeMtpCPZE9UUw1sf/9qeks8IO14bSJYMJZHTKQ5Lm3QTRPxM
+KcLVs72TzLT8eCGRiQwD
+=9sbN
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index a6605371a978..f2e9c042525b 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.9 2015/04/25 16:36:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.10 2015/08/06 16:41:53 vapier Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
 	inherit git-2
 else
-	PATCH_VER="1"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -41,14 +39,6 @@ maint_pkg_create() {
 	tar cf - ${p}/ | xz > ${p}.tar.xz
 	popd >/dev/null
 
-	local patches="${p}-patches-${PATCH_VER:-1}"
-	local d="${T}/${patches}"
-	mkdir "${d}"
-	git format-patch -o "${d}" master..gentoo > /dev/null
-	echo "From http://cgit.gentoo.org/proj/net-tools.git" > "${d}"/README
-	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
-	rm -rf "${d}"
-
 	du -b "${T}"/*.tar.xz
 }
 
@@ -64,12 +54,6 @@ set_opt() {
 		config.in || die
 }
 
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
-	fi
-}
-
 src_configure() {
 	set_opt I18N use nls
 	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
@@ -83,12 +67,3 @@ src_configure() {
 	tc-export AR CC
 	yes "" | ./configure.sh config.in || die
 }
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
-	einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}