Version bumped. Changed master site and added zlib, doc IUSE flags. Ebuild contributed by Lalo Martins <lalo@laranja.org>, closing bug #34667

6 files changed, 247 insertions, 7 deletions

diff --git a/app-text/lout/ChangeLog b/app-text/lout/ChangeLog
index 2bf433c6d87a..180032dd65f0 100644
--- a/app-text/lout/ChangeLog
+++ b/app-text/lout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/lout
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lout/ChangeLog,v 1.5 2003/02/12 05:32:36 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/ChangeLog,v 1.6 2004/06/06 15:58:17 usata Exp $
+
+*lout-3.29 (07 Jun 2004)
+
+  07 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> lout-3.25-r1.ebuild,
+  +files/lout-3.29-makefile-gentoo.patch, +lout-3.29.ebuild:
+  Version bumped. Changed master site and added zlib, doc IUSE flags.
+  Ebuild contributed by Lalo Martins <lalo@laranja.org>, closing bug #34667
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
index 15fb30976a0f..5c2c1a9b123d 100644
--- a/app-text/lout/Manifest
+++ b/app-text/lout/Manifest
@@ -1,4 +1,7 @@
-MD5 b4e432cdd05ceb2b09bbbd74cd36cb8f files/digest-lout-3.25-r1 62
-MD5 e898eb4de64cf9908d6e2e6cd48c5141 files/lout-3.25-r1-makefile-gentoo.patch 9685
-MD5 8b80d67d2c055c9465ca6a7f16e7effe ChangeLog 1368
 MD5 c8ad33b04cf7962e60b217507262c777 lout-3.25-r1.ebuild 1024
