Update to EAPI=4. Add arm love. Handle AR/CC/CPPFLAGS.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 38 insertions, 27 deletions

diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog
index 97f0120d663a..da63207bfbc5 100644
--- a/sys-apps/usermode-utilities/ChangeLog
+++ b/sys-apps/usermode-utilities/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usermode-utilities
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.38 2012/06/08 13:16:07 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.39 2013/05/12 23:52:16 vapier Exp $
+
+  12 May 2013; Mike Frysinger <vapier@gentoo.org>
+  usermode-utilities-20070815-r3.ebuild:
+  Update to EAPI=4.  Add arm love.  Handle AR/CC/CPPFLAGS.
 
   08 Jun 2012; Pacho Ramos <pacho@gentoo.org>
   usermode-utilities-20070815-r3.ebuild:
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index 902953b57cb2..fe4919f7f7e0 100644
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX usermode-utilities-20070815-humfsify-owner.patch 460 RMD160 119f5e5b9b62192246b58387deadf8c89ba97af4 SHA1 33bd4dada012a4e865c0a4b21efff4b9eb87934a SHA256 e5118622f158da465e5e8a03b89f8993aecd7a3bd786b6912f81f0953ff05a4a
-AUX usermode-utilities-20070815-rollup.patch 4619 RMD160 186d330a4cddf097270b8de0730bf098c3742668 SHA1 0428be479128804018a7a91c1f494115fa7ae59f SHA256 06b9b613d94006cc4bda2baabf371e8de352593262417373bbd23698dd4710db
-DIST uml_utilities_20070815.tar.bz2 50159 RMD160 f231ae4ebe5892a6acdd725fec446692b04dddcb SHA1 4e10de8e0f5bf681fa295572009518b77fd8a1dd SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e
-EBUILD usermode-utilities-20070815-r3.ebuild 1423 RMD160 47d98cbc79353db91f2945ab327cee31615ae34c SHA1 83bebdb92f77bfa5087f6826b31a76c435191b1b SHA256 3f072cde7a4098085284e285ba8203983bd460147af103ab86252df339e54434
-MISC ChangeLog 6970 RMD160 69e7ff094f3614bfe1b36ca3e82d3831236d4891 SHA1 84c0a65335d8acf6a022ecb5978f46d0706e0c4c SHA256 6067bb90ae00c8f8b1c2f7252c20dc460b5dc84ed511d86b072176f96ceae383
-MISC metadata.xml 296 RMD160 118ec31cede96970538d0b35dd632dc02898e3a9 SHA1 2fa6f684c109d1056f6b4339082628621d35ba4c SHA256 a75d8a8aa841ad353463fb8c02a457796223c29f6e90cd7d17ddf8a9f15a3630
+AUX usermode-utilities-20070815-humfsify-owner.patch 460 SHA256 e5118622f158da465e5e8a03b89f8993aecd7a3bd786b6912f81f0953ff05a4a SHA512 f048d1fde80a5fae33a67c99aad5927f64343a1bec15cdab94bb5c8798b96192fccedda66a9aa8f14fb90de803cba031ddec4d9bc6eec236b8245aaa7b74115f WHIRLPOOL f6161be0748f3258f9ce20443b1c7246528b138e4ac0383ac1765a0489f755be6234c92ff8e90fc3b4d342337d4e211fffa549c0945d8c6c414e75e8a5c76d7a
+AUX usermode-utilities-20070815-rollup.patch 4619 SHA256 06b9b613d94006cc4bda2baabf371e8de352593262417373bbd23698dd4710db SHA512 9cfc5a2fa98b7aff45c732629812ab691d3a56e5526f70d9ddb93dd666b9bf743296914f63043a94611e045915ed8046c87507a451deebc3d889d0827dc76439 WHIRLPOOL 8712020dbc151891e1c0ec0f2a5a9f595a38b99a6c7b68a11d4eb50d7af72574fdb960b87eaa403a8451947b68e8feef251523dbc8822e62108dbd4d310ec2e8
+DIST uml_utilities_20070815.tar.bz2 50159 SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a WHIRLPOOL 343e755da98d3d6a714a7c26cc917b01af7fc737c4a24806ad04c902e5a919cfdd831c3b18d7a2c5c7a271266f58d167ab9a788543b5a0f5671b9a6b639a37b1
+EBUILD usermode-utilities-20070815-r3.ebuild 1356 SHA256 2518fd12e706cde85e53cdd225eb4d9230edc7053723965ecbf11a98816b3117 SHA512 f5f290b2c56a8168ac897e94039a80999ec1b2d1407f369b38fc495cf200c0cdfd890772bc403c736f65f3f5fac0447233586944ff352425dfe1880866b8271c WHIRLPOOL 33b114ab6719eb9e065f1630896f12d08b1b40a38eb7e9582cff5d0af9f6bb856353af05a692d4d8f044867ad5b63ff802ed05afc6b91353a58f1fa9345d23cb
+MISC ChangeLog 7122 SHA256 fd5f5ffc1770eeee236c97f5e4503385831f326de53489aee75c80e450c87c73 SHA512 88ca3a223136adc0d673dd86c85fd8d908cbfe83eedf72b50b6c6fa8efec0bd161385ce3e78308e0bad65c2069bc9c661b41cd181a2dd8942c2b37abaf4743d0 WHIRLPOOL 6e1b1d3be9b6ed519bc3120343acffd9375abed5e9f85262a346209fb1d8e2cb81400cfc207f24cc45341ad3ac322bf9993be54dbe2e9efd46ca2e94ef897218
+MISC metadata.xml 296 SHA256 a75d8a8aa841ad353463fb8c02a457796223c29f6e90cd7d17ddf8a9f15a3630 SHA512 a5ddf9f23ef27f38ccfa9c25ad914aff0d73b4cbb435d91144a7fcfa61e7a6930789be37433f4322040b8449e2ad714b036060314fc8b4d9bd615979967a7d5a WHIRLPOOL 31c3e1b33ee15ef00eaddffafc138bfc1c2969272996f73300fa884b87d7b4bd40a58e1b3f00b567e88a48c89eb6458fa0eddcee5f3c6064d42173d12788cd92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/R+x0ACgkQCaWpQKGI+9QspwCghhcwXPYLDLGAqG9rbhlxxp0t
-6e8An3SifCAidyISWqC+2ZdvZL+1YG8w
-=j7V/
+iQIcBAEBCAAGBQJRkCs2AAoJELEHsLL7fEFWAOwP/RDEvF+Y5Ab51j1nz1RXNeWY
+DjlL7Mob5sdcttyZ4Zkc2lq5lfH31jR2swMwyyhg5gSpWOgMsVbJzwDIO8KzwQxx
+lko1UsOA8IFIuzi82rS+8hgkU6EFZQF9ZvlvHa1bw44498A24aI/S9Q2CzRTwhmr
+6rG2wmJT6Nzs+cytVvvt7ZiEiuZqZ+TMiekXPqI3NOPTuoYpxcQFh41sZkPgSJ3A
+LeARf4aRczTU9lrbtO5dte/KSv2eMRhKAUHhAROnNqildRnlOQri3xz845bvGSnc
+u75A1fvtqv8u2VXeShzwgZ9opz6JX2Tncir9TICud8y32wMq/9xNGfqSL5BKBJrt
+Sr+sFeKHUoo5AoaEzxyU74OYcNmqv/cVdVoVBfzgMro6AOkrccTFGvNIsR98ZXBX
+3zbNct92YnZPnNi+VGIP+XQkbBt/qFWVPxPGhfmYBlRNNto6GaFshK4bMQP1hymw
+ABdhq+nDk9zm7J7z+q5Sira4OQMRuVZlYTiQOCMLmc5ilOUtxsPF3bSVI/JrkDhU
+6dEUYj1iMKVXGfpo9ZSuYmGbpdC8xXaNy7Zoj9aeGxXugjxX+4y8gsR0qhnwwKmr
+6NxaMoslW00czJK3MQQsFEAFyk2GUC2aBulieDPru4rl+kx2jVUFC0deRqkLKnfV
+Cc8sTkJJlBJ4bz/5hN9c
+=Wixk
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
index 70ae45dfae3c..cfd8189b887c 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild,v 1.4 2012/06/08 13:16:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild,v 1.5 2013/05/12 23:52:16 vapier Exp $
 
-inherit eutils
+EAPI="4"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Tools for use with Usermode Linux virtual machines"
-SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
 HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* amd64 x86"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
 IUSE="fuse"
 
 RDEPEND="fuse? ( sys-fs/fuse )
@@ -19,9 +21,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/tools-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# Merge previous patches with fix for bug #331099
 	epatch "${FILESDIR}"/${P}-rollup.patch
 	# Fix owner of humfsify; bug #364531
@@ -35,9 +35,6 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	tc-export AR CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
 }