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, 44 insertions, 33 deletions

diff --git a/sys-fs/yaffs2-utils/ChangeLog b/sys-fs/yaffs2-utils/ChangeLog
index 0b35a89c3c00..65589ea5c416 100644
--- a/sys-fs/yaffs2-utils/ChangeLog
+++ b/sys-fs/yaffs2-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/yaffs2-utils
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/ChangeLog,v 1.1 2006/07/30 19:11:29 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/ChangeLog,v 1.2 2011/09/11 19:08:28 vapier Exp $
+
+  11 Sep 2011; Mike Frysinger <vapier@gentoo.org> yaffs2-utils-9999.ebuild,
+  files/yaffs2-utils-9999-build.patch:
+  Convert to git and clean up a bit #382327 by Paul Osmialowski.
 
 *yaffs2-utils-9999 (30 Jul 2006)
 
diff --git a/sys-fs/yaffs2-utils/Manifest b/sys-fs/yaffs2-utils/Manifest
index 707ccd8c2fb6..5288b041c772 100644
--- a/sys-fs/yaffs2-utils/Manifest
+++ b/sys-fs/yaffs2-utils/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX yaffs2-utils-9999-build.patch 842 RMD160 43b235d955a36738caabb198811ee12c52e34e2f SHA1 1e873fa3b823e728eb02f493655e91934964edcc SHA256 64f2920e396de006aa80997f826c09616fc3d93dc4d803745010811ff24c0399
-EBUILD yaffs2-utils-9999.ebuild 643 RMD160 4ff306009c4aec017c93b653fd81e27e21a47613 SHA1 e4399e681eaeb85730f61cd0c384d9b8da2c79f1 SHA256 ab3c51e0f72d415c38993a1ceb1a740df5df10248cb8ac7ea8e8dc06843739b9
-MISC ChangeLog 340 RMD160 52042181659d3717b7b02e33b59f063a6dd7e98f SHA1 17c3ab13d01e2459fbd229b02755e676e467e9c4 SHA256 8b96bff264e17a9a115451cb1243a70d105b9d4eb32a18731865f77b24e12ef3
+AUX yaffs2-utils-9999-build.patch 933 RMD160 f9f0f3c17588e1e7da2b5cffd075956e4fff3697 SHA1 989fc98f1b6ebc5cea956fcc0d6738b73f5afc66 SHA256 a3a997a2ae5e79dec8b263d514fe19efed5d3be90db8490559c13644694de44b
+EBUILD yaffs2-utils-9999.ebuild 658 RMD160 b4f4fe7806cce1f21b6da1dd08f90fc7d7794d00 SHA1 878f117ba17cefd687f122533a7e5e7cc7040c17 SHA256 e613f5ada480d3f47398a077abb130792abaea3f41e0e860ae5a91719dac36b3
+MISC ChangeLog 521 RMD160 647e86f26c9cdb95b29bcb20d9b33c8e2b392635 SHA1 87417e14e679970b250779589dbfb6e988e828d5 SHA256 413cf1c67bf45f11d1481ee11325936b9858d657328bbfad1b426fe5174a2bf8
 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)
 
-iEYEARECAAYFAkq08N4ACgkQlPl3HsVfCDrJawCffc/YxWaxdbAZcIg+youmgf8f
-VHEAn2cGaKWe5ZEV/OPcGd2gEKDMspiR
-=WZdN
+iF4EAREIAAYFAk5tBxYACgkQaC/OocHi7JaSoQD/XCWu59IfedUS7kd3ij7/WAth
+oViSDzpC/RYL1xJzw+cA+QFKaszeH7LqODbnx3guuSaYJAHCXOmp9820FMuyWe7C
+=QD+R
 -----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 4157f59dbbeb..c820ee554cec 100644
--- a/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch
+++ b/sys-fs/yaffs2-utils/files/yaffs2-utils-9999-build.patch
@@ -1,24 +1,31 @@
---- yaffs2/utils/Makefile
-+++ yaffs2/utils/Makefile
-@@ -16,7 +16,7 @@
+--- 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 =    -O2 -Wall -DCONFIG_YAFFS_UTIL
++CFLAGS+=    -Wall -DCONFIG_YAFFS_UTIL
  CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
  CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
  
-@@ -44,10 +42,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYA
+ ## Change if you are using a cross-compiler
+ MAKETOOLS = 
+ 
+-CC=$(MAKETOOLS)gcc
+ 
+ COMMON_BASE_C_LINKS = yaffs_ecc.c
+ COMMON_BASE_LINKS = $(COMMON_BASE_C_LINKS) yaffs_ecc.h yaffs_guts.h yaffs_packedtags2.h yaffs_trace.h
+@@ -57,10 +56,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
  	$(CC) -c $(CFLAGS) $< -o $@
  
- mkyaffsimage: $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
--	$(CC) -o $@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
-+	$(CC) $(CFLAGS) -o $@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(LDFLAGS)
+ mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS)
+-	$(CC) -o $@  $^
++	$(CC) $(CFLAGS) -o $@  $^ $(LDFLAGS)
  
- mkyaffs2image: $(COMMONOBJS) $(MKYAFFS2IMAGEOBJS)
--	$(CC) -o $@ $(COMMONOBJS) $(MKYAFFS2IMAGEOBJS)
-+	$(CC) $(CFLAGS) -o $@ $(COMMONOBJS) $(MKYAFFS2IMAGEOBJS) $(LDFLAGS)
+ mkyaffs2image: $(MKYAFFS2IMAGEOBJS) $(COMMONOBJS)
+-	$(CC) -o $@ $^
++	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
  
  
  clean:
diff --git a/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild b/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
index d4e6fd6b51e6..832d58107ca5 100644
--- a/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
+++ b/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2006 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/yaffs2-utils/yaffs2-utils-9999.ebuild,v 1.2 2009/09/19 14:55:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs2-utils/yaffs2-utils-9999.ebuild,v 1.3 2011/09/11 19:08:28 vapier Exp $
 
-ECVS_SERVER="cvs.aleph1.co.uk:/home/aleph1/cvs"
-ECVS_MODULE="yaffs2"
+EAPI="2"
 
-inherit eutils cvs
+EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs2"
+EGIT_UNPACK_DIR=${WORKDIR}
+
+inherit eutils git toolchain-funcs
 
 DESCRIPTION="tools for generating YAFFS images"
 HOMEPAGE="http://www.aleph1.co.uk/yaffs/"
@@ -15,16 +17,14 @@ 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() {
 	dobin mkyaffsimage mkyaffs2image || die
+	dodoc ../README-linux
 }