+MD5 8b80d67d2c055c9465ca6a7f16e7effe ChangeLog 1368
+MD5 5d7a55b6e3939aa867120334acc3915e lout-3.29.ebuild 1886
+MD5 e898eb4de64cf9908d6e2e6cd48c5141 files/lout-3.25-r1-makefile-gentoo.patch 9685
+MD5 b4e432cdd05ceb2b09bbbd74cd36cb8f files/digest-lout-3.25-r1 62
+MD5 eef4aadd919d3cc3b4025debb538c7fa files/lout-3.29-makefile-gentoo.patch 5985
+MD5 29594e4e47a72654d5819c6ebb2d1bef files/digest-lout-3.29 62
diff --git a/app-text/lout/files/digest-lout-3.29 b/app-text/lout/files/digest-lout-3.29
new file mode 100644
index 000000000000..b034db40f516
--- /dev/null
+++ b/app-text/lout/files/digest-lout-3.29
@@ -0,0 +1 @@
+MD5 cff3a2c009b928e794a9a57b208df788 lout-3.29.tar.gz 1948258
diff --git a/app-text/lout/files/lout-3.29-makefile-gentoo.patch b/app-text/lout/files/lout-3.29-makefile-gentoo.patch
new file mode 100644
index 000000000000..8599d11dde7f
--- /dev/null
+++ b/app-text/lout/files/lout-3.29-makefile-gentoo.patch
@@ -0,0 +1,153 @@
+--- makefile.orig	2003-11-27 22:18:21.000000000 -0200
++++ makefile	2003-11-27 22:20:33.000000000 -0200
+@@ -23,6 +23,13 @@
+ #  carry out all the steps, in exactly the order given.  Believe me, it       #
+ #  will be much faster than doing it any other way.                           #
+ #                                                                             #
++#  If you're using a modern make program, you don't need to actually edit the #
++#  makefile to set the macros; instead, you can pass them in the command line #
++#  - for example, you can run "make lout BASEDIR=/home/jeff/lout".  Editing   #
++#  the makefile is actually easier - but the command-line alternative makes   #
++#  it easier to automate the building process (for example, for package       #
++#  maintainers).  The recommended make program is GNU make.                   #
++#                                                                             #
+ #  (1) Set exactly one of the following macros defined below to 1 and the     #
+ #      others all to 0, to indicate the operating system under which the      #
+ #      Lout binary is to run.  At present OSUNIX and OSDOS work but OSMAC     #
+@@ -98,6 +105,10 @@
+ #      MANDIR    Directory where the lout and prg2lout online manual entries  #
+ #                (in nroff -man) go.  This directory is assumed to exist.     #
+ #                                                                             #
++#      Alternatively, you may just set the macro BASEDIR.  The default        #
++#      setting of the macros above is based on $(BASEDIR) - for example,      #
++#      BINDIR is set to $(BASEDIR)/bin.                                       #
++#                                                                             #
+ #  (7) Set the following two macros defined below to appropriate values.      #
+ #      I strongly recommend CHARIN=1 and CHAROUT=0 for all sites (English     #
+ #      and non-English language).  This way we get a truly international      #
+@@ -281,10 +292,15 @@
+ # DEBUGGING = 1
+ # TRACING = -g
+ 
+-BINDIR	= /home/jeff/bin
+-LIBDIR	= /home/jeff/lout.lib
+-DOCDIR	= /home/jeff/lout.doc
+-MANDIR	= /home/jeff/lout.man
++BASEDIR = /usr/local
++BINDIR	= $(BASEDIR)/bin
++LIBDIR	= $(BASEDIR)/share/lout
++DOCDIR	= $(BASEDIR)/share/doc/lout
++MANDIR	= $(BASEDIR)/share/man/man1
++#BINDIR	= /home/jeff/bin
++#LIBDIR	= /home/jeff/lout.lib
++#DOCDIR	= /home/jeff/lout.doc
++#MANDIR	= /home/jeff/lout.man
+ 
+ LIBFONT = font
+ LIBMAPS = maps
+@@ -355,45 +371,41 @@
+ 	$(CC) $(COPTS) -o prg2lout prg2lout.c
+ 	chmod a+x prg2lout
+ 
+-install: lout prg2lout
++installbin: lout prg2lout
+ 	@echo ""
+ 	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
++	mkdir -m 755 -p $(BINDIR)
+ 	cp lout $(BINDIR)/lout
+ 	chmod 755 $(BINDIR)/lout
+ 	cp prg2lout $(BINDIR)/prg2lout
+ 	chmod 755 $(BINDIR)/prg2lout
++
++installlib: lout
+ 	@echo ""
+ 	@echo "(b) Installing library files into LIBDIR $(LIBDIR)"
+-	mkdir $(LIBDIR)
+-	chmod 755 $(LIBDIR)
+-	@echo ""
+-	mkdir $(LIBDIR)/$(LIBINCL)
+-	chmod 755 $(LIBDIR)/$(LIBINCL)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBINCL)
+ 	cp include/* $(LIBDIR)/$(LIBINCL)
+ 	chmod 644 $(LIBDIR)/$(LIBINCL)/*
+ 	@echo ""
+-	mkdir $(LIBDIR)/$(LIBDATA)
+-	chmod 755 $(LIBDIR)/$(LIBDATA)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBDATA)
+ 	cp data/* $(LIBDIR)/$(LIBDATA)
+ 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
+ 	@echo ""
+-	mkdir $(LIBDIR)/$(LIBHYPH)
+-	chmod 755 $(LIBDIR)/$(LIBHYPH)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBHYPH)
+ 	cp hyph/* $(LIBDIR)/$(LIBHYPH)
+ 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+ 	@echo ""
+-	mkdir $(LIBDIR)/$(LIBFONT)
+-	chmod 755 $(LIBDIR)/$(LIBFONT)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBFONT)
+ 	cp font/* $(LIBDIR)/$(LIBFONT)
+ 	chmod 644 $(LIBDIR)/$(LIBFONT)/*
+ 	@echo ""
+-	mkdir $(LIBDIR)/$(LIBMAPS)
+-	chmod 755 $(LIBDIR)/$(LIBMAPS)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBMAPS)
+ 	cp maps/* $(LIBDIR)/$(LIBMAPS)
+ 	chmod 644 $(LIBDIR)/$(LIBMAPS)/*
++
++init: installbin installlib
+ 	@echo ""
+-	mkdir $(LIBDIR)/$(LIBLOCA)
+-	chmod 755 $(LIBDIR)/$(LIBLOCA)
++	mkdir -m 755 -p $(LIBDIR)/$(LIBLOCA)
+ 	@echo ""
+ 	@echo "(c) Initializing run (should be silent, no errors expected)"
+ 	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
+@@ -402,8 +414,11 @@
+ 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
+ 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+ 
++install: init
++
+ installman:
+ 	@echo ""
++	mkdir -m 755 -p $(MANDIR)
+ 	@echo "Installing manual entries into MANDIR $(MANDIR)"
+ 	sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LIBDIR)@"	\
+ 	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
+@@ -415,18 +430,15 @@
+ installdoc:
+ 	@echo ""
+ 	@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it"
+-	$(RCOPY) doc $(DOCDIR)
+-	chmod 755 $(DOCDIR)
+-	chmod 755 $(DOCDIR)/*
+-	chmod 644 $(DOCDIR)/*/*
++	mkdir -p $(DOCDIR)
++	$(RCOPY) doc/* $(DOCDIR)
++	chmod -R 755 $(DOCDIR)
++	find $(DOCDIR) -type f -exec chmod 644 '{}' ';'
+ 
+ installfr:
+ 	@echo ""
+ 	@echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)"
+-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
+-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
+-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
++	mkdir -m 755 -p $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+ 	cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+ 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
+ 	       $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+@@ -435,10 +447,7 @@
+ installde:
+ 	@echo ""
+ 	@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
+-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
+-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
+-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+-	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
++	mkdir -m 755 -p $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+ 	cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+ 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
+ 	       $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
diff --git a/app-text/lout/lout-3.25-r1.ebuild b/app-text/lout/lout-3.25-r1.ebuild
index 0009da83eb0d..2ae9a3af718c 100644
--- a/app-text/lout/lout-3.25-r1.ebuild
+++ b/app-text/lout/lout-3.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.25-r1.ebuild,v 1.9 2004/04/08 22:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.25-r1.ebuild,v 1.10 2004/06/06 15:58:17 usata Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ src_unpack() {
 	cd ${S}
 
 	# Apply the makefile patch, this is the only configuration so far :-(
-	epatch ${FILESDIR}/${P}-r1-makefile-gentoo.patch
+	epatch ${FILESDIR}/${PF}-makefile-gentoo.patch
 }
 
 src_compile() {
diff --git a/app-text/lout/lout-3.29.ebuild b/app-text/lout/lout-3.29.ebuild
new file mode 100644
index 000000000000..bb847defeb38
--- /dev/null
+++ b/app-text/lout/lout-3.29.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.29.ebuild,v 1.1 2004/06/06 15:58:17 usata Exp $
+
+inherit eutils
+
+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="~x86"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Apply the makefile patch
+	epatch ${FILESDIR}/${P}-makefile-gentoo.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="BASEDIR=/usr"
+	use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=/usr/lib/libz.a"
+	emake prg2lout lout ${myconf} || 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 docdir
+	docdir=${D}/usr/share/doc/${P}
+
+	emake BASEDIR=${D}/usr DOCDIR=${docdir} \
+		installbin installlib installdoc installman \
+		|| die "emake install failed"
+
+	export LOUTLIB=${D}/usr/share/lout/
+	export PATH="${D}/usr/bin:${PATH}"
+
+	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
+}