forgot to commit and use the new patch

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64

4 files changed, 103 insertions, 10 deletions

diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index 38c3baa17627..9bdb9660ae90 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/ed
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.66 2008/09/03 13:31:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ChangeLog,v 1.67 2008/09/03 14:42:06 cardoe Exp $
+
+  03 Sep 2008; Doug Goldstein <cardoe@gentoo.org> +files/ed-1.0-build.patch,
+  ed-1.0.ebuild:
+  forgot to commit and use the new patch
 
 *ed-1.0 (03 Sep 2008)
 
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 315d4db5972e..16c57692036b 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX ed-0.5-build.patch 1797 RMD160 37be69f082f5927f059b60eab23ce543bd711524 SHA1 0aea8161d9e363067f9fc1defc0a21e58aa7c4c3 SHA256 ec9f8a7e569a087bdcc68ec76d4418028a93ebe6389872e44fb6d24b68f7be65
+AUX ed-1.0-build.patch 3169 RMD160 3accbbd668f258e0d778be4f62119579ef675991 SHA1 43d6f1025624a72b9aefb6ade7758492986c565c SHA256 0d53ac43d9b3024750f85f15a6e01f6b02ff05263ccd856a07187ada9eeefc87
 DIST ed-0.8.tar.bz2 68052 RMD160 456a0cb1236651e65c3b0f0552c2c24aeab4daba SHA1 d191031fa8f1a424fa15c87b7332e1f42fbfca51 SHA256 37983c87cf1bd2b1162e9277d1bf304222924e9d1fb4ac05bb9be56d78e2ea1f
 DIST ed-0.9.tar.bz2 67941 RMD160 ed73a7e4ea39100f491d207109387e08c6109b80 SHA1 233a942964653598e3915f8396be7dd3b688b95f SHA256 22fa075554b669178b7c073aab5274c473d311a5a10b1ccdae2f45759e21c7f7
 DIST ed-1.0.tar.bz2 68074 RMD160 d944beaba67e0f998e840628a7359415af35a42e SHA1 d826461be5247dab4db90055d5248e67eb6cad7c SHA256 f964b1800692d91fcab55e81b303b4a56ae9c311867278665b181a8fcd5f9357
 EBUILD ed-0.8.ebuild 936 RMD160 af71e5b92a2cc6c62d3f5f7bad805b55f29df0d3 SHA1 aa8974d298034a039b1ca04e92a93a517f8fb759 SHA256 9b441aefe4ef4ca91491607746e6d863dc01497a0f1c56c60dbb6f2ae9f1f651
 EBUILD ed-0.9.ebuild 938 RMD160 9119e2b222f0e2d99685f89cf1cecca36c1e52e7 SHA1 e0f9d13fc48a2c306059b9484b9f92b53ab4f3df SHA256 dd04f8f556e67401268561e03ce192a04c1c902bb6b78b31c896e749b2207416
