Revision bump. Respect CC (bug #244002), CFLAGS (bug #240276), and LDFLAGS

(bug #281210) for the jam part of the build.
(Portage version: 2.2_rc38/cvs/Linux x86_64)

4 files changed, 126 insertions, 2 deletions

diff --git a/dev-util/ftjam/ChangeLog b/dev-util/ftjam/ChangeLog
index c51147d2280a..2ff3840479f4 100644
--- a/dev-util/ftjam/ChangeLog
+++ b/dev-util/ftjam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/ftjam
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ChangeLog,v 1.12 2008/08/03 08:35:40 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ChangeLog,v 1.13 2009/08/13 04:40:31 dirtyepic Exp $
+
+*ftjam-2.5.3_rc2-r1 (13 Aug 2009)
+
+  13 Aug 2009; Ryan Hill <dirtyepic@gentoo.org> +ftjam-2.5.3_rc2-r1.ebuild,
+  +files/ftjam-2.5.3-debug-commandline.patch,
+  +files/ftjam-2.5.3-false-flags.patch:
+  Revision bump. Respect CC (bug #244002), CFLAGS (bug #240276), and LDFLAGS
+  (bug #281210) for the jam part of the build.
 
   03 Aug 2008; Ryan Hill <dirtyepic@gentoo.org>
   +files/ftjam-2.5.3-i-hate-yacc.patch, ftjam-2.5.3_rc2.ebuild:
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
new file mode 100644
index 000000000000..ba6613430308
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
@@ -0,0 +1,14 @@
+Make jam print the commandline it's executing.
+Only useful for ebuild debugging - I just always forget how to enable it.
+
+--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
++++ ftjam-2.5.3rc2/builds/unix/Makefile.in
+@@ -16,7 +16,7 @@
+ 
+ all: jam0
+ 	chmod a+w jambase.c
+-	./jam0
++	./jam0 -dx -q
+ 
+ include common.mk
+ 
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
new file mode 100644
index 000000000000..1b33a0f770d3
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch
@@ -0,0 +1,59 @@
+Respect CC, *FLAGS.  Add datarootdir for autoconf-2.60 warnings.
+
+--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
++++ ftjam-2.5.3rc2/builds/unix/Makefile.in
+@@ -37,6 +37,7 @@ exec_prefix  := @exec_prefix@
+ libdir       := @libdir@
+ bindir       := @bindir@
+ includedir   := @includedir@
++datarootdir  := @datarootdir@
+ datadir      := @datadir@
+ 
+ version_info := @version_info@
+--- ftjam-2.5.3rc2-orig/jambase.c
++++ ftjam-2.5.3rc2/jambase.c
+@@ -652,21 +652,21 @@ const char *jambase[] = {
+ "\n",
+ "AR      ?= ar ru ;\n",
+ "AS      ?= as ;\n",
+-"ASFLAGS     ?= ;\n",
++"ASFLAGS     += $(ASFLAGS) ;\n",
+ "AWK     ?= awk ;\n",
+ "BINDIR      ?= /usr/local/bin ;\n",
+-"C++     ?= cc ;\n",
+-"C++FLAGS    ?= ;\n",
+-"CC      ?= cc ;\n",
+-"CCFLAGS     ?= ;\n",
++"C++     ?= $(CXX) ;\n",
++"C++FLAGS    += $(CXXFLAGS) ;\n",
++"CC      ?= $(CC) ;\n",
++"CCFLAGS     += $(CFLAGS) ;\n",
+ "CP      ?= cp -f ;\n",
+ "CRELIB      ?= ;\n",
+ "DOT     ?= . ;\n",
+ "DOTDOT      ?= .. ;\n",
+ "EXEMODE     ?= 711 ;\n",
+ "FILEMODE    ?= 644 ;\n",
+-"FORTRAN     ?= f77 ;\n",
+-"FORTRANFLAGS    ?= ;\n",
++"FORTRAN     ?= $(F77) ;\n",
++"FORTRANFLAGS    += $(FFLAGS) ;\n",
+ "HDRS        ?= ;\n",
+ "INSTALLGRIST    ?= installed ;\n",
+ "JAMFILE     ?= Jamfile ;\n",
+@@ -674,13 +674,13 @@ const char *jambase[] = {
+ "LEX     ?= ;\n",
+ "LIBDIR      ?= /usr/local/lib ;\n",
+ "LINK        ?= $(CC) ;\n",
+-"LINKFLAGS   ?= ;\n",
++"LINKFLAGS   += $(LDFLAGS) ;\n",
+ "LINKLIBS    ?= ;\n",
+ "LN      ?= ln ;\n",
+ "MANDIR      ?= /usr/local/man ;\n",
+ "MKDIR       ?= mkdir ;\n",
+ "MV      ?= mv -f ;\n",
+-"OPTIM       ?= ;\n",
++"OPTIM       = ;\n",
+ "RCP     ?= rcp ;\n",
+ "RM      ?= rm -f ;\n",
+ "RMDIR       ?= $(RM) ;\n",
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
new file mode 100644
index 000000000000..cf22902da332
--- /dev/null
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild,v 1.1 2009/08/13 04:40:31 dirtyepic Exp $
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator _)
+
+DESCRIPTION="Jam is a powerful alternative to make.  FTJam is a 100% compatible enhanced Jam implementation."
+HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
+SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
+
+LICENSE="perforce GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="!dev-util/jam
+	sys-devel/bison"
+RDEPEND="!dev-util/jam"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.5.3-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
+	epatch "${FILESDIR}"/${PN}-2.5.3-false-flags.patch
+#	epatch "${FILESDIR}"/${PN}-2.5.3-debug-commandline.patch  # development only
+}
+
+src_compile() {
+	tc-export CC
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README README.ORG CHANGES INSTALL RELNOTES
+	dohtml Jam.html Jambase.html Jamfile.html
+}