Fix by Christophe LEFEBVRE for doc install #314661 by Diego E. Pettenò. Clean up the build system a bit #336092 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

6 files changed, 75 insertions, 43 deletions

diff --git a/app-emulation/coldfire/ChangeLog b/app-emulation/coldfire/ChangeLog
index 242f7a93e4ac..f0996f2acecd 100644
--- a/app-emulation/coldfire/ChangeLog
+++ b/app-emulation/coldfire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/coldfire
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/coldfire/ChangeLog,v 1.4 2007/02/21 21:41:22 peper Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/coldfire/ChangeLog,v 1.5 2010/10/10 04:44:06 vapier Exp $
+
+  10 Oct 2010; Mike Frysinger <vapier@gentoo.org> -coldfire-0.2.2.ebuild,
+  coldfire-0.3.1.ebuild, +files/coldfire-0.3.1-build.patch,
+  +files/coldfire-0.3.1-headers.patch:
+  Fix by Christophe LEFEBVRE for doc install #314661 by Diego E. Pettenò.
+  Clean up the build system a bit #336092 by Diego E. Pettenò.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-emulation/coldfire/Manifest b/app-emulation/coldfire/Manifest
index 62ce1fe75278..c70bb1d1e979 100644
--- a/app-emulation/coldfire/Manifest
+++ b/app-emulation/coldfire/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST coldfire-0.2.2.tar.gz 116481 RMD160 d1db51d8c0bfa69fbf6f0b342055a8599e38510e SHA1 5a74ac65b1ca15ba6bf76255f6ce02650134a6f6 SHA256 b552a64ac803b15fe7965de71cacbeac34335ebf6bf0c4e49355703fd3b33d0d
+AUX coldfire-0.3.1-build.patch 693 RMD160 7e81e16b4e2a22dcb313cd80e85bc40ea2fe054e SHA1 7260b3ea44c7a3bd141a6b59a608af3a21d76256 SHA256 37eca345abddaf63b40388474cd37aa5c888067ccea16d9e5dc016de258124eb
+AUX coldfire-0.3.1-headers.patch 386 RMD160 938b5aaf1f240f113e0a1a348f6d818a6f39c3be SHA1 19132b7eff24a46159e3b88b4219878f929371ec SHA256 815f0d56ca4cf992964167a9f5964df8ab060ed353757ddae959e69547c776a7
 DIST coldfire-0.3.1.tar.gz 142964 RMD160 8ddde663740cd139c7784627ef6a9ffefe77d841 SHA1 4d4f88540552b2b667751135866846491b74ee73 SHA256 033e2da700aa6fb528c005d963ee537f54d19b1763204c270fae839a6d60cba3
-EBUILD coldfire-0.2.2.ebuild 601 RMD160 2ac07fb8874a457fd25eb4459afb45763765b5ca SHA1 9c7718677f0879c4e354d51fac343bcaad11b3a6 SHA256 1765d0d90b896452dfdbff2d6a6ade6f15348c0292f28aee8c0f81ed9aa97017
-EBUILD coldfire-0.3.1.ebuild 609 RMD160 f6f6430e74af4d3bf0ce432a8b8185837d713df1 SHA1 ee6619d16e8ce68ed8ef2ad47631e68311c63655 SHA256 ecfce830d0c10d1ee378e6cb4538ea546586c82dc5d268087a7512ddf72bc47f
-MISC ChangeLog 582 RMD160 cd1061fc21833eee9a76fdcd9d919e682b31d6c8 SHA1 75045cda0dae0337ca8c7151d42833d26554452b SHA256 79e61f4b01a153dd131e221c26076370714025ebf7844c609f0d9fa374464e2d
+EBUILD coldfire-0.3.1.ebuild 688 RMD160 6680c5ffcf3de4fce18dc14b8cda25a1526381b5 SHA1 d257e53ed03da935a1ce17a4696956e220650d80 SHA256 f54ab54abf7c018b523a42219800bbde890cb69982eebcb4b8ab40d7c6f2e9de
+MISC ChangeLog 896 RMD160 9a4a37aedc08db4402e3c6de744eefbfb5acd5cb SHA1 c862566b454d438b0dac52fba8a54cf5192d5100 SHA256 715348681ead0c17efc0a172de105ac2ee62cced284111b7e43bef56c8002a47
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iD8DBQFIQNVgj9hvisErhMIRAjJJAKDtPZquNKOTouf9mpKZsCNhhsxg5wCgyCMh
-/wO8/dc//36TomVm47emWr0=
-=GHB5
+iF4EAREIAAYFAkyxRCIACgkQTwhj9JtAlp6F5QEAu+govwHXPGJGB9sqSFShNpAm
+LLw4qg4EZF8puGjZhDwA/1DXbcls41pxvhAomje70DU3wYKdOprH7ac05uI7wWoq
+=KhL1
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/coldfire/coldfire-0.2.2.ebuild b/app-emulation/coldfire/coldfire-0.2.2.ebuild
deleted file mode 100644
index 0380a9533ebb..000000000000
--- a/app-emulation/coldfire/coldfire-0.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/coldfire/coldfire-0.2.2.ebuild,v 1.3 2005/05/04 19:02:33 dholm Exp $
-
-DESCRIPTION="Motorola Coldfire Emulator"
-HOMEPAGE="http://www.slicer.ca/coldfire/"
-SRC_URI="http://www.slicer.ca/coldfire/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	sys-libs/readline"
-
-src_compile() {
-	econf || die
-	emake -j1 || die
-}
-
-src_install() {
-	dodir /usr/bin
-	einstall || die
-	dodoc AUTHORS HACKING README
-}
diff --git a/app-emulation/coldfire/coldfire-0.3.1.ebuild b/app-emulation/coldfire/coldfire-0.3.1.ebuild
index fec14b2677f7..3a964c62ee58 100644
--- a/app-emulation/coldfire/coldfire-0.3.1.ebuild
+++ b/app-emulation/coldfire/coldfire-0.3.1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/coldfire/coldfire-0.3.1.ebuild,v 1.1 2006/05/03 03:26:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/coldfire/coldfire-0.3.1.ebuild,v 1.2 2010/10/10 04:44:06 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
 
 DESCRIPTION="Motorola Coldfire Emulator"
 HOMEPAGE="http://www.slicer.ca/coldfire/"
