Update to EAPI=4 and fix building with latest git #248421 by Diego Elio Pettenò.

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

4 files changed, 45 insertions, 17 deletions

diff --git a/sys-fs/yaffs2-utils/ChangeLog b/sys-fs/yaffs2-utils/ChangeLog
index f894d34d71f9..6b6a7a71a38f 100644
--- a/sys-fs/yaffs2-utils/ChangeLog
+++ b/sys-fs/yaffs2-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/yaffs2-utils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/ChangeLog,v 1.3 2011/09/21 08:16:06 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/ChangeLog,v 1.4 2012/11/05 07:15:02 vapier Exp $
+
+  05 Nov 2012; Mike Frysinger <vapier@gentoo.org>
+  files/yaffs2-utils-9999-build.patch, yaffs2-utils-9999.ebuild:
+  Update to EAPI=4 and fix building with latest git #248421 by Diego Elio
+  Pettenò.
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> yaffs2-utils-9999.ebuild:
   Migrate to git-2.
diff --git a/sys-fs/yaffs2-utils/Manifest b/sys-fs/yaffs2-utils/Manifest
index d5506b686dfd..5cde1ad1d3a5 100644
--- a/sys-fs/yaffs2-utils/Manifest
+++ b/sys-fs/yaffs2-utils/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX yaffs2-utils-9999-build.patch 933 RMD160 f9f0f3c17588e1e7da2b5cffd075956e4fff3697 SHA1 989fc98f1b6ebc5cea956fcc0d6738b73f5afc66 SHA256 a3a997a2ae5e79dec8b263d514fe19efed5d3be90db8490559c13644694de44b
-EBUILD yaffs2-utils-9999.ebuild 659 RMD160 bd432f5f08f62f2fe6c6c3c22b89d899f95103dd SHA1 b6f08fc38aa5ab2ad9d7ebb1926427c9db5c72c3 SHA256 58476f806e43446a110aeca19e5dee9abfd38a0cf6016667670ae58ce21c20c5
-MISC ChangeLog 618 RMD160 835df7491fc40b676b14e87320fb85cbd731bca2 SHA1 4bc45c6c5691ac0dbe674becbd7aa0aaafbad3dd SHA256 3fc63ec85778544834d0cbfce37c23f85ca21f5bac51fb8604b2fa19d551a27d
-MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
+AUX yaffs2-utils-9999-build.patch 1373 SHA256 05c5ef75b8c2472f5946f3a062842194925cea7bc87b8a058ea1367e1862a2f9 SHA512 4c39117805985fa4cd8956bffb360e024211777d4e4f6ac1bfaf9143f88b5fa255a443ffab64594306cec03cd40173117970e8d7488e370512c86ac96ee21a04 WHIRLPOOL 967649c92fa25514a0c55602953550b1e7e27394e4c707e7d6f33cf7dc8908c1e597f1fc5787e520c991ebff9b10f5ee448f3e77da038ca08f253c51e10ee1cd
+EBUILD yaffs2-utils-9999.ebuild 652 SHA256 316355507fc00145aa6f184576334bc05f920f2d9f7d35529a99dbe0f01196ee SHA512 b7b61f2d09d6ea4870d6c813654fd8b993e9781fa9726213520c95bae2f063307f1e3b2431361aa238a3b69e010301338fbaa8f127c384ad7f1d8494d9e7bd16 WHIRLPOOL 09fdd6e2462ff86941a13214d5746eb112ccd7b6448d52c653f1ec71e03f4be3ce5a7127b867edcc647c557d886c8ac859d041c384c8d492fb68aa4a064c1442
+MISC ChangeLog 820 SHA256 ac67eeda7d0d25440b0502155c7d7ca2aa7d90f628e900ae0df84c3dbfee0457 SHA512 56ece9b3f457793c52a43365cd5dd3ef74fd7996bf0e335594275d9e6688fe092acc3dcb75787d8c52d5f114b9c915f743a5a29a17299851b75c9fbde9fe7069 WHIRLPOOL 71d5a1df3ce3848af9ac73efc593bcf24c3004e69fb6dde3095eb1612883fc0441a8d639c62699fb643dd8307f52e95e209b51c11d0b1bdaca5ccbb053538e02
+MISC metadata.xml 161 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e SHA512 4190220cd1cb5f6413a85fab4eb59eebf03d2a63f066f811b76bb8afeb37eeadbab8ee7143970c5ca186e983a46b7e1aa158f5e4b2a3c723fce3112f69969e5c WHIRLPOOL 0f82255faae8b5dfb524458c156619f17938ac8f5166339e4a3ce9d3312e7466847bd5cb7e0554d6ba810dda68fe414e5cda7095eb5629ec2aeeb774b432da30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk55ndAACgkQfXuS5UK5QB17hwQAnRdA9orV+q1VTUJ6AGHeFKiI
-F5x3nseuPjus2ZProoSd0Ldarv885faGReuAgg1kVfHRnmbNv0/fBLjZ5T615eQd
-sAWnTKeIraOBzmQZB/VciVOL+bXMZVWHw6Xq7WjvFxZwERWqoKJLluAMnPW2/TbY
-ESK43l4nijPy6O2DNuk=
-=xf9E
+iQIcBAEBCAAGBQJQl2eZAAoJELEHsLL7fEFWQk4QAK7BzgmIAiw362TQyBF/V2hJ
+11MRieHDueDf3WB1JkVbgTl3MMrWFY3b1qZCDCy1K5s7jYZz638TaLz6N4A/rmZR
+lUIc4TBWYaFokqwSSF+juB3W5Fkd/lTBf2LD+i0pILTBG1h3mW+6Qjlaf/XCwUWc
++7v8BFlAr6CLvR7SfFwaykI6G0cKooy1YqKaa7guD38+2UkdSCEtVJZTRdR7gdXe
+R6aJp+lxhSwwVwtoKVsSr2ryT10Xl/25fQgkY7O6pdh14+sYGKZPwaepnJ1HoDMW
+eOwdizlQUgpeOz9Z88czftUxmxFHoCYUQg/NrVHppIzD51fPKHA65uaXq0F12kdc
+xSJDW6vjc6d2BYc7MyIAymuYn9xIvJl6eXt013e/2hx1dDZCVHJKx0bHNsVHGx4B
+Y/Twvv3PGtYrNSPB8QlTUwN6B5GBgOTx4TTYO2Bv18Mf8151HtbtbBOKTYd8Cie6
+rAfrrKai9wUvov0wAIKRkcu8rTgyQawI8dq06dZ9BBLjaBb7+eeLIRc9O4Fa7kQl
+J+mmmQ+ytlFMScPvww5Zql+U9lbvHZgYR+fCpZ/+SlYF7bp3tkxb2RDAxfg+wY2G
+EU7uit2ZDVt9iEzUWHv+UQbReReZqQdyRxb1ngAYDM6YdX2GHT6yk49jHA2s6I42
+I15X9GOiozdhkcohrFT4
+=t1uq
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch b/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch
index c820ee554cec..ecbb958d434b 100644
--- a/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch
+++ b/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch
@@ -1,3 +1,15 @@
+From 3f4b0661b63efaca78791612ce9be84271d784a5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 5 Nov 2012 02:08:27 -0500
+Subject: [PATCH] fix build build system
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ utils/Makefile | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index 710ebbf..26aea6b 100644
 --- a/utils/Makefile
 +++ b/utils/Makefile
 @@ -16,14 +16,13 @@
@@ -5,7 +17,7 @@
  #KERNELDIR = /usr/src/kernel-headers-2.4.18
  
 -CFLAGS =    -O2 -Wall -DCONFIG_YAFFS_UTIL
-+CFLAGS+=    -Wall -DCONFIG_YAFFS_UTIL
++CFLAGS+=    -Wall -DCONFIG_YAFFS_UTIL -DCONFIG_YAFFS_DEFINES_TYPES
  CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
  CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
  
@@ -29,3 +41,6 @@
  
  
  clean:
+-- 
+1.7.12.4
+
diff --git a/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild b/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
index b144eec94ab9..2f6b41340740 100644
--- a/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
+++ b/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild,v 1.4 2011/09/21 08:16:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild,v 1.5 2012/11/05 07:15:02 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 
 EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs2"
 EGIT_SOURCEDIR=${WORKDIR}
@@ -25,6 +25,6 @@ src_prepare() {
 }
 
 src_install() {
-	dobin mkyaffsimage mkyaffs2image || die
+	dobin mkyaffsimage mkyaffs2image
 	dodoc ../README-linux
 }