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

(bug #281210) for the jam part of the build.
Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

5 files changed, 134 insertions, 7 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/Manifest b/dev-util/ftjam/Manifest
index ad3a9dc65ce9..ae1dc91f4613 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ftjam-2.5.3-debug-commandline.patch 314 RMD160 0f9da6a8d3df2c920563143d28b4f67eaab8a4e6 SHA1 c8a54440cc2270a9fd75d40b8f8cb2ef86083d91 SHA256 8cd45df0375dc51ecac21391a0a4b07d7a6cc716068a2326e364681293f6f93f
+AUX ftjam-2.5.3-false-flags.patch 1682 RMD160 2e19f0f0da331bd16e502ebcd1cdb5aad3251296 SHA1 667bb858ba8c72d4260adb0c42ce46cb978c60a2 SHA256 ef95761ea85b103e8665b044b7a99c18e8d1c83ab3bf35e30e2d8f454ed946e8
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 RMD160 63fe38dd18e8e9599f0cf176c3d73a93929771c5 SHA1 60f0a58f085075c0fed0d77552348ea0e8646d04 SHA256 8d8710e4699b3c910ed8f1ea50f9b1c1a9beaae8aee0c6fc815905666a5ffb81
 AUX ftjam-2.5.3-nostrip.patch 780 RMD160 668ac5ab61bcd4d34af0d668038115c944cc5550 SHA1 02df40e8513b085beb66ce1eea8e03e5a858b251 SHA256 66af8842f5853d22717dc1613c001aae61eed3c7f5997f16007298e0e7a97f6d
 DIST ftjam-2.5.3rc2.tar.bz2 215963 RMD160 dd4ed7e95958bd5425201ea6422e967efe501dff SHA1 683c9f000cccc37f48c2f3fd94a69ed70801fb75 SHA256 a9f8a274049893a4d1f1ad82f7b04f3ebc2554635dd606185e20ba97cb4d64ec
+EBUILD ftjam-2.5.3_rc2-r1.ebuild 1208 RMD160 c27160387102d7ba5e03c6c1f383af39e09c48b5 SHA1 6cc404ade61329e77d76f4116845195e56163040 SHA256 b8f38f9d88e4536560029ce74ee778f2fdf42bf1f2a3025535e1a4fdd8ef621f
 EBUILD ftjam-2.5.3_rc2.ebuild 985 RMD160 dc3e9862ec862e18f16294e7472565a1dbaa3e70 SHA1 f7d4de53f4761127eff1390b8ccf1082ea24e1b8 SHA256 bae14ed5c2b29a86905091044d7daec990099917f43744b0ec8d9c8f5aa94d27
-MISC ChangeLog 1817 RMD160 373de236ce44d736f13f0e32ba31e5993fad0cb7 SHA1 43a09b1a76f6dfa85a708aa44a68a6ee03682915 SHA256 c32055e168b9660b3a25251bb43ac613476ec803ec40e755a57e9aed7566d74e
+MISC ChangeLog 2139 RMD160 2863b1a12a10f2c57835ae6a7703ad56ed9ac8fb SHA1 f3fc99e9ab061aa1a53039d123a5fb41798da045 SHA256 3432ab5faefe709fc6cbe12b408433a76d0a136484fb4b603b27d61398e1ad05
 MISC metadata.xml 253 RMD160 b096274af87f9c103c75a962caafb7119d8806ce SHA1 12215f17ab0f6da7874825f25053cfd2a974a03b SHA256 360fc3b66d6f2c93018d2e4dc3bed95a8f078fd6097e15c2e42552fe4fa2bdc6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkiVbfAACgkQiqiDRvmkBmLIdwCggdGRJNzZOpbPmZgwAKgv9fgn
-KiQAni3TWMZyfrZVyjieTy+Gts1hxHO2
-=CidY
+iEYEARECAAYFAkqDmXkACgkQiqiDRvmkBmKFQgCgrC2xCw/RK4OWoK9iiNajWkLe
+nLYAoK0iFwcIOFkStMYUUIeZQM0VC8ET
+=8inf
 -----END PGP SIGNATURE-----
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
+}