Remove unused patches. Fix repoman complains.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 16 insertions, 403 deletions

diff --git a/app-text/lout/ChangeLog b/app-text/lout/ChangeLog
index 979085f22700..122cce76289f 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.24 2009/09/04 14:50:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/ChangeLog,v 1.25 2009/09/06 18:36:26 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/lout-3.25-r1-makefile-gentoo.patch,
+  -files/lout-3.29-makefile-gentoo.patch, lout-3.30.ebuild,
+  lout-3.31.ebuild:
+  Remove unused patches. Fix repoman complains.
 
 *lout-3.38-r1 (04 Sep 2009)
 
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
index 54c54a87f456..f24a25118b5b 100644
--- a/app-text/lout/Manifest
+++ b/app-text/lout/Manifest
@@ -1,12 +1,10 @@
-AUX lout-3.25-r1-makefile-gentoo.patch 9685 RMD160 37273507a2edf509fbd01cc3e2b5192efb9ca3b2 SHA1 8b192eb80cc6df68cf94599e001e63603447e73d SHA256 0a18fdf08665b6bccf15e34c86369095add34a17fac2879aeff334ae618459f0
-AUX lout-3.29-makefile-gentoo.patch 5985 RMD160 142240128b6c35a80b535be1f1c6dd44e016c0f1 SHA1 641fc17a06c84cfe46d6895f559a916395335fad SHA256 ad634edb87ab67ae235c3a3ecee8337debf7397986debb4d67d0687628cf67db
 AUX lout-3.38-makefile.patch 715 RMD160 b487036f10977a9bc0806392aa9323a058189675 SHA1 e9eeb99f52ec2aa5173b3397ff8deb2b81457a9d SHA256 4418a5b83d4868ea418e1026b704a5ed1217aa84a9b383d225eee6e540b4c95e
 DIST lout-3.30.tar.gz 1961043 RMD160 72589bd58fc34431c5049df3003d4fc6fbe1b34a SHA1 a6adcd887bec53d54f2589e99acc62e48608bdaf SHA256 a58571f8a2bde2bb62d820b37b0f0260be30c3bca8887daf5eeebdfd068c04a9
 DIST lout-3.31.tar.gz 1987038 RMD160 8d9329a5e8e7a02487a57c45e22f083715d8a122 SHA1 563406796d235cafd30af8e45f2314eb39718ca3 SHA256 3593d02ed6d1f83dbecdf680de00eda103d91deda1d6d8c947d9b6fbf2d2f424
 DIST lout-3.38.tar.gz 2147395 RMD160 8835b223f67b383bdbb1d4105a28e002745d4dbb SHA1 2c4aec500dc27a00298f8265b9249d74d97e5466 SHA256 6a2adc64a8b4a81ed39893328778da284a6ab0da3e5e20f678425f2d53dad80a
-EBUILD lout-3.30.ebuild 1982 RMD160 676c5e2cc7195b7f588de58a141a4a87139e57a0 SHA1 93f3f05afdb1bffeaa112b5fade4c4ebd7aab694 SHA256 8794b1de68d21ae6b4973b9bff789fd059e4dda05e52681f209fd2abeeb2bdb2
-EBUILD lout-3.31.ebuild 1975 RMD160 b8c2f1c977cb8b07e874e9b2c4c8a8b0e8443c57 SHA1 ffa791ee3ccd59b3e7afa286653674c40a11d25c SHA256 f75ac0214a41e52c6d510367bec051137f4f5ca3dc7aeebe5ee899a2f4fdb516
+EBUILD lout-3.30.ebuild 1982 RMD160 a91c0d7d66efe110359e27efc7ca332da2251a9a SHA1 720ffe8c363e829112d2183b63699f26f8b3a61b SHA256 e54f4cacd2b9e187be32e369125b286d414b6b3daad953617d8a8e0062885de7
+EBUILD lout-3.31.ebuild 1975 RMD160 8e5d395f19eef22636942b39e59ddefd2ad9949a SHA1 a07d00c771820de74b3b117a0e6f2f2902c3dd73 SHA256 036870f573e7ea5846d387bc4bbd2c8bb6c755543cf4ec35dc7c27797e864ad5
 EBUILD lout-3.38-r1.ebuild 2084 RMD160 be469a70e2a4f1ad0b105325e36c700e388d91cc SHA1 1aa9c4076354cc3918296a7de38a04573a03e9be SHA256 56c4ad86fd1ba8c6ed5e3b3080b93eaca72e6d4c19ace1570c8ab329b970b279
 EBUILD lout-3.38.ebuild 1993 RMD160 096ed80344ef61cda6a41de3f07ca9510105517c SHA1 76229f36e4019051276502771220c290b10d3529 SHA256 c1eaedbab08cfb560151c59755fb49bd9622bd27eefa76daf5a6880e862aabda
