Convert to git and clean up a bit #382327 by Paul Osmialowski.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 38 insertions, 26 deletions

diff --git a/sys-fs/yaffs-utils/ChangeLog b/sys-fs/yaffs-utils/ChangeLog
index d332f716da96..b81e55959c4b 100644
--- a/sys-fs/yaffs-utils/ChangeLog
+++ b/sys-fs/yaffs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/yaffs-utils
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/ChangeLog,v 1.1 2006/07/31 05:25:59 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/ChangeLog,v 1.2 2011/09/11 19:01:47 vapier Exp $
+
+  11 Sep 2011; Mike Frysinger <vapier@gentoo.org> yaffs-utils-9999.ebuild,
+  files/yaffs-utils-9999-build.patch:
+  Convert to git and clean up a bit #382327 by Paul Osmialowski.
 
 *yaffs-utils-9999 (31 Jul 2006)
 
diff --git a/sys-fs/yaffs-utils/Manifest b/sys-fs/yaffs-utils/Manifest
index 634602a17c2d..1809699df6c3 100644
--- a/sys-fs/yaffs-utils/Manifest
+++ b/sys-fs/yaffs-utils/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX yaffs-utils-9999-build.patch 818 RMD160 f15e55b7b3c0e3e871d394cb5f71bc27db2fac92 SHA1 d53b2b0a7cc0b8229ec73e6e2f0fbc6392a889b2 SHA256 a4c79000413dd075b5f78937f3b6653a16f7461ca5e7eb05e61bc7c681f08210
-EBUILD yaffs-utils-9999.ebuild 638 RMD160 66935687b3e91b3ccf728839f462e14b49376379 SHA1 a8507720714045374b45570fbb378bb21dcef98c SHA256 bd122082fb5d5fb7530aa17e80fdc52d5f1208a375a9af6badf3a346f3d92544
-MISC ChangeLog 337 RMD160 82eedcc99e045dcf36135f7f48057ab83915ccdf SHA1 e4cbe13e127760f8c238401310f087c6ae50efe0 SHA256 66dcd90c671f74d213eda9284abd1a37c0a31a12e226c8a53f6e76f4c05d11df
+AUX yaffs-utils-9999-build.patch 1009 RMD160 8c5a5e1831fbcc1371806b2be888253cc6e0d413 SHA1 e4b51501f7883dd29079231dec17d35184180080 SHA256 e1ab897b1e82d43f80ed92ae315cc30dabee0ecf0ab45bc068ddd200fb54b2b9
+EBUILD yaffs-utils-9999.ebuild 630 RMD160 bba0297e868bf477edf390253a58b462ef079ef4 SHA1 6354ae73dd1b5c37216bfe9c08adec1e87c6fa68 SHA256 562b4c2022886e649302fb7c0aebb8ebe3cb278e66f369cf20daa9bcde564ed4
+MISC ChangeLog 516 RMD160 9f1833321b041cde973149fc1a2baf5c5c568969 SHA1 1e0b502330860b549a84428a54a829758842311a SHA256 b3a0755c8ba59d9c0aaa87bff9a21175783efb4687eab608ffdb521dc21fe502
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkq08xEACgkQlPl3HsVfCDpeYQCfftfpjE/QdWPy0lZsWJOugTeJ
-l14AnjIRv1fpGbiRUYpLT767kGWhFrT7
-=LynY
+iF4EAREIAAYFAk5tBYUACgkQaC/OocHi7JairwD/WO/NmohTV2i+ECEbHWidWGXU
+i+IbbrLvtX5ZtwNHqCoA/2qDY1dSVAtfXQXuGCzop5mHcGoKpRD0rtCmnS98Y/TP
+=EFkT
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
index 17b890923b8a..901484db9995 100644
--- a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
+++ b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
@@ -1,15 +1,24 @@
---- yaffs/utils/Makefile
-+++ yaffs/utils/Makefile
-@@ -16,7 +16,7 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index 4929e08..51c4e5f 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -16,14 +16,13 @@
  
  #KERNELDIR = /usr/src/kernel-headers-2.4.18
  
 -CFLAGS =   -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
-+CFLAGS+=   -I.. -Wall -DCONFIG_YAFFS_UTIL
++CFLAGS+=   -I.. -Wall -DCONFIG_YAFFS_UTIL $(CPPFLAGS)
  CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
  CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
  
-@@ -36,13 +36,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
+ ## Change if you are using a cross-compiler
+ MAKETOOLS = 
+ 
+-CC=$(MAKETOOLS)gcc
+ 
+ MKYAFFSOBJS = mkyaffs.o
+ 
+@@ -36,13 +35,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
  	$(CC) -c $(CFLAGS) $< -o $@
  
  mkyaffsimage: $(MKYAFFSIMAGEOBJS)
diff --git a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
index 43c81d579862..fa9edb7dea45 100644
--- a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
+++ b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild,v 1.2 2009/09/19 15:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild,v 1.3 2011/09/11 19:01:47 vapier Exp $
 
-ECVS_SERVER="cvs.aleph1.co.uk:/home/aleph1/cvs"
-ECVS_MODULE="yaffs"
+EAPI="2"
 
-inherit eutils cvs
+EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs"
+EGIT_UNPACK_DIR=${WORKDIR}
+
+inherit eutils git toolchain-funcs
 
 DESCRIPTION="tools for generating YAFFS images"
 HOMEPAGE="http://www.aleph1.co.uk/yaffs/"
@@ -15,14 +17,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND=""
-
-S=${WORKDIR}/${ECVS_MODULE}/utils
+S=${WORKDIR}/utils
 
-src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
+	tc-export CC
 }
 
 src_install() {