Include a new USE flag "force-reg" and don't --enable-force-reg by default; Filter some CFLAGS known to cause build failures; Resolves Bug #120159; Include PPC specific build patch; Resolves Bug #131931.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 81 insertions, 25 deletions

diff --git a/dev-lang/gforth/ChangeLog b/dev-lang/gforth/ChangeLog
index 1f6ab918a04c..e4f88e2ecf7b 100644
--- a/dev-lang/gforth/ChangeLog
+++ b/dev-lang/gforth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gforth
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.18 2006/02/17 17:43:35 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.19 2006/05/12 20:25:54 mkennedy Exp $
+
+  12 May 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.6.2-ppc-configure-gentoo.patch, gforth-0.6.2-r1.ebuild:
+  Include a new USE flag "force-reg" and don't --enable-force-reg by default;
+  Filter some CFLAGS known to cause build failures; Resolves Bug #120159;
+  Include PPC specific build patch; Resolves Bug #131931.
 
   17 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
   files/gforth.el-gentoo.patch:
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index c59c481a18d8..23173619de10 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -1,37 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 34193c5e05a1c4c8a625cd51ed60f264 ChangeLog 3032
-RMD160 5b3b358660f560f050f4f3970bc43e961490817b ChangeLog 3032
-SHA256 2ffef2beddecea39072e5bbe5278059813e903adcbd14f5270586647009c4a70 ChangeLog 3032
+AUX 0.6.2-c-to-forth-to-c.patch 702 RMD160 585cd5b1e215c0644df28b55de47133b88c75bcd SHA1 394b90c041742fb8c0113420c3806340fa2a3ad8 SHA256 f50fae8f741b72d4d07155b96d11e59ba663b330910faf49774ffe14e85f5c5e size 702
 MD5 8646d2e25fc993074ce9a5859f168e4e files/0.6.2-c-to-forth-to-c.patch 702
 RMD160 585cd5b1e215c0644df28b55de47133b88c75bcd files/0.6.2-c-to-forth-to-c.patch 702
 SHA256 f50fae8f741b72d4d07155b96d11e59ba663b330910faf49774ffe14e85f5c5e files/0.6.2-c-to-forth-to-c.patch 702
+AUX 0.6.2-ppc-configure-gentoo.patch 528 RMD160 12719214cd79123a62388c8c69d5db84698e97eb SHA1 bc00a1b23387f092a81b5422e73c2e94c917988e SHA256 868c2951d49bd6752821c885da7fc8e90cb43948c993dfa5c13147de95df2de4 size 528
+MD5 30d2897f2c53ab9312f07ef8494905c5 files/0.6.2-ppc-configure-gentoo.patch 528
+RMD160 12719214cd79123a62388c8c69d5db84698e97eb files/0.6.2-ppc-configure-gentoo.patch 528
+SHA256 868c2951d49bd6752821c885da7fc8e90cb43948c993dfa5c13147de95df2de4 files/0.6.2-ppc-configure-gentoo.patch 528
+AUX 50gforth-gentoo.el 200 RMD160 79bceb8512f929d2fc9916a9622ef9e466159acf SHA1 fb70db63f220bc5f7c39e5dbdf5c67f581d85031 SHA256 235051d92cd39a0d327246d60555bd8a8386b5b20276aa35fe8bd34565b691f6 size 200
 MD5 74edc6d12c9a8d2858070dc09e2c264c files/50gforth-gentoo.el 200
 RMD160 79bceb8512f929d2fc9916a9622ef9e466159acf files/50gforth-gentoo.el 200
 SHA256 235051d92cd39a0d327246d60555bd8a8386b5b20276aa35fe8bd34565b691f6 files/50gforth-gentoo.el 200
-MD5 288a9f927bbcb355499af2795baa6248 files/digest-gforth-0.6.2 65
-RMD160 94aa8a6afb79be9f80acb5f376638ff074788aab files/digest-gforth-0.6.2 65
-SHA256 8989714db209a89679594f54c708ef3673e6d44df14d7964db36214b476a24d1 files/digest-gforth-0.6.2 65
-MD5 a6f1a7a82c3fe99d39283ef7f0200df6 files/digest-gforth-0.6.2-r1 464
-RMD160 65fbb567dbd9b097d2ebb5639b5367229079d099 files/digest-gforth-0.6.2-r1 464
-SHA256 e1d570cb5433dbdcd97ab750f7372f3e276cb1c775e6fdd4d72fb75a66d96d54 files/digest-gforth-0.6.2-r1 464
+AUX gforth.el-gentoo.patch 390 RMD160 4957e9a817bb6bb9e58523285a00b2b3445f65ed SHA1 3782b75e0c8019c2988be9e4655c3a350b547ae2 SHA256 920d8b8e07ab8e81f0fe7883ec8ea34507a33a9db337d5e7725e96f804bbb5aa size 390
 MD5 ab0fa8588ce5dbe0eeb8b39b984f910e files/gforth.el-gentoo.patch 390
 RMD160 4957e9a817bb6bb9e58523285a00b2b3445f65ed files/gforth.el-gentoo.patch 390
 SHA256 920d8b8e07ab8e81f0fe7883ec8ea34507a33a9db337d5e7725e96f804bbb5aa files/gforth.el-gentoo.patch 390
