Fix installation (Makefile changes), EAPI-4 (thanks Franz Schrober, bug 390619)

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

diff --git a/net-misc/batctl/ChangeLog b/net-misc/batctl/ChangeLog
index 564e0236e7ce78daefe40f22b8f97584e5cd69c5..838ee63477fffc8f9bd72f560dcc7d256b380ab0 100644 (file)
--- a/net-misc/batctl/ChangeLog
+++ b/net-misc/batctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/batctl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batctl/ChangeLog,v 1.3 2011/11/13 23:36:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batctl/ChangeLog,v 1.4 2011/11/15 22:11:40 xmw Exp $
+
+  15 Nov 2011; Michael Weber <xmw@gentoo.org> batctl-2011.3.0.ebuild:
+  Fix installation (Makefile changes), EAPI-4 (thanks Franz Schrober, bug
+  390619)
 
 *batctl-2011.3.0 (13 Nov 2011)
 

diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index 089438d8dac355603bf8365cd18d785866b0f6fb..c136cb42105722facccd7cd24253e712cebb5515 100644 (file)
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST batctl-2011.1.0.tar.gz 43564 RMD160 b4626acc791442340dec93ffd67f32e81dd7adf9 SHA1 e5d2039421049e87c1757312fb0bc6ee99f76c37 SHA256 2eac7875390a895a0f238f5a1e2a62e253d5889d135be86e4eb76ae09a734db0
 DIST batctl-2011.3.0.tar.gz 44519 RMD160 bd785be224ff95d63926232123410b969b51837d SHA1 a90abd309acda0199c0d7cb63e8a0d4408688a34 SHA256 94922fd167d2bca5193cc7465bfc212c2c3595da70e653506493dfc65e4410fb
 EBUILD batctl-2011.1.0.ebuild 1081 RMD160 788cd5eb7b6f9f4584bfee4eeda78b2ae6a2ec74 SHA1 e90e1aae1284e77217214ab0c3a147267f35509f SHA256 461caab0efe4045386d402a2da4c31ff4675b04d30d04d06be1071609dbe79eb
-EBUILD batctl-2011.3.0.ebuild 896 RMD160 3e490dfe3b1a771bd71d9653985db839cbf29612 SHA1 59b287f03df50c2b1372958d5d8e5332e382b69e SHA256 b81544101234fd5373112e2573ff7eb0832fa4fc5771360fe06b55e1e7256ca0
-MISC ChangeLog 749 RMD160 6bfe8530ea62145bce6626643ba4f17db696b588 SHA1 744e6486b8f009ea9263dcf18a7ae024040f7ad7 SHA256 588dd54ebdccc620537663829f47b49495bab7d6bff5318734b70fa95b4686c0
+EBUILD batctl-2011.3.0.ebuild 925 RMD160 cf2942b7f326f1bfb525d17d9ccbf84f395a4358 SHA1 3cabc406c3c0fe0edde138374c0eb9b3c24ba8c5 SHA256 8026c2ef6929aa15c16dbf253491b9548dacdfe04355ba7e72258c6ff0f5ce0c
+MISC ChangeLog 904 RMD160 81feb3ec154afb8039def32129fd915b20e4dc3a SHA1 5581cbb68dc1b7c415c0ec2d130f4129ea90a2c3 SHA256 acd3744bbee33042b3fa432dcd0b41f50929a6f0ea8763344fbd8192348a13ee
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7AVIwACgkQknrdDGLu8JDzvwD+MpwZ/S1kffQ/5oZrllWJjByZ
-iBcaRot+9HgJGD/ZkIUA/RVDmpPwdyWG5hiP/IbtEfNWgq+0XrvQpdP+f7Hap3iE
-=3zEu
+iF4EAREIAAYFAk7C46IACgkQknrdDGLu8JA+JAD/U6CkQUJ9EOGEjkWeB2lSs0n2
+IU+ICYvHIY97lK7aWKIA/jdGYdLmjVgXXVrJiU6qAyoUotgu7qN1fRMRhHoeSYOw
+=xVEJ
 -----END PGP SIGNATURE-----

diff --git a/net-misc/batctl/batctl-2011.3.0.ebuild b/net-misc/batctl/batctl-2011.3.0.ebuild
index 2767d2d7af721c34962c16c46009c40fb4f390cd..a96de29f3036e71018c31beac5ad280fc70675a6 100644 (file)
--- a/net-misc/batctl/batctl-2011.3.0.ebuild
+++ b/net-misc/batctl/batctl-2011.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batctl/batctl-2011.3.0.ebuild,v 1.1 2011/11/13 23:36:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batctl/batctl-2011.3.0.ebuild,v 1.2 2011/11/15 22:11:40 xmw Exp $
 
 EAPI=4
 
@@ -27,11 +27,10 @@ pkg_setup() {
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)" V=1
+       emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}"
 }
 
 src_install() {
-       emake INSTALL_PREFIX="${D}" install
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
        dodoc README
-       doman man/*
 }