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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 22 insertions, 120 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/Manifest b/app-editors/jove/Manifest
index 1a80d8424da2..1c7dc23e2bb4 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA1
 
 AUX jove-4.16.0.70.3.1-getline.patch 2058 RMD160 b5d68b3008b9a31afd593640bf5b595f2bd4593d SHA1 a8cc545e02a368fb75f4e8b19f1adf1601c41724 SHA256 3d9738661666d379c8003ea2a8e2de996208e8ee301ff7a83397f8e3758ed2cd
-AUX jove-4.16.0.73-build.patch 7192 RMD160 7b6831c97c48db924dc3e0ccaabeccc1eba6d2fd SHA1 ee825715bb495f2baee29f950d15242a5eb8e0dd SHA256 1bd90375c07338b096995149f83f1c91aa1ec0d6a004b33fed62f30323e76836
-AUX jove-4.16.0.73-doc.patch 1866 RMD160 5861b52ce9bbb1f0a140379eb8933501bded1af9 SHA1 e57cfeda6d62507d15fc1135fefe8a0fc536a4d3 SHA256 21c0378ce889feae617e53e948e94ad409005590d0e84e47ca9edc36d13555a9
+AUX jove-4.16.0.73-build.patch 5776 RMD160 7b3f4caed2677f7ad7f11d8a2265d83b41af8e16 SHA1 6ee411245af701780b5a875448d048982bc9a81a SHA256 5ebc668efbb37692565d0ae4ffe7becd4588499572a54eff764da6ae21943d02
+AUX jove-4.16.0.73-doc.patch 1004 RMD160 31aa2088f823f90d3f2b3deac9f6b6a2dd1a2071 SHA1 f0ccf596292e37b9fb5d850549f50aa708ef9841 SHA256 f3204aa4022809eb6b449208a67579023bfd714e4cac2181ef587bbec4d32ccf
 AUX jove-4.16.0.73-sendmail.patch 675 RMD160 013adb06de7e3ed61b9833d281a2a2110b81eaa8 SHA1 dd015eee2bf708cc4fc71301abd877c02cb03c15 SHA256 1a428f66774319842dd548a834e586bfc07eb80e9dd0348a95e34560bbb89831
 DIST jove4.16.0.73.tgz 465214 RMD160 f5c91b392baf5d9c05eda39ac85805e3e8d2002c SHA1 fca6f33465b08eed5b90e24cfb67e61bc5249dcf SHA256 9c9e202607f5972c382098d10b63c815ac01e578f432626c982e6aa65000c630
 DIST jove_4.16.0.70-3.1.diff.gz 16063 RMD160 d39641b4f4e9ed081138ff21cf9d71f014da0bd9 SHA1 d38caae7c3c1a09b459f987d53491e13e232420b SHA256 0d41388c5070fee94ef87f32e5ef467082e3175793aa5dba3bf9f9de903318cd
 DIST jove_4.16.0.70.orig.tar.gz 451492 RMD160 37fdabc3b91be411e51d71d9029485491d2dec8f SHA1 a954003c177bdc3a0af560df7caa74ee5b2b5735 SHA256 619035b5a5e882ce907498b7252e02d997b346d990e4cb057fbed351ba9a5ec7
-EBUILD jove-4.16.0.70.3.1.ebuild 1325 RMD160 05adde77ab1f5091bdce3331cc7106753a24ea39 SHA1 f97fad09f63a49caf58ae510941a7265844764e0 SHA256 78b3320542d3abdcb8f1cd4ec20578c2d7844354f4845bb8c1d87acd119fcd44
-EBUILD jove-4.16.0.73.ebuild 1262 RMD160 38a51543a479234ef7a998815a0bdeaec4238e51 SHA1 7314522947cb847288c96e285595ea14b8aff692 SHA256 4dedb8c69079aae45ed43ac911ac88103180b637b2bf9346b5b10bb8611423b2
-MISC ChangeLog 4857 RMD160 4166ff740bb9309443e66a99f29bf1a5ea98c147 SHA1 7b470d970095a6c691cc88519e092b06809c9bd5 SHA256 1d87848e502fcbc80be448e9556e434b0025ac4021d6987fe64ab4c281d52e21
+EBUILD jove-4.16.0.70.3.1.ebuild 1327 RMD160 23b33a6c9cea7fdce4653880815579795a8781a9 SHA1 ee61c29547542615ef0afd4ff89bd88eef6e4112 SHA256 c9c06697187ad045f61d7bf1b5b78f60284fe65cb53feb8cad04a1651a952dcf
+EBUILD jove-4.16.0.73.ebuild 1184 RMD160 57c757caac0e28a93b4467be0a966df1051b264e SHA1 c89707254aa70e2f9220f66bbc23aed56879744f SHA256 e177c0a917ba52ee16492ce7a06a073ec9d85fb24f6997c961d737ed2554cec4
+MISC ChangeLog 4930 RMD160 8664bb2c7892a94c0ff4ede7cbcfacd2071aaaad SHA1 212a423978a90dc5be1713d534a44ee8368595ff SHA256 ae8e253b510c1475f26937b070ac4ef0bcf825637537977be2412e8bbf12c1e2
 MISC metadata.xml 611 RMD160 4c06a7334369482c540b9e63920dca1847d07979 SHA1 7407da956422bdbe23f440db8299d0d266d1d736 SHA256 f26b2edc723fc043f51e70f0052bb119663dd3176e0f2afc87d3e4b4fd79c2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxhaCcACgkQOeoy/oIi7uwJ7gCgj2NpSYDRo4JeOKk1LeCdV/AZ
-6hgAoNLfYvhC/mRfteJC3j8GxMOZfq/A
-=Q9jN
+iEYEARECAAYFAkxhqUwACgkQOeoy/oIi7uy0/ACgxH/e8JciYHO0/YZcvSH7mEKv
+kMwAn32eHv6m4UJ1h1vtArjNV/csf8vl
+=K+Xt
 -----END PGP SIGNATURE-----
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)