-MISC ChangeLog 3622 RMD160 1f8faf34a3163227cbbd754b1a55f73325553dea SHA1 47c7ffa3d4babe13269596aece31302a810514bc SHA256 d6a09043b4649a27c21d21595dc886cd3676e50acb1ecb65c139a82f49206b4f
+MISC ChangeLog 3850 RMD160 779b0e96dbaa3274c7b50bdbd24e6f74229ae210 SHA1 83b2dedfabc56fc00bc8f9d431bc2b40c2547549 SHA256 30fbb70da37b63a83d7740df35afed88e10f1f83158230b0b187abf50456099b
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-text/lout/files/lout-3.25-r1-makefile-gentoo.patch b/app-text/lout/files/lout-3.25-r1-makefile-gentoo.patch
deleted file mode 100644
index c787c7852762..000000000000
--- a/app-text/lout/files/lout-3.25-r1-makefile-gentoo.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- makefile	2002-07-10 16:32:03.000000000 +0200
-+++ makefile.new	2002-07-10 16:31:41.000000000 +0200
-@@ -2,6 +2,24 @@
- #                                                                             #
- #  Make file for installing Basser Lout Version 3.25                          #
- #                                                                             #
-+###############################################################################
-+#                                                                             #
-+#  Patched for Gentoo Linux ebuild by Christian V. J. Brüssow <cvjb@epost.de> #
-+#                                                                             #
-+#  WARNING: DO NOT USE THIS MAKE FILE FOR A NORMAL MAKE, ESPECIALLY A MAKE    #
-+#           INSTALL! IT WILL NOT DO WHAT YOU EXPECT! IT RELIES HEAVILLY ON    #
-+#           GENTOO LINUX' EMERGE/EBUILD SYSTEM TO FUNCTION PROPERLY!          #
-+#                                                                             #
-+#  Don't blame the Lout author for errors or problems you may have, when      #
-+#  using this patched make file! Instead write a mail to the guilty ;-)       #
-+#  that is: cvjb@epost.de                                                     #
-+#                                                                             #
-+#  DISCLAIMER: I (Christian V. J. Brüssow) do not guarantee, that this file   #
-+#  will not damage your system (software, hardware, data in any form). You    #
-+#  will use it at your own risk.                                              #
-+#                                                                             #
-+###############################################################################
-+#                                                                             #
- #  Jeffrey H. Kingston                                                        #
- #  24 Secember 2001                                                           #
- #                                                                             #
-@@ -270,16 +288,16 @@
- USESTAT = 1
- SAFEDFT = 0
- 
--# DEBUGGING = 0
--# TRACING =
-+DEBUGGING = 0
-+TRACING =
- 
--DEBUGGING = 1
--TRACING = -g
-+# DEBUGGING = 1
-+# TRACING = -g
- 
--BINDIR	= /usr/staff/jeff/bin
--LIBDIR	= /usr/staff/jeff/lout.lib
--DOCDIR	= /usr/staff/jeff/lout.doc
--MANDIR	= /usr/staff/jeff/lout.man
-+BINDIR	= /usr/bin
-+LIBDIR	= /usr/lib/lout
-+DOCDIR	= /usr/share/doc/lout-3.25-r1
-+MANDIR	= /usr/share/man/man1
- 
- LIBFONT = font
- LIBMAPS = maps
-@@ -297,9 +315,9 @@
- 
- COLLATE	= 1
- 
--PDF_COMPRESSION	= 0
--ZLIB		=
--ZLIBPATH	=
-+PDF_COMPRESSION	= 1
-+ZLIB		= /usr/lib/libz.a
-+ZLIBPATH	= -I/usr/include/
- 
- CC	= gcc
- 
-@@ -353,92 +371,98 @@
- 
- install: lout prg2lout
- 	@echo ""
--	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
--	cp lout $(BINDIR)/lout
--	chmod 755 $(BINDIR)/lout
--	cp prg2lout $(BINDIR)/prg2lout
--	chmod 755 $(BINDIR)/prg2lout
--	@echo ""
--	@echo "(b) Installing library files into LIBDIR $(LIBDIR)"
--	mkdir $(LIBDIR)
--	chmod 755 $(LIBDIR)
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBINCL)
--	chmod 755 $(LIBDIR)/$(LIBINCL)
--	cp include/* $(LIBDIR)/$(LIBINCL)
--	chmod 644 $(LIBDIR)/$(LIBINCL)/*
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBDATA)
--	chmod 755 $(LIBDIR)/$(LIBDATA)
--	cp data/* $(LIBDIR)/$(LIBDATA)
--	chmod 644 $(LIBDIR)/$(LIBDATA)/*
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBHYPH)
--	chmod 755 $(LIBDIR)/$(LIBHYPH)
--	cp hyph/* $(LIBDIR)/$(LIBHYPH)
--	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBFONT)
--	chmod 755 $(LIBDIR)/$(LIBFONT)
--	cp font/* $(LIBDIR)/$(LIBFONT)
--	chmod 644 $(LIBDIR)/$(LIBFONT)/*
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBMAPS)
--	chmod 755 $(LIBDIR)/$(LIBMAPS)
--	cp maps/* $(LIBDIR)/$(LIBMAPS)
--	chmod 644 $(LIBDIR)/$(LIBMAPS)/*
--	@echo ""
--	mkdir $(LIBDIR)/$(LIBLOCA)
--	chmod 755 $(LIBDIR)/$(LIBLOCA)
--	@echo ""
--	@echo "(c) Initializing run (should be silent, no errors expected)"
--	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
--	@echo ""
--	@echo "(d) Changing mode of files just created by initializing run"
--	chmod 644 $(LIBDIR)/$(LIBDATA)/*
--	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
-+	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(DESTDIR)/$(BINDIR)"
-+	strip lout
-+	strip prg2lout
-+	mkdir -p $(DESTDIR)/$(BINDIR)
-+	cp lout $(DESTDIR)/$(BINDIR)/lout
-+	chmod 755 $(DESTDIR)/$(BINDIR)/lout
-+	cp prg2lout $(DESTDIR)/$(BINDIR)/prg2lout
-+	chmod 755 $(DESTDIR)/$(BINDIR)/prg2lout
-+	@echo ""
-+	@echo "(b) Installing library files into LIBDIR $(DESTDIR)/$(LIBDIR)"
-+	mkdir -p $(DESTDIR)/$(LIBDIR)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBINCL)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBINCL)
-+	cp include/* $(DESTDIR)/$(LIBDIR)/$(LIBINCL)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBINCL)/*
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBDATA)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBDATA)
-+	cp data/* $(DESTDIR)/$(LIBDIR)/$(LIBDATA)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBDATA)/*
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBHYPH)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBHYPH)
-+	cp hyph/* $(DESTDIR)/$(LIBDIR)/$(LIBHYPH)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBHYPH)/*
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBFONT)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBFONT)
-+	cp font/* $(DESTDIR)/$(LIBDIR)/$(LIBFONT)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBFONT)/*
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBMAPS)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBMAPS)
-+	cp maps/* $(DESTDIR)/$(LIBDIR)/$(LIBMAPS)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBMAPS)/*
-+	@echo ""
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)
-+#	@echo ""
-+#	@echo "(c) Initializing run (should be silent, no errors expected)"
-+#	$(DESTDIR)/$(BINDIR)/lout -x -s $(DESTDIR)/$(LIBDIR)/$(LIBINCL)/init
-+#	@echo ""
-+#	@echo "(d) Changing mode of files just created by initializing run"
-+#	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBDATA)/*
-+#	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBHYPH)/*
- 
- installman:
- 	@echo ""
--	@echo "Installing manual entries into MANDIR $(MANDIR)"
--	sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LIBDIR)@"	\
--	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
--	man/lout.1 > $(MANDIR)/lout.1
--	chmod 644 $(MANDIR)/lout.1
--	cp man/prg2lout.1 $(MANDIR)/prg2lout.1
--	chmod 644 $(MANDIR)/prg2lout.1
-+	@echo "Installing manual entries into MANDIR $(DESTDIR)/$(MANDIR)"
-+	mkdir -p $(DESTDIR)/$(MANDIR)
-+	sed -e "s@<BINDIR>@$(DESTDIR)/$(BINDIR)@" -e "s@<LIBDIR>@$(DESTDIR)/$(LIBDIR)@"	\
-+	    -e "s@<DOCDIR>@$(DESTDIR)/$(DOCDIR)@" -e "s@<MANDIR>@$(DESTDIR)/$(MANDIR)@"	\
-+	man/lout.1 > $(DESTDIR)/$(MANDIR)/lout.1
-+	chmod 644 $(DESTDIR)/$(MANDIR)/lout.1
-+	cp man/prg2lout.1 $(DESTDIR)/$(MANDIR)/prg2lout.1
-+	chmod 644 $(DESTDIR)/$(MANDIR)/prg2lout.1
- 
- installdoc:
- 	@echo ""
--	@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it"
--	$(RCOPY) doc $(DOCDIR)
--	chmod 755 $(DOCDIR)
--	chmod 755 $(DOCDIR)/*
--	chmod 644 $(DOCDIR)/*/*
-+	@echo "Creating DOCDIR $(DESTDIR)/$(DOCDIR) and copying documentation into it"
-+	mkdir -p $(DESTDIR)/$(DOCDIR)
-+	chmod 755 $(DESTDIR)/$(DOCDIR)
-+	$(RCOPY) doc $(DESTDIR)/$(DOCDIR)
-+	chmod 755 $(DESTDIR)/$(DOCDIR)/doc
-+	chmod 755 $(DESTDIR)/$(DOCDIR)/doc/*
-+	chmod 644 $(DESTDIR)/$(DOCDIR)/doc/README
- 
- 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
--	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)
--	chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
-+	@echo "Putting French error messages into $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)"
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
-+	cp locale/msgs.fr $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
-+	gencat $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
-+	       $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/*
- 
- 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
--	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)
--	chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
-+	@echo "Putting German error messages into $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
-+	chmod 755 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
-+	cp locale/msgs.de $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
-+	gencat $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
-+	       $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
-+	chmod 644 $(DESTDIR)/$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/*
- 
- uninstall:
- 	-rm -f  $(BINDIR)/lout $(BINDIR)/prg2lout
diff --git a/app-text/lout/files/lout-3.29-makefile-gentoo.patch b/app-text/lout/files/lout-3.29-makefile-gentoo.patch
deleted file mode 100644
index 8599d11dde7f..000000000000
--- a/app-text/lout/files/lout-3.29-makefile-gentoo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- 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.30.ebuild b/app-text/lout/lout-3.30.ebuild
index 551890b371d7..054ccbd8ce98 100644
--- a/app-text/lout/lout-3.30.ebuild
+++ b/app-text/lout/lout-3.30.ebuild
@@ -1,6 +1,6 @@
 # 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.30.ebuild,v 1.7 2009/07/23 23:02:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.30.ebuild,v 1.8 2009/09/06 18:36:26 idl0r Exp $
 
 inherit toolchain-funcs
 
@@ -54,13 +54,13 @@ src_install() {
 
 	mkdir -p ${bindir} ${docdir} ${mandir}
 
-	make BINDIR=${bindir} \
+	emake BINDIR=${bindir} \
 		LIBDIR=${libdir} \
 		DOCDIR=${docdir} \
 		MANDIR=${mandir} \
 		install installdoc installman || die "make install failed"
 
-	lout -x -s ${D}/usr/share/lout/include/init || die "lout init 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
diff --git a/app-text/lout/lout-3.31.ebuild b/app-text/lout/lout-3.31.ebuild
index afca9b967fbe..13eb8f3b56f9 100644
--- a/app-text/lout/lout-3.31.ebuild
+++ b/app-text/lout/lout-3.31.ebuild
@@ -1,6 +1,6 @@
 # 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.31.ebuild,v 1.3 2009/07/23 23:02:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lout/lout-3.31.ebuild,v 1.4 2009/09/06 18:36:26 idl0r Exp $
 
 inherit toolchain-funcs
 
@@ -54,13 +54,13 @@ src_install() {
 
 	mkdir -p ${bindir} ${docdir} ${mandir}
 
-	make BINDIR=${bindir} \
+	emake BINDIR=${bindir} \
 		LIBDIR=${libdir} \
 		DOCDIR=${docdir} \
 		MANDIR=${mandir} \
 		install installdoc installman || die "make install failed"
 
-	lout -x -s ${D}/usr/share/lout/include/init || die "lout init 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