EAPI bump.

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

3 files changed, 32 insertions, 19 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index d63b61429666..ce059c5ff590 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/amap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.54 2014/01/20 23:21:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.55 2014/07/10 18:54:14 jer Exp $
+
+  10 Jul 2014; Jeroen Roovers <jer@gentoo.org> amap-5.4.ebuild:
+  EAPI bump.
 
   20 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> amap-5.4.ebuild:
   Download only available via HTTPS.
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 103b669daf0d..ad957911234a 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 4.8-system-pcre.patch 1232 SHA256 608adf3637c8670ad5cfe4a2f69cdab5640b427f94bfed3e00df5c68dbeeca66 SHA512 d22cb148748ec58920c0a66f67adb4df23dd081ab9c4e2e05881ce7029679e2ccf14e3cf6d199c63e5c0974ee6528fa8b0e85044cfdbba32833457e88a856934 WHIRLPOOL 95ff632d7fe74bfa917426bb6c28fe6f4aa9594e4f34c71a4525bfec3e2745040517daf4181978a9d97c85c8395302b0a841b72ce4cd1df21a99cc20b25430ef
 DIST amap-5.4.tar.gz 263331 SHA256 a75ea58de75034de6b10b0de0065ec88e32f9e9af11c7d69edbffc4da9a5b059 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d WHIRLPOOL a7f08440d4e9ccf8ef1909aecebd95bb7a2bb7ddb5917d76b796e146821fe2d962518673faedd9f7665e18b97302e5ac50953f875473dd41328e1b5e77996240
-EBUILD amap-5.4.ebuild 1950 SHA256 352c3b1aa53f18b51f7c2e8ff0e0b26cbcb62e613dc5de8314c770f55aba943d SHA512 75d78e6747ed205c1c37b3fd63e79c5ae1179294a915a46ffb83cf89fddfd7814fd3ca9d7a47e794a25f8af3d857f75a56d38b20f5b65470065fbf377c3e6afc WHIRLPOOL 10854307a47dc6282822bfdaddd253d419cbb3eda53735c31997d08c82f68450eb4ae09668dc67b0aa188f702470295b6c3cd009a7547684f3414d46fa0a31dd
-MISC ChangeLog 7080 SHA256 29fa8ea71df6f96e516da76421a8283963de85ac6c1c6442b53c71d6218d7d9b SHA512 1dbb0fecdca0691a4fcc150f026863a023e7e587c9c836477ae786efc42d73f5fdbd6d3a9393decfa7e60404465da3afdb14bf46ac737c98a3481001e63776ca WHIRLPOOL deaabfc47dcb9989d2286c91e268f4a68bbd37575267373af36e53524e8f7882aad674e9dbbe61cf366d8d3b0a8970576b4a9d08a831f142d16a72ff7fde1445
+EBUILD amap-5.4.ebuild 1683 SHA256 8d85bcdf515832a047aaf0976c5eeb32818f0866af3045b087d0d3593fec6967 SHA512 a0e7c08645dc420b6b592a61e755891af851c3664305c78ce7770c4350c20f7bd87b4108c1704a83c71b4fb076a1278654097c00f2c98a0d19e2169e64eb1691 WHIRLPOOL 1be1f624c13faf8a29b3efa6cafc0e18c2689e2631aa9e237f6f39e7ce314a22f07a464061f9660d1ea739a60b7a3d3002842cd9f310c77242e23fc668a81cb8
+MISC ChangeLog 7154 SHA256 6c3d96543b50c1a6ebdc22fd7c379295ef66a52473ebf0f1cd584850c3747fea SHA512 cbb8ce5b2f276509a84304fe1e00e96b55293fa3c06583c51fc5382a6aac57e1c38d8aa181cabf4d5fb50ac4d67cd20b6f79c0c004a8d5b285fd2180852fab7e WHIRLPOOL 58c5b54f31e38aec21c67220b507a8f1d46a405fc688137ee9f2f6f1bacb29b31d5d9f63f68b9aa71ce80c00979c77aa2cd29433af2326d750d34770becb31d1
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlO+4VcACgkQVWmRsqeSphMVhgCfRmSG03URUHEGHgrwTY29UZ+7
+6AMAnicCBpmJB1FSQJ8afILAWODCPnJG
+=cPO9
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
index 230ce03a9a8e..97edd210aa82 100644
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ b/net-analyzer/amap/amap-5.4.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/net-analyzer/amap/amap-5.4.ebuild,v 1.7 2014/01/20 23:21:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.4.ebuild,v 1.8 2014/07/10 18:54:14 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -25,48 +25,48 @@ RDEPEND="
 "
 
 src_prepare() {
-	rm -rf pcre-3.9
-	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die "sed amap-lib.c failed"
+	rm -r pcre-3.9 || die
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
 	# Above change requires below change. See sources...
-	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die "sed amap-lib.c failed"
-	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
+	sed -i 's:/usr/local:/usr:' amap.h || die
 	# Files to be updated are at different location, bug 207839.
-	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die "sed amap.h failed"
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
 
-	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die "sed Makefile.am failed"
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
 
 	epatch "${FILESDIR}"/4.8-system-pcre.patch
 }
 
 src_configure() {
-	# has it's own stupid custom configure script
-	./configure || die "configure failed"
+	# non-autotools configure script
+	./configure || die
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
 		-e '/^XLIBPATHS/s:=.*:=:' \
 		-e '/^XIPATHS=/s:=.*:=:' \
 		-e "/^CC=/d" \
-		Makefile || die "pruning vars"
+		Makefile || die
 	if use ssl ; then
 		sed -i \
 			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die "adding ssl"
+			Makefile || die
 	fi
 	sed -i Makefile \
 		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-		|| die "respecting LDFLAGS failed"
+		|| die
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}" || die "emake failed"
+	emake CC=$(tc-getCC) OPT="${CFLAGS}"
 }
 
 src_install() {
-	dobin amap amapcrap || die "dobin failed"
+	dobin amap amapcrap
 	insinto /usr/share/amap
-	doins appdefs.* || die "doins failed"
+	doins appdefs.*
 
 	doman ${PN}.1
 	dodoc README TODO CHANGES