Bump to EAPI5

Package-Manager: portage-2.2.15/cvs/Linux x86_64

3 files changed, 16 insertions, 27 deletions

diff --git a/net-p2p/ed2k_hash/ChangeLog b/net-p2p/ed2k_hash/ChangeLog
index 5d3cf3883a2c..c41ed8642f21 100644
--- a/net-p2p/ed2k_hash/ChangeLog
+++ b/net-p2p/ed2k_hash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/ed2k_hash
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ed2k_hash/ChangeLog,v 1.21 2011/03/20 20:04:10 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ed2k_hash/ChangeLog,v 1.22 2015/01/05 15:28:49 mrueg Exp $
+
+  05 Jan 2015; Manuel Rüger <mrueg@gentoo.org> ed2k_hash-0.4.0-r1.ebuild:
+  Bump to EAPI5
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> ed2k_hash-0.4.0-r1.ebuild:
   x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
@@ -72,4 +75,3 @@
 
   23 Oct 2003; Heinrich Wendel <lanius@gentoo.org> ed2k_hash-0.3.3.ebuild:
   initial revision, thx to Sven Wegener <sven.wegener@stealer.net> #31520
-
diff --git a/net-p2p/ed2k_hash/Manifest b/net-p2p/ed2k_hash/Manifest
index b0d603e647ee..1b424d27a348 100644
--- a/net-p2p/ed2k_hash/Manifest
+++ b/net-p2p/ed2k_hash/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ed2k_64bit.patch 537 RMD160 cdf51204473859ce3ac425e7ec4bcc962b4ee217 SHA1 d370aca15c3a3d8864d809a2ca985529c9a51c95 SHA256 360dde1729b634638da63c46dfcaaa5474c3b4e476fbf6e74bddb2828c7b7548
-DIST ed2k_hash-0.4.0.tar.gz 113158 RMD160 6703d34266f796edc200ac2f0a95d6f76c96be0c SHA1 f39dd797b08389a858578498d9025efabfc1b7f4 SHA256 554b2d9fb3ce668312341f43bafc95cf985059d83bf5e82f92547610c7f2bf18
-EBUILD ed2k_hash-0.4.0-r1.ebuild 971 RMD160 35b0649e0cb49d3834802cdf30984c673fd03546 SHA1 2b3a758101eb3e527b2523bbc8dea1f760169c9a SHA256 5ff9ebf1ae922ccac0a10fed0906d117d6eaa9d415e2adabcab037c5ad80cdd0
-MISC ChangeLog 2657 RMD160 f1cc420c148e3fda1c34f420fb75fe666a86dab2 SHA1 70714bf74fb7f70f67c183c41e98761594b47531 SHA256 908859465e8d8f38c4a1a4633fa0c3f38042dc3ae906de91d21a6988932dabb9
-MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2GXcAACgkQgAnW8HDreRaZygCgrqDAcVkB6HVUhvUjMOTVTWPp
-dmQAn3htsnK2706sA39KEoh1U3g27cjV
-=sLbx
------END PGP SIGNATURE-----
+AUX ed2k_64bit.patch 537 SHA256 360dde1729b634638da63c46dfcaaa5474c3b4e476fbf6e74bddb2828c7b7548 SHA512 912fcf1305115d77711db9695f599b2d3d0639cda599ee21e57fd7eac9eba2c1c12774f87b25534d401f35f4c0647a0daa61df14ee307b826b98964ca4b223cf WHIRLPOOL 347864e2dfdb7e6e07d5d191c2cab2eefd4d25c039ea3c4a40c01c319457e59ce8f5e31f66b6b015d35aff7c525e296af533279e8c077aee800a11ade734a72b
+DIST ed2k_hash-0.4.0.tar.gz 113158 SHA256 554b2d9fb3ce668312341f43bafc95cf985059d83bf5e82f92547610c7f2bf18 SHA512 f924c6b39bf82fe0d4e68decb5ae9fb5ce2999e8b1d3083ba97c178f3f716634603982962947cecb2ef20de56672b10e833d104bae9627ae180ba629c9e1b4c6 WHIRLPOOL e65036d632a6dfed746c851c76727fe43ae3fbb7818a0ec2d26d0190279b9a119c2854158124c5bc493ada9421acc0bfcf9229ab3f016e291ac9f8f0c7264481
+EBUILD ed2k_hash-0.4.0-r1.ebuild 940 SHA256 b0152db21eddfa9f904f4dd1389629b7faec6813c512d10274dfd14fef80b8e4 SHA512 2ebdfca3885befb3cff061981a21b108909f6a0812c205e379fc1b2de1aed378f2a61aa87cb7ccba4ed4118cf6e1afebc8239b241c5e51aeffe18b1fbcf74eec WHIRLPOOL 6279b41dc1cf58a5a9e0646597213deecc1b724853a795da0f3f782e5bf3ce9425431d5a851b1e0deaeb3821abe52c639431d5342de4ab555c6c9c711631c823
+MISC ChangeLog 2749 SHA256 c6aac0dcd0a0ec8bb88c8656796c800f43634fb8bafb1c62e658da4dbded7d9b SHA512 b305f2b829162a5251121001fc35ee2793ada84adbed675c969645d912b7654d85893155b450de14405cefda47e65d20e629bad65d26007c5be3633847ea8c7e WHIRLPOOL 2f10e74f8088748702c4f6f3f52f09c1f421a4f3ddd5678cfa34377bdeda2fad4eda4338d919eccf214ac9123d3afa65d332200c3c49d87fdd2ab7ce97c3e78d
+MISC metadata.xml 160 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f SHA512 2f1153c2abadf7a9f4133b1f9a379c67c6a2f24b4e226dc213f36ddd2f8d4fabcc893c094a586f8b53f7b652f4428a689eaf27899db6858767f7cdb984da17ef WHIRLPOOL a901e6830477c343d0f31f7aa0d46e867c4debc40e4db2c41df4a9b3c44a5879729a298f66b813836a47641d569738a5be5547e6d38bea11eb6a9f545db707ab
diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild
index 5a3142dc67ab..6b8f54ae190d 100644
--- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild
+++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild,v 1.9 2011/03/20 20:04:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r1.ebuild,v 1.10 2015/01/05 15:28:49 mrueg Exp $
 
-EAPI="1"
+EAPI=5
 inherit flag-o-matic eutils
 
 DESCRIPTION="Tool for generating eDonkey2000 links"
@@ -15,12 +15,11 @@ KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="fltk"
 DEPEND="fltk? ( x11-libs/fltk:1 )"
 
-src_unpack() {
-	unpack ${P}.tar.gz
+src_prepare() {
 	epatch "${FILESDIR}/ed2k_64bit.patch"
 }
 
-src_compile() {
+src_configure() {
 	if use fltk; then
 		append-ldflags "$(fltk-config --ldflags)"
 		export CPPFLAGS="$(fltk-config --cxxflags)"
@@ -29,11 +28,9 @@ src_compile() {
 	fi
 
 	econf --disable-dependency-tracking
-	emake
 }
 
 src_install() {
-	make install DESTDIR="${D}" mydocdir=/usr/share/doc/${PF}/html || die
-
+	emake install DESTDIR="${D}" mydocdir=/usr/share/doc/${PF}/html
 	dodoc AUTHORS INSTALL README TODO
 }