@@ -14,13 +18,13 @@ IUSE=""
 DEPEND="sys-libs/ncurses
 	sys-libs/readline"
 
-src_compile() {
-	econf || die
-	emake -j1 || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-headers.patch
 }
 
 src_install() {
 	dodir /usr/bin
 	einstall || die
-	dodoc AUTHORS HACKING README
+	dodoc CONTRIBUTORS HACKING README
 }
diff --git a/app-emulation/coldfire/files/coldfire-0.3.1-build.patch b/app-emulation/coldfire/files/coldfire-0.3.1-build.patch
new file mode 100644
index 000000000000..2b54dd4a16f5
--- /dev/null
+++ b/app-emulation/coldfire/files/coldfire-0.3.1-build.patch
@@ -0,0 +1,32 @@
+respect env build settings
+
+--- a/Makefile.rules.in
++++ b/Makefile.rules.in
+@@ -1,9 +1,9 @@
+ CC	= @CC@
+-CFLAGS	= -Wall -fomit-frame-pointer @CFLAGS@ -I$(TOPSRCDIR)
++CFLAGS	= -Wall @CPPFLAGS@ @CFLAGS@ -I$(TOPSRCDIR)
+ LIBS	= @LIBS@
+ LD_R	= ld -r
+ RM	= rm -f
+-LDFLAGS = 
++LDFLAGS = @LDFLAGS@
+ 
+ 
+ prefix          = @prefix@
+
+fix parallel build problems ... objs need generated tracer, and coldfire
+needs subdir objs
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,8 @@
+ #Force version to be made before subdirectories
+ subdirs-all: version.h
+ 
+-coldfire: $(OBJS) force
++$(OBJS): | subdirs-all
++coldfire: $(OBJS) force | subdirs-all
+ 	$(CC) $(LDFLAGS) $(OBJS) $(SUBDIR_OBJS) -o $@ $(LIBS)
+ 	
+ 	
diff --git a/app-emulation/coldfire/files/coldfire-0.3.1-headers.patch b/app-emulation/coldfire/files/coldfire-0.3.1-headers.patch
new file mode 100644
index 000000000000..706b1a2b12c9
--- /dev/null
+++ b/app-emulation/coldfire/files/coldfire-0.3.1-headers.patch
@@ -0,0 +1,16 @@
+make sure we have access to HAVE_* defines to include header files:
+
+run.c: In function ‘sigint’:
+run.c:51:2: warning: implicit declaration of function ‘readline’
+run.c:51:8: warning: cast to pointer from integer of different size
+
+--- a/run.c
++++ b/run.c
+@@ -7,6 +7,7 @@
+ /**********************************/
+ 
+ 
++#include "config.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>