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

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 36 insertions, 25 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/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
 }