-EBUILD ed-1.0.ebuild 960 RMD160 fc88c52127f20d1b6663bde77f29989a12666963 SHA1 6d4d2d20b74dec1cc717fd56fc63d928844bd553 SHA256 8a3e870b839c8b97052c95bca7571979d18e05ebd6b2aed9caccfd5ebcba3291
-MISC ChangeLog 7272 RMD160 d7dfbabda85d4bf8273a8576394b4bb96772a578 SHA1 e7823d3bab493edc3108fb03552142c1d7140c69 SHA256 36ddae062f55acea746f2d32e48570cde2f547d41bbb533a723cc2c11d5e3f94
+EBUILD ed-1.0.ebuild 906 RMD160 011521526ef335fbf6d4b474030ab775af030df5 SHA1 308ba3c300c09dcb01769c666b5efd0aa2eba7e0 SHA256 5e3163efc5651f4e41f438deab63e99252a986cea41605649ccbbd5231df64db
+MISC ChangeLog 7408 RMD160 cfc63db002c3e12873c78b2b684e06cc7809235e SHA1 d0167ff6e1170e8fa4b746125b2f63f2a9e80564 SHA256 027b3c3a6221c7bffa462161885cd225d24e97cf48e807e52b3da6bfa57e628b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki+kdQACgkQoeSe8B0zEfxsNACfakVDfz2TN/wlV1GbA4qQ3c9t
-bX8An1rzFa8paOK7LGTswv+PtQ4dQ57W
-=Z9Lf
+iEYEARECAAYFAki+okcACgkQoeSe8B0zEfw/4wCfULynFmHtsk8ZigcmgM3BkLSG
+easAn3LCK1znjudDgSCh6xBoQDR+ObWA
+=XDpU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-1.0.ebuild b/sys-apps/ed/ed-1.0.ebuild
index e23e0cf246e2..b46a3e5b0f32 100644
--- a/sys-apps/ed/ed-1.0.ebuild
+++ b/sys-apps/ed/ed-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.0.ebuild,v 1.1 2008/09/03 13:31:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-1.0.ebuild,v 1.2 2008/09/03 14:42:06 cardoe Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,7 +19,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.5-build.patch
+	epatch "${FILESDIR}"/${PN}-1.0-build.patch
 }
 
 src_compile() {
@@ -35,7 +35,5 @@ src_compile() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die
-	doman doc/ed.1
-	dosym ed.1 /usr/share/man/man1/red.1
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/sys-apps/ed/files/ed-1.0-build.patch b/sys-apps/ed/files/ed-1.0-build.patch
new file mode 100644
index 000000000000..e0a45329b942
--- /dev/null
+++ b/sys-apps/ed/files/ed-1.0-build.patch
@@ -0,0 +1,90 @@
+2008-09-03  Doug Goldstein  <cardoe@gentoo.org>
+	* Make red man page a symlink instead of a hard link
+	* install man pages by default
+
+2007-04-16  Mike Frysinger  <vapier@gentoo.org>
+
+	* Clean locale vars from environment to maintain a sane state.
+	* Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can
+	  override if they so choose.
+	* Only set CFLAGS/CXXFLAGS if user did not specify any.
+
+diff -u ed-1.0/configure ed-1.0-new-patch/configure
+--- ed-1.0/configure	2008-08-21 14:34:24.000000000 -0400
++++ ed-1.0-new-patch/configure	2008-09-03 10:33:16.000000000 -0400
+@@ -14,6 +14,19 @@
+ progversion=1.0
+ srctrigger=ed.h
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    unset $as_var
++  fi
++done
++
+ # clear some things potentially inherited from environment.
+ srcdir=
+ prefix=/usr/local
+@@ -24,12 +37,6 @@
+ mandir='$(datadir)/man'
+ sysconfdir='$(prefix)/etc'
+ program_prefix=
+-CC=
+-CXX=
+-CPPFLAGS=
+-CFLAGS='-Wall -W -O2'
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+ 
+ # Loop over all args
+ while [ x"$1" != x ] ; do
+@@ -106,6 +113,14 @@
+ 	esac
+ done
+ 
++# Defaults if the user did not select any
++if [ x"${CFLAGS}" = x ] ; then
++	CFLAGS='-Wall -W -O2'
++fi
++if [ x"${CXXFLAGS}" = x ] ; then
++	CXXFLAGS='-Wall -W -O2'
++fi
++
+ # Find the source files, if location was not specified.
+ srcdirtext=
+ if [ x"${srcdir}" = x ] ; then
+Common subdirectories: ed-1.0/doc and ed-1.0-new-patch/doc
+diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in
+--- ed-1.0/Makefile.in	2008-05-04 11:57:10.000000000 -0400
++++ ed-1.0-new-patch/Makefile.in	2008-09-03 10:38:37.000000000 -0400
+@@ -44,11 +44,11 @@
+ check : $(progname) $(VPATH)/testsuite/check.sh
+ 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
+ 
+-install : all install-info
++install : all install-info install-man
+ 	if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi
+ 	$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(program_prefix)$(progname)
+ 	-rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname)
+-	cd $(DESTDIR)$(bindir) ; ln $(program_prefix)$(progname) $(program_prefix)r$(progname)
++	cd $(DESTDIR)$(bindir) ; ln -s $(program_prefix)$(progname) $(program_prefix)r$(progname)
+ 
+ install-info :
+ 	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi
+@@ -59,7 +59,7 @@
+ 	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi
+ 	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1
+ 	-rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1
+-	cd $(DESTDIR)$(mandir)/man1 ; ln $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1
++	cd $(DESTDIR)$(mandir)/man1 ; ln -s $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1
+ 
+ install-strip : all
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite