Respect CFLAGS (bug #240136), LDFLAGS.

(Portage version: 2.2_rc40/cvs/Linux i686)

3 files changed, 126 insertions, 1 deletions

diff --git a/app-text/lout/ChangeLog b/app-text/lout/ChangeLog
index 2b387caa4bc3..979085f22700 100644
--- a/app-text/lout/ChangeLog
+++ b/app-text/lout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/lout
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lout/ChangeLog,v 1.23 2009/07/23 23:02:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/ChangeLog,v 1.24 2009/09/04 14:50:09 jer Exp $
+
+*lout-3.38-r1 (04 Sep 2009)
+
+  04 Sep 2009; Jeroen Roovers <jer@gentoo.org> +lout-3.38-r1.ebuild,
+  +files/lout-3.38-makefile.patch:
+  Respect CFLAGS (bug #240136), LDFLAGS.
 
   23 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> lout-3.30.ebuild,
   lout-3.31.ebuild, lout-3.38.ebuild:
diff --git a/app-text/lout/files/lout-3.38-makefile.patch b/app-text/lout/files/lout-3.38-makefile.patch
new file mode 100644
index 000000000000..cb7fc66bf432
--- /dev/null
+++ b/app-text/lout/files/lout-3.38-makefile.patch
@@ -0,0 +1,33 @@
+--- lout-3.38/makefile.orig	2008-10-13 23:35:17.000000000 +0200
++++ lout-3.38/makefile	2009-09-04 16:40:00.000000000 +0200
+@@ -295,11 +295,9 @@
+ ZLIB		=
+ ZLIBPATH	=
+ 
+-CC	= gcc
+-
+ RCOPY	= cp -r
+ 
+-COPTS	= -ansi -pedantic -Wall -O3
++COPTS	+= -ansi -pedantic -Wall
+ 
+ CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
+ 	  -DOS_DOS=$(OSDOS)					\
+@@ -333,7 +331,7 @@
+ 	  z49.o z50.o z51.o z52.o
+ 
+ lout:	$(OBJS)
+-	$(CC) -o lout $(OBJS) $(ZLIB) -lm
++	$(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+ 	chmod a+x lout
+ 
+ $(OBJS): externs.h
+@@ -341,7 +339,7 @@
+ externs.h:
+ 
+ prg2lout:	prg2lout.c
+-	$(CC) $(COPTS) -o prg2lout prg2lout.c
++	$(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
+ 	chmod a+x prg2lout
+ 
+ all:	lout prg2lout
diff --git a/app-text/lout/lout-3.38-r1.ebuild b/app-text/lout/lout-3.38-r1.ebuild
new file mode 100644
index 000000000000..3c80ff334ecb
--- /dev/null
+++ b/app-text/lout/lout-3.38-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.38-r1.ebuild,v 1.1 2009/09/04 14:50:09 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+IUSE="zlib doc"
+
+DESCRIPTION="high-level language for document formatting"
+HOMEPAGE="http://lout.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lout/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	tc-export CC
+	local myconf
+	use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=-lz"
+	emake COPTS="${CFLAGS}" BINDIR=/usr/bin \
+		LOUTLIBDIR=/usr/share/lout \
+		LOUTDOCDIR=/usr/share/doc/${P} \
+		MANDIR=/usr/share/man/man1 \
+		${myconf} lout prg2lout || die "emake prg2lout lout failed"
+}
+
+compile_doc() {
+	#
+	# SYNOPSIS:  compile_doc file times
+	#
+
+	einfo "${1}:"
+	# yes, it *is* necessary to run this 6 times...
+	for i in $(seq 1 $(expr $2 - 1)) ; do
+		einfo " pass $i"
+		lout all -o ${docdir}/$1 -e /dev/null
+	done
+	# in the last one, let errors be reported
+	einfo " final pass"
+	lout all -o ${docdir}/$1 || die "final pass failed"
+}
+
+src_install() {
+	local bindir libdir docdir mandir
+	bindir=${D}/usr/bin
+	libdir=${D}/usr/share/lout
+	docdir=${D}/usr/share/doc/${P}
+	mandir=${D}/usr/share/man/man1
+	export LOUTLIB=${libdir}
+	export PATH="${bindir}:${PATH}"
+
+	mkdir -p ${bindir} ${docdir} ${mandir}
+
+	make BINDIR=${bindir} \
+		LOUTLIBDIR=${libdir} \
+		LOUTDOCDIR=${docdir} \
+		MANDIR=${mandir} \
+		install installdoc installman || die "make install failed"
+
+	lout -x -s "${D}"/usr/share/lout/include/init || die "lout init failed"
+
+	mv ${docdir}/README{,.docs}
+	dodoc README READMEPDF blurb blurb.short whatsnew
+
+	if use doc ; then
+		einfo "building postscript documentation (may take a while)"
+		cd doc/user
+		compile_doc user.ps 6
+		cd ../design
+		compile_doc design.ps 3
+		cd ../expert
+		compile_doc expert.ps 4
+		cd ../slides
+		compile_doc slides.ps 2
+	fi
+}