Drop unix98 USE flag, this is now the default. Fix LICENSE to "as-is".

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 14 insertions, 112 deletions

diff --git a/app-editors/jove/ChangeLog b/app-editors/jove/ChangeLog
index 60656e72e0a2..314ae75b2492 100644
--- a/app-editors/jove/ChangeLog
+++ b/app-editors/jove/ChangeLog
@@ -1,13 +1,14 @@
 # ChangeLog for app-editors/jove
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.29 2010/08/10 19:29:17 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.
+  Version bump, bug 331931. Respect LDFLAGS, bug 331893. Drop unix98 USE flag,
+  this is now the default. Fix LICENSE to "as-is".
 
   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
index 4d7fc1de9eaf..105d163d32be 100644
--- a/app-editors/jove/files/jove-4.16.0.73-build.patch
+++ b/app-editors/jove/files/jove-4.16.0.73-build.patch
@@ -109,8 +109,8 @@ Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
  TROFFPOST = | /usr/lib/lp/postscript/dpost -
  
 -MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
-+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 \
@@ -177,7 +177,7 @@ Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
  	$(TINSTALL) doc/jove.$(MANEXT) $(JOVEM)
  
  # doc/jove.doc is the formatted manpage (only needed by DOS)
-@@ -427,10 +445,10 @@
+@@ -427,7 +445,7 @@
  	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
  	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT)
  
@@ -185,62 +185,4 @@ Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
 +$(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)
+ $(XJOVEM): doc/xjove.nr
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
index 0674b85608ae..d62add543af6 100644
--- a/app-editors/jove/files/jove-4.16.0.73-doc.patch
+++ b/app-editors/jove/files/jove-4.16.0.73-doc.patch
@@ -32,39 +32,3 @@ Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz
  _	
  [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/jove-4.16.0.70.3.1.ebuild b/app-editors/jove/jove-4.16.0.70.3.1.ebuild
index fb472274c31f..559966863196 100644
--- a/app-editors/jove/jove-4.16.0.70.3.1.ebuild
+++ b/app-editors/jove/jove-4.16.0.70.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.70.3.1.ebuild,v 1.7 2009/06/16 20:39:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.1.ebuild,v 1.8 2010/08/10 19:29:17 ulm Exp $
 
 inherit eutils toolchain-funcs versionator
 
@@ -12,7 +12,7 @@ HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
 SRC_URI="mirror://debian/pool/main/j/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/j/${PN}/${MY_DIFFP}.diff.gz"
 
-LICENSE="BSD"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="unix98"
diff --git a/app-editors/jove/jove-4.16.0.73.ebuild b/app-editors/jove/jove-4.16.0.73.ebuild
index bd06a85c7c59..39eece29448f 100644
--- a/app-editors/jove/jove-4.16.0.73.ebuild
+++ b/app-editors/jove/jove-4.16.0.73.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.73.ebuild,v 1.2 2010/08/10 19:29:17 ulm Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,10 +8,10 @@ DESCRIPTION="Jonathan's Own Version of Emacs - a light emacs-like editor without
 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"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc unix98"
+IUSE="doc"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}"
@@ -30,12 +30,7 @@ src_unpack() {
 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
+	emake OPTFLAGS="${CFLAGS}" SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" || die
 
 	if use doc; then
 		# Full manual (*not* man page)