Version bump, bug 331931. Respect LDFLAGS, bug 331893.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 388 insertions, 2 deletions

diff --git a/app-editors/jove/ChangeLog b/app-editors/jove/ChangeLog
index 7e3f568ba784..60656e72e0a2 100644
--- a/app-editors/jove/ChangeLog
+++ b/app-editors/jove/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/jove
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.27 2009/06/16 20:39:45 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.28 2010/08/10 13:11:07 ulm Exp $
+
+*jove-4.16.0.73 (10 Aug 2010)
+
+  10 Aug 2010; Ulrich Mueller <ulm@gentoo.org> +jove-4.16.0.73.ebuild,
+  +files/jove-4.16.0.73-build.patch, +files/jove-4.16.0.73-doc.patch,
+  +files/jove-4.16.0.73-sendmail.patch:
+  Version bump, bug 331931. Respect LDFLAGS, bug 331893.
 
   16 Jun 2009; Ulrich Mueller <ulm@gentoo.org> jove-4.16.0.70.3.1.ebuild,
   +files/jove-4.16.0.70.3.1-getline.patch:
diff --git a/app-editors/jove/files/jove-4.16.0.73-build.patch b/app-editors/jove/files/jove-4.16.0.73-build.patch
new file mode 100644
index 000000000000..40ff9b284d19
--- /dev/null
+++ b/app-editors/jove/files/jove-4.16.0.73-build.patch
@@ -0,0 +1,236 @@
+Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
+
+--- jove4.16.0.73-orig/jove.c
++++ jove4.16.0.73/jove.c
+@@ -1576,7 +1576,7 @@
+ 	char	Joverc[FILESIZE];
+ 
+ 	if (dosys) {
+-		PathCat(Joverc, sizeof(Joverc), ShareDir, "jove.rc");
++		PathCat(Joverc, sizeof(Joverc), CONFIGDIR, "jove.rc");
+ 		(void) joverc(Joverc);	/* system wide jove.rc */
+ 	}
+ 
+--- jove4.16.0.73-orig/Makefile
++++ jove4.16.0.73/Makefile
+@@ -21,13 +21,14 @@
+ # If they don't exist, this makefile will try to create the directories
+ # LIBDIR and SHAREDIR.  All others must already exist.
+ 
+-JOVEHOME = /usr/local
+-SHAREDIR = $(JOVEHOME)/lib/jove
++JOVEHOME = ${DESTDIR}/usr
++SHAREDIR = $(JOVEHOME)/share/jove
+ LIBDIR = $(JOVEHOME)/lib/jove
+ BINDIR = $(JOVEHOME)/bin
+ XEXT=
+-MANDIR = $(JOVEHOME)/man/man$(MANEXT)
++MANDIR = $(JOVEHOME)/share/man/man$(MANEXT)
+ MANEXT = 1
++CONFIGDIR=${DESTDIR}/etc/jove
+ 
+ # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
+ # /usr/tmp.  If you wish to be able to recover buffers after a system
+@@ -38,11 +39,11 @@
+ # (in case the system startup salvages tempfiles by moving them,
+ # which is probably a good idea).
+ 
+-TMPDIR = /tmp
+-RECDIR = /var/preserve
++TMPDIR = /var/tmp
++RECDIR = ${DESTDIR}/var/lib/jove/preserve
+ 
+ # DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE.
+-DFLTSHELL = /bin/csh
++DFLTSHELL = /bin/sh
+ 
+ # The install commands of BSD and System V differ in unpleasant ways:
+ # -c: copy (BSD); -c dir: destination directory (SysV)
+@@ -56,15 +57,18 @@
+ INSTALLFLAGS = # -g bin -o root
+ 
+ # to install executable files
+-XINSTALL=cp
++XINSTALL=install -m 755
+ #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+ #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
+ 
+ # to install text files
+-TINSTALL=cp
++TINSTALL=install -m 644
+ #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
+ #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
+ 
++# to install directories
++DINSTALL=install -d 755
++
+ # These should all just be right if the above ones are.
+ # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
+ 
+@@ -72,7 +76,7 @@
+ TEACHJOVE = $(BINDIR)/teachjove$(XEXT)
+ RECOVER = $(LIBDIR)/recover$(XEXT)
+ PORTSRV = $(LIBDIR)/portsrv$(XEXT)
+-JOVERC = $(SHAREDIR)/jove.rc
++JOVERC = $(CONFIGDIR)/jove.rc
+ TERMSDIR = $(SHAREDIR)
+ CMDS.DOC = $(SHAREDIR)/cmds.doc
+ TEACH-JOVE = $(SHAREDIR)/teach-jove
+@@ -160,7 +164,7 @@
+ #	SCO UNIX: TERMCAPLIB = -lcurses
+ #	AIX on the R6000s: TERMCAPLIB = -lcurses -ltermcap -ls
+ 
+-TERMCAPLIB = -ltermcap
++TERMCAPLIB = -lncurses
+ 
+ # Extra libraries flags needed by oddball systems.
+ # Modern BSD systems using openpty need its library.
+@@ -181,7 +185,7 @@
+ #	PDP-11 with separate I&D: -i
+ #	PDP-11 without separate I&D: -n
+ 
+-LDFLAGS =
++#LDFLAGS =
+ 
+ # for SCO Xenix, set
+ #	MEMFLAGS = -Mle
+@@ -236,7 +240,8 @@
+ TROFF = troff -Tpost
+ TROFFPOST = | /usr/lib/lp/postscript/dpost -
+ 
+-MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
++MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM)
++# $(JOVETOOLM)
+ 
+ C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
+ 	delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \
+@@ -283,8 +288,7 @@
+ # all: default target.
+ # Builds everything that "install" needs.
+ all:	jjove$(XEXT) recover$(XEXT) teachjove$(XEXT) portsrv$(XEXT) \
+-	doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) \
+-	doc/jovetool.$(MANEXT)
++	doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) 
+ 
+ jjove$(XEXT):	$(OBJECTS)
+ 	$(LDCC) $(LDFLAGS) $(OPTFLAGS) -o jjove$(XEXT) $(OBJECTS) $(TERMCAPLIB) $(EXTRALIBS)
+@@ -341,6 +345,7 @@
+ 	@echo \#define LIBDIR \"$(LIBDIR)\" >> paths.h
+ 	@echo \#define SHAREDIR \"$(SHAREDIR)\" >> paths.h
+ 	@echo \#define DFLTSHELL \"$(DFLTSHELL)\" >> paths.h
++	@echo \#define CONFIGDIR \"$(CONFIGDIR)\" >> paths.h
+ 
+ makexjove:
+ 	( cd xjove ; make CC="$(CC)" OPTFLAGS="$(OPTFLAGS)" SYSDEFS="$(SYSDEFS)" $(TOOLMAKEEXTRAS) xjove )
+@@ -358,18 +363,31 @@
+ # Thus, if "all" is done first, "install" can be invoked with
+ # JOVEHOME pointing at a playpen where files are to be marshalled.
+ # This property is fragile.
+-install: $(LIBDIR) $(SHAREDIR) \
++install: $(BINDIR) $(LIBDIR) $(SHAREDIR) $(CONFIGDIR) $(RECDIR) \
+ 	 $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
+ 	 $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
+-	$(TINSTALL) doc/jove.rc $(JOVERC)
++	$(TINSTALL) doc/jove.rc $(CONFIGDIR)
+ 	@echo See the README about changes to /etc/rc or /etc/rc.local
+ 	@echo so that the system recovers jove files on reboot after a crash
+ 
++$(BINDIR)::
++	$(DINSTALL) $(BINDIR)
++
+ $(LIBDIR)::
+-	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
++	$(DINSTALL) $(LIBDIR)
+ 
+ $(SHAREDIR)::
+-	test -d $(SHAREDIR) || mkdir -p $(SHAREDIR)
++	$(DINSTALL) $(SHAREDIR)
++
++$(CONFIGDIR)::
++	 $(DINSTALL) $(CONFIGDIR)
++
++$(RECDIR)::
++	$(DINSTALL) $(RECDIR)
++	chmod 1777 $(RECDIR)
++
++$(MANDIR)::
++	$(DINSTALL) $(MANDIR)
+ 
+ $(TEACH-JOVE): doc/teach-jove
+ 	$(TINSTALL) doc/teach-jove $(TEACH-JOVE)
+@@ -410,7 +428,7 @@
+ 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
+ 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > doc/jove.$(MANEXT)
+ 
+-$(JOVEM): doc/jove.$(MANEXT)
++$(JOVEM): $(MANDIR) doc/jove.$(MANEXT)
+ 	$(TINSTALL) doc/jove.$(MANEXT) $(JOVEM)
+ 
+ # doc/jove.doc is the formatted manpage (only needed by DOS)
+@@ -427,10 +445,10 @@
+ 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
+ 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT)
+ 
+-$(TEACHJOVEM): doc/teachjove.$(MANEXT)
++$(TEACHJOVEM): $(MANDIR) doc/teachjove.$(MANEXT)
+ 	$(TINSTALL) doc/teachjove.$(MANEXT) $(TEACHJOVEM)
+ 
+-$(XJOVEM): doc/xjove.nr
++$(XJOVEM): $(MANDIR) doc/xjove.nr
+ 	$(TINSTALL) doc/xjove.nr $(XJOVEM)
+ 
+ doc/jovetool.$(MANEXT): doc/jovetool.nr
+--- jove4.16.0.73-orig/xjove/Makefile
++++ jove4.16.0.73/xjove/Makefile
+@@ -28,18 +28,23 @@
+ DEFINES=
+ 
+ # for Solaris 2.x:
+-SYSDEFS=-DSYSVR4
++#SYSDEFS=-DSYSVR4
+ # -i: ignore any LD_LIBRARY_PATH setting
+ # -L<dir>: add <dir> to library search path
+ # -R<dir[:dir]>: specify library search directories to dynamic linker
+-XJLDFLAGS= -i -L$$OPENWINHOME/lib -R$$OPENWINHOME/lib
++#XJLDFLAGS= -i -L$$OPENWINHOME/lib -R$$OPENWINHOME/lib
+ 
+ # for Sun0s4.x:
+ # XJLDFLAGS=-L$$OPENWINHOME/lib
+ # SYSDEFS=-DSUNOS41
++# XJCFLAGS = -I$$OPENWINHOME/include
++
++# for Linux
++SYSDEFS=-DBSDPOSIX
++XJLDFLAGS=-L/usr/lib
++XJCFLAGS=-I/usr/include
+ 
+ CFLAGS = $(OPTFLAGS) -I.. $(SYSDEFS) $(DEFINES)
+-XJCFLAGS = -I$$OPENWINHOME/include
+ 
+ BINDIR = /usr/local/bin
+ 
+@@ -55,7 +60,7 @@
+ INSTALLFLAGS = # -g bin -o root
+ 
+ # to install executable files
+-XINSTALL=cp
++XINSTALL=install -s -m 755
+ #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+ 
+ C_SRC = jovetool.c xjove.c jovewindows.c xjovewindows.c jovemenu.c \
+@@ -71,7 +76,7 @@
+ .filelist: $(BACKUPS)
+ 	@ls $(BACKUPS) >.filelist
+ 
+-installxjove:	xjove
++installxjove:	$(BINDIR) xjove
+ 		$(XINSTALL) xjove $(BINDIR)/xjove
+ 
+ installjovetool:	jovetool
+@@ -107,3 +112,6 @@
+ 
+ clobber:	clean
+ 	rm -f *.orig *.rej
++
++$(BINDIR)::
++	test -d $(BINDIR) || mkdir -p $(BINDIR)
diff --git a/app-editors/jove/files/jove-4.16.0.73-doc.patch b/app-editors/jove/files/jove-4.16.0.73-doc.patch
new file mode 100644
index 000000000000..0674b85608ae
--- /dev/null
+++ b/app-editors/jove/files/jove-4.16.0.73-doc.patch
@@ -0,0 +1,70 @@
+Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
+
+--- jove4.16.0.73-orig/doc/intro.nr
++++ jove4.16.0.73/doc/intro.nr
+@@ -56,9 +56,8 @@
+ ..
+ .
+ .\" Change the extra vertical spacing around .DS/.DE
+-.\" Does not work with groff's version of MS (GS is 1 iff groff MS)
+-.if !\n(GS .if n .nr DD 0v
+-.if !\n(GS .if t .nr DD \n(PD/2u
++.if n .nr DD 0v
++.if t .nr DD \n(PD/2u
+ .
+ .nr LL 6.5i
+ .nr LT 6.5i
+@@ -152,7 +151,7 @@
+ }
+ 
+ _	
+-\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\fP	<\ the Mode Line
++\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\ \ \ \ 15:23\fP	<\ the Mode Line
+ _	
+ : write-file (default hello.c) aloha.c\^\(sq 	<\ the Message Line
+ =	
+@@ -1978,7 +1977,7 @@
+ \ \ \ \ return 0;	<\ second Window
+ }\^\(sq
+ _	
+-\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\fP	<\ the Mode Line
++\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\ \ \ \ 15:28\fP	<\ the Mode Line
+ _	
+ [Point pushed]	<\ the Message Line
+ =	
+--- jove4.16.0.73-orig/doc/xjove.nr
++++ jove4.16.0.73/doc/xjove.nr
+@@ -1,6 +1,6 @@
+ .TH XJOVE 1 "8 July 1993"
+ .SH NAME
+-Xjove, Jovetool \- run JOVE under X-windows or Sunview with function-key and mouse support.
++Xjove \- run JOVE under X-windows with function-key and mouse support.
+ .SH SYNOPSIS
+ .B xjove
+ [
+@@ -13,23 +13,10 @@
+ [
+ args
+ \&.\|.\|. ]
+-.br
+-.B jovetool
+-[
+-.I window_args
+-] [
+-.B \-nf
+-] [
+-.BI \-rc \ run_command_path
+-]\&.\|.\|.
+-[
+-.I args
+-\&.\|.\|. ]
++
+ .SH DESCRIPTION
+ .I Xjove
+-(or
+-.IR Jovetool )
+-creates an XView or SunView frame and a tty subwindow within which mouse events
++creates an XView frame and a tty subwindow within which mouse events
+ and function keys are translated to ASCII sequences which JOVE can
+ parse.  The translated input events are sent to the process running in
+ the tty subwindow, which is typically JOVE.
diff --git a/app-editors/jove/files/jove-4.16.0.73-sendmail.patch b/app-editors/jove/files/jove-4.16.0.73-sendmail.patch
new file mode 100644
index 000000000000..072dd1f843ce
--- /dev/null
+++ b/app-editors/jove/files/jove-4.16.0.73-sendmail.patch
@@ -0,0 +1,19 @@
+--- jove4.16.0.73-orig/recover.c
++++ jove4.16.0.73/recover.c
+@@ -776,7 +776,7 @@
+ 
+ 	last_update = ctime(&(rec->UpdTime));
+ 	/* Start up mail */
+-	sprintf(mail_cmd, "/bin/mail %s", pw->pw_name);
++	sprintf(mail_cmd, "/usr/sbin/sendmail -t %s", pw->pw_name);
+ 	setuid(getuid());
+ 	if ((mail_pipe = popen(mail_cmd, "w")) == NULL)
+ 		return;
+@@ -784,6 +784,7 @@
+ 	setbuf(mail_pipe, mail_cmd);
+ 	/* Let's be grammatically correct! */
+ 	buf_string = rec->Nbuffers == 1? "buffer" : "buffers";
++	fprintf(mail_pipe, "To: %s\n", pw->pw_name);
+ 	fprintf(mail_pipe, "Subject: Jove saved %d %s after \"%s\" crashed\n",
+ 		rec->Nbuffers, buf_string, hname());
+ 	fprintf(mail_pipe, " \n");
diff --git a/app-editors/jove/jove-4.16.0.73.ebuild b/app-editors/jove/jove-4.16.0.73.ebuild
new file mode 100644
index 000000000000..bd06a85c7c59
--- /dev/null
+++ b/app-editors/jove/jove-4.16.0.73.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.73.ebuild,v 1.1 2010/08/10 13:11:07 ulm Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Jonathan's Own Version of Emacs - a light emacs-like editor without LISP bindings"
+HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
+SRC_URI="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/${PN}${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc unix98"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-4.16.0.70.3.1-getline.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-sendmail.patch"
+	epatch "${FILESDIR}/${P}-doc.patch"
+}
+
+src_compile() {
+	tc-export CC
+
+	if use unix98; then
+		emake OPTFLAGS="${CFLAGS}" SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
+			|| die
+	else
+		emake OPTFLAGS="${CFLAGS}" || die
+	fi
+
+	if use doc; then
+		# Full manual (*not* man page)
+		emake doc/jove.man || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	keepdir /var/lib/jove/preserve
+
+	dodoc README
+	if use doc; then
+		dodoc doc/jove.man || die
+	fi
+}