forgot to commit and use the new patch

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64)

3 files changed, 97 insertions, 5 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/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