-MD5 b17452d3deaa7d33f7460ce9f67028c9 gforth-0.6.2-r1.ebuild 1640
-RMD160 2e190ecf480fdce63c4c525954eac257e0240901 gforth-0.6.2-r1.ebuild 1640
-SHA256 ee899357d739293ce21fe1abca02f42814f6474a4cf9850b651a6a032bb0288b gforth-0.6.2-r1.ebuild 1640
+DIST 0.6.2-debug.diff 5127 RMD160 eade613904465b02ab8c480f136751fc334fd778 SHA256 accb5c8b06fd11ff56febd32896678e670d2571a90ce7682dd87bd590e6159cb size 5127
+DIST gforth-0.6.2.tar.gz 1925536 RMD160 692aa412e59954f87a7b44027901248f8939e9ee SHA256 28a201ae78b073ef350d7ac4a8283233029c6afe6072620ac6dd6db1d192d462 size 1925536
+EBUILD gforth-0.6.2-r1.ebuild 2292 RMD160 91e51ad875806ad3288290b4a287c40f0fe8cb2c SHA1 3ad8040e29ea5c1abd5c827881f9b3608d478c10 SHA256 fde96bacf189e67c25348465c41040f769491d617130e77fe657409426243d31 size 2292
+MD5 6384434dc4f48271698a784c487aa4ef gforth-0.6.2-r1.ebuild 2292
+RMD160 91e51ad875806ad3288290b4a287c40f0fe8cb2c gforth-0.6.2-r1.ebuild 2292
+SHA256 fde96bacf189e67c25348465c41040f769491d617130e77fe657409426243d31 gforth-0.6.2-r1.ebuild 2292
+EBUILD gforth-0.6.2.ebuild 1384 RMD160 e53a23bbd1bee661147a441dcfae56d8b214ed2f SHA1 faf11f3f227da9df4cf309781e4db7637ed68a25 SHA256 05a32cfc9dde5a5ac3173fd54907fcedbc7f033ce34a0e7327b8c59ffeb0769c size 1384
 MD5 b1b4b6a2dc1e8dab38ab5096b2f9b45e gforth-0.6.2.ebuild 1384
 RMD160 e53a23bbd1bee661147a441dcfae56d8b214ed2f gforth-0.6.2.ebuild 1384
 SHA256 05a32cfc9dde5a5ac3173fd54907fcedbc7f033ce34a0e7327b8c59ffeb0769c gforth-0.6.2.ebuild 1384
+MISC ChangeLog 3363 RMD160 41aae7761a3415efedd99a0cfdd54bcbd11780a4 SHA1 752b93206fa1842280bd1e17c689144679df7a6e SHA256 ff01c3ce2a1193fa9a965cf499d0a64a0367064fecb3bf25dffff01399a45de3 size 3363
+MD5 be2ad85ca74b9b972a5bae3e7e8be40f ChangeLog 3363
+RMD160 41aae7761a3415efedd99a0cfdd54bcbd11780a4 ChangeLog 3363
+SHA256 ff01c3ce2a1193fa9a965cf499d0a64a0367064fecb3bf25dffff01399a45de3 ChangeLog 3363
+MISC metadata.xml 232 RMD160 9101b9978f3aaddf25ec85183590110e41bc3d0d SHA1 4544241a135f1677008f433e39416519eee8ed02 SHA256 7cbe2b6f70075aca4c0147ec74989df1f3ea7ac11ce88fad80d812131cd21a9c size 232
 MD5 1ba841da13783efc9e8e1670e8937801 metadata.xml 232
 RMD160 9101b9978f3aaddf25ec85183590110e41bc3d0d metadata.xml 232
 SHA256 7cbe2b6f70075aca4c0147ec74989df1f3ea7ac11ce88fad80d812131cd21a9c metadata.xml 232
+MD5 9cc251cc9d1510a48e03676e11fd6e7a files/digest-gforth-0.6.2 241
+RMD160 3c7e4b105a17ae6499fbbb79ac86321343fc5bed files/digest-gforth-0.6.2 241
+SHA256 2768a5f03da07ea774eec04761a6b76785654ee3a74f5ccae72bd4dfbf2a1d7c files/digest-gforth-0.6.2 241
+MD5 a6f1a7a82c3fe99d39283ef7f0200df6 files/digest-gforth-0.6.2-r1 464
+RMD160 65fbb567dbd9b097d2ebb5639b5367229079d099 files/digest-gforth-0.6.2-r1 464
+SHA256 e1d570cb5433dbdcd97ab750f7372f3e276cb1c775e6fdd4d72fb75a66d96d54 files/digest-gforth-0.6.2-r1 464
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFD9gtTyiNZaEAZA+ARAu91AJ9uB3HIqDOHz3WAEMPGIYQ9VIb0DQCcD8Cs
-al91wr5SGon1AR7CrIqsuMI=
-=3GbT
+iD8DBQFEZO9cyiNZaEAZA+ARAnZ1AJ9XQDvrqPHGbeD5Vw0qH8Wt0tr8hACfU/Bz
+U6kUvD6bANdLvPK2SeMu60Y=
+=ciSE
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gforth/files/0.6.2-ppc-configure-gentoo.patch b/dev-lang/gforth/files/0.6.2-ppc-configure-gentoo.patch
new file mode 100644
index 000000000000..30061aa702f7
--- /dev/null
+++ b/dev-lang/gforth/files/0.6.2-ppc-configure-gentoo.patch
@@ -0,0 +1,13 @@
+diff -ur gforth-0.6.2.orig/configure gforth-0.6.2/configure
+--- gforth-0.6.2.orig/configure	2003-08-25 03:03:42.000000000 -0500
++++ gforth-0.6.2/configure	2006-05-12 15:10:52.000000000 -0500
+@@ -3586,7 +3586,8 @@
+ fi
+ 
+ 		#long long is broken on (at least) gcc-2.95.* for PPC
+-		test x$ac_cv_sizeof_long_long = x && ac_cv_sizeof_long_long=0
++		# XXX this was fixed long ago
++#		test x$ac_cv_sizeof_long_long = x && ac_cv_sizeof_long_long=0
+ 		;;
+ 	*)
+ 		{ echo "$as_me:$LINENO: WARNING: Using a generic machine description" >&5
diff --git a/dev-lang/gforth/files/digest-gforth-0.6.2 b/dev-lang/gforth/files/digest-gforth-0.6.2
index 4b613bac6474..570bbeac82db 100644
--- a/dev-lang/gforth/files/digest-gforth-0.6.2
+++ b/dev-lang/gforth/files/digest-gforth-0.6.2
@@ -1 +1,3 @@
 MD5 869112bd762b07fc4d2038a2d9965148 gforth-0.6.2.tar.gz 1925536
+RMD160 692aa412e59954f87a7b44027901248f8939e9ee gforth-0.6.2.tar.gz 1925536
+SHA256 28a201ae78b073ef350d7ac4a8283233029c6afe6072620ac6dd6db1d192d462 gforth-0.6.2.tar.gz 1925536
diff --git a/dev-lang/gforth/gforth-0.6.2-r1.ebuild b/dev-lang/gforth/gforth-0.6.2-r1.ebuild
index c6717a4666d1..f62aea597850 100644
--- a/dev-lang/gforth/gforth-0.6.2-r1.ebuild
+++ b/dev-lang/gforth/gforth-0.6.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2-r1.ebuild,v 1.1 2006/02/15 00:12:42 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2-r1.ebuild,v 1.2 2006/05/12 20:25:54 mkennedy Exp $
 
-inherit elisp-common eutils toolchain-funcs
+inherit elisp-common eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="GNU Forth is a fast and portable implementation of the ANSI Forth language"
 HOMEPAGE="http://www.gnu.org/software/gforth"
@@ -12,8 +12,8 @@ SRC_URI="http://www.complang.tuwien.ac.at/forth/gforth/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
-KEYWORDS=" ~ppc ~x86"			# dev-libs/ffcall needs to be keyworded for amd64 and ppc-macos
-IUSE="emacs"
+KEYWORDS="~ppc ~x86"			# dev-libs/ffcall needs to be keyworded for amd64 and ppc-macos
+IUSE="emacs force-reg"
 
 DEPEND="virtual/libc
 	dev-libs/ffcall
@@ -21,17 +21,39 @@ DEPEND="virtual/libc
 
 SITEFILE=50gforth-gentoo.el
 
+pkg_setup() {
+	if use force-reg; then
+		while read line; do ewarn "${line}"; done <<'EOF'
+
+You have chosen to enable "force-reg" in USE.  From the GForth manual
+(http://www.public.iastate.edu/~forth/gforth_141.html):
+
+	"This feature not only depends on the machine, but also on the
+	compiler version: On some machines some compiler versions produce
+	incorrect code when certain explicit register declarations are
+	used. So by default -DFORCE_REG is not used."
+
+EOF
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/gforth.el-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}-c-to-forth-to-c.patch || die
-	epatch ${DISTDIR}/${PV}-debug.diff || die
+	epatch ${FILESDIR}/${PV}-ppc-configure-gentoo.patch	# Bug #131931
+	epatch ${FILESDIR}/gforth.el-gentoo.patch
+	epatch ${FILESDIR}/${PV}-c-to-forth-to-c.patch
+	epatch ${DISTDIR}/${PV}-debug.diff
 
 }
 
 src_compile() {
-	econf CC="$(tc-getCC) -fno-reorder-blocks -fno-inline" --enable-force-reg || die "econf failed"
+	filter-flags -Os -O0 -O1 -DFORCE_REG # Bug #120159
+	append-flags -O2					 # Bug #120159
+
+	econf CC="$(tc-getCC) -fno-reorder-blocks -fno-inline" \
+		`use_enable force-reg force-reg` \
+		|| die "econf failed"
 	make || die
 	if use emacs; then
 		elisp-comp *.el || die