added jed info patch, cleanup

8 files changed, 156 insertions, 161 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index 0ca9f0bb881f..47d04f9c0887 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/jed
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.16 2004/02/05 01:25:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.17 2004/04/20 08:59:02 liquidx Exp $
+
+*jed-0.99.16-r2 (20 Apr 2004)
+
+  20 Apr 2004; Alastair Tse <liquidx@gentoo.org> jed-0.99.16-r2.ebuild,
+  files/jed-0.99.16-jed.info.patch:
+  added jed info patch thanks to Doug Weimer <dweimer@socal.rr.com> (#46743)
 
   05 Feb 2004; Alastair Tse <liquidx@gentoo.org> jed-0.99.16-r1.ebuild:
   add more reliable SRC_URI
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index c4011aae7590..157d5dcfbd08 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,10 +1,13 @@
-MD5 51be96423b1d381dae0e2f3adbd6baa9 files/digest-jed-0.99.14-r1 65
-MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16 64
-MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r1 64
-MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
-MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
 MD5 2dc0fbcc0b836754c9cdd05395f1d612 ChangeLog 2164
 MD5 4da582eb2d1b957c284833421d227590 jed-0.99.14-r1.ebuild 1533
 MD5 49476e18b75504d99c0bc42f88f4f9de jed-0.99.16-r1.ebuild 2082
 MD5 7011918cbbf424dab65788accab5f758 jed-0.99.16.ebuild 1446
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 1b37dfbba7db2818fe9b42e68f6b3e5a jed-0.99.16-r2.ebuild 2162
+MD5 51be96423b1d381dae0e2f3adbd6baa9 files/digest-jed-0.99.14-r1 65
+MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16 64
+MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r1 64
+MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
+MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
+MD5 b972e25cececf15ffc9e56d76d9f86a1 files/jed-0.99.16-jed.info.patch 1508
+MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r2 64
diff --git a/app-editors/jed/files/digest-jed-0.99.14-r1 b/app-editors/jed/files/digest-jed-0.99.14-r1
deleted file mode 100644
index 8e666b7a6f4d..000000000000
--- a/app-editors/jed/files/digest-jed-0.99.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3023e134d85f72e54f0f9d1c84e5b4e4 jed-B0.99-14.tar.bz2 650239
diff --git a/app-editors/jed/files/digest-jed-0.99.16 b/app-editors/jed/files/digest-jed-0.99.16-r2
index 180e8555d8af..180e8555d8af 100644
--- a/app-editors/jed/files/digest-jed-0.99.16
+++ b/app-editors/jed/files/digest-jed-0.99.16-r2
diff --git a/app-editors/jed/files/jed-0.99.16-jed.info.patch b/app-editors/jed/files/jed-0.99.16-jed.info.patch
new file mode 100644
index 000000000000..cc68d38bce3a
--- /dev/null
+++ b/app-editors/jed/files/jed-0.99.16-jed.info.patch
@@ -0,0 +1,46 @@
+diff -r -u jed-0.99-16-vanilla/info/jed.1in jed-0.99-16/info/jed.1in
+--- jed-0.99-16-vanilla/info/jed.1in	2004-04-19 15:13:23.295493000 -0700
++++ jed-0.99-16/info/jed.1in	2004-04-19 15:16:30.378052696 -0700
+@@ -1,6 +1,11 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Jed: (jed).       Console S-Lang-based editor.
++END-INFO-DIR-ENTRY
++
+ 
+ File: jed.info,  Node: Top,  Next: Introduction,  Up: (dir)
+ 
+diff -r -u jed-0.99-16-vanilla/info/jed.2in jed-0.99-16/info/jed.2in
+--- jed-0.99-16-vanilla/info/jed.2in	2002-10-19 23:55:30.000000000 -0700
++++ jed-0.99-16/info/jed.2in	2004-04-19 15:16:35.540267920 -0700
+@@ -1,6 +1,12 @@
+ 
+ File: jed.info,  Node: Tab Issues.,  Next: Searching,  Prev: Marking Text (Point and Mark),  Up: Basic Editing
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Jed: (jed).       Console S-Lang-based editor.
++END-INFO-DIR-ENTRY
++
++
+ Tab Issues.
+ -----------
+ 
+diff -r -u jed-0.99-16-vanilla/info/jed.3in jed-0.99-16/info/jed.3in
+--- jed-0.99-16-vanilla/info/jed.3in	2002-10-19 23:55:30.000000000 -0700
++++ jed-0.99-16/info/jed.3in	2004-04-19 15:16:44.429916488 -0700
+@@ -1,6 +1,11 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Jed: (jed).       Console S-Lang-based editor.
++END-INFO-DIR-ENTRY
++
+ 
+ File: jed.info,  Node: Setting Keys,  Next: Predefined Variables,  Up: Customization
+ 
diff --git a/app-editors/jed/jed-0.99.14-r1.ebuild b/app-editors/jed/jed-0.99.14-r1.ebuild
deleted file mode 100644
index 091981d164a8..000000000000
--- a/app-editors/jed/jed-0.99.14-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.14-r1.ebuild,v 1.15 2004/04/06 03:36:23 vapier Exp $
-
-inherit eutils
-
-IUSE="X gpm"
-
-P0=${PN}-B0.99-14
-S=${WORKDIR}/${P0}
-DESCRIPTION="Console S-Lang-based editor"
-SRC_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/${P0}.tar.bz2"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-
-DEPEND=">=sys-libs/slang-1.3.11
-	X? ( virtual/x11 )
-	gpm? ( sys-libs/gpm )"
-
-PROVIDE="virtual/editor"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-LICENSE="GPL-2"
-
-src_compile() {
-	export JED_ROOT=/usr/share/jed
-
-	./configure	--host=${CHOST} \
-			--prefix=$JED_ROOT \
-			--bindir=/usr/bin \
-			--mandir=/usr/share/man
-	assert
-
-	if [ -n "`use gpm`" ] ; then
-		cd src
-		mv Makefile Makefile.orig
-		sed 	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
-			-e 's/#MOUSELIB/MOUSELIB/' \
-			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
-			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
-			Makefile.orig > Makefile
-		cd ${S}
-	fi
-
-	make clean || die
-
-	emake || die
-
-	if [ -n "`use X`" ] ; then
-		emake xjed || die
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	cd doc
-	cp README AUTHORS
-
-	cd ${S}
-	dodoc 	COPYING COPYRIGHT INSTALL INSTALL.unx README \
-		doc/AUTHORS doc/manual/jed.tex
-
-	cd ${S}/info
-	rm info.info
-	epatch ${FILESDIR}/jed.info.diff
-	cd ${S}
-
-	insinto /usr/share/info
-	doins info/*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	cd ${D}
-	rm -rf usr/share/jed/info
-	# can't rm usr/share/jed/doc -- used internally by jed/xjed
-}
-
-
diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild
new file mode 100644
index 000000000000..260da7da8cf8
--- /dev/null
+++ b/app-editors/jed/jed-0.99.16-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.1 2004/04/20 08:59:02 liquidx Exp $
+
+IUSE="X gpm truetype"
+
+P0=${PN}-0.99-16
+S=${WORKDIR}/${P0}
+DESCRIPTION="Console S-Lang-based editor"
+SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
+HOMEPAGE="http://www.jedsoft.org/jed/"
+
+DEPEND=">=sys-libs/slang-1.4.5
+	>=sys-apps/sed-4
+	X? ( virtual/x11 )
+	gpm? ( sys-libs/gpm )
+	X? ( truetype? ( virtual/xft
+		>=media-libs/freetype-2.0 ) )"
+
+PROVIDE="virtual/editor"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+LICENSE="GPL-2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
+}
+
+src_compile() {
+	export JED_ROOT=/usr/share/jed
+
+	./configure	--host=${CHOST} \
+		--prefix=$JED_ROOT \
+		--bindir=/usr/bin \
+		--mandir=/usr/share/man || die
+
+	if [ -n "`use gpm`" ] ; then
+		cd src
+		sed -i	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
+			-e 's/#MOUSELIB/MOUSELIB/' \
+			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
+			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
+			Makefile
+		cd ${S}
+	fi
+
+	if [ -n "`use X`" -a -n "`use truetype`" ]; then
+	   cd src
+	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
+	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
+	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h
+	   cd ${S}
+	fi
+
+	make clean || die
+
+	emake || die
+
+	if [ -n "`use X`" ] ; then
+		emake xjed || die
+	fi
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	cd doc
+	cp README AUTHORS
+
+	cd ${S}
+	dodoc 	COPYING COPYRIGHT INSTALL INSTALL.unx README \
+		doc/AUTHORS doc/manual/jed.tex
+
+	cd ${S}/info
+	rm info.info
+	patch < ${FILESDIR}/jed.info.diff || die
+	cd ${S}
+
+	insinto /usr/share/info
+	doins info/*
+
+	insinto /etc
+	doins lib/jed.conf
+
+	# replace IDE mode with EMACS mode
+	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' ${D}/etc/jed.conf || die "patching jed.conf failed"
+
+	cd ${D}
+	rm -rf usr/share/jed/info
+	# can't rm usr/share/jed/doc -- used internally by jed/xjed
+}
+
+
diff --git a/app-editors/jed/jed-0.99.16.ebuild b/app-editors/jed/jed-0.99.16.ebuild
deleted file mode 100644
index c71e61fa0721..000000000000
--- a/app-editors/jed/jed-0.99.16.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16.ebuild,v 1.8 2004/04/06 03:37:20 vapier Exp $
-
-inherit eutils
-
-P0=${PN}-0.99-16
-S=${WORKDIR}/${P0}
-DESCRIPTION="Console S-Lang-based editor"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-SRC_URI="ftp://ftp.jedsoft.org/pub/davis/jed/v0.99/${PN}-0.99-16.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="X gpm"
-
-DEPEND=">=sys-libs/slang-1.4.5
-	X? ( virtual/x11 )
-	gpm? ( sys-libs/gpm )"
-PROVIDE="virtual/editor"
-
-src_compile() {
-	export JED_ROOT=/usr/share/jed
-
-	./configure	\
-		--host=${CHOST} \
-		--prefix=$PJED_ROOT} \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man || die
-
-	if use gpm ; then
-		cd src
-		sed -i 	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
-			-e 's/#MOUSELIB/MOUSELIB/' \
-			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
-			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
-			Makefile
-		cd ${S}
-	fi
-
-	make clean || die
-
-	emake || die
-
-	if use X ; then
-		emake xjed || die
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	cd doc
-	cp README AUTHORS
-
-	cd ${S}
-	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
-
-	cd ${S}/info
-	rm info.info
-	epatch${FILESDIR}/jed.info.diff
-	cd ${S}
-
-	insinto /usr/share/info
-	doins info/*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	cd ${D}
-	rm -rf usr/share/jed/info
-	# can't rm usr/share/jed/doc -- used internally by jed/xjed
-}