version bump; make /bin/sh the default shell

7 files changed, 18 insertions, 72 deletions

diff --git a/app-editors/nedit/ChangeLog b/app-editors/nedit/ChangeLog
index 3ef70f03bbdc..a2c24a056954 100644
--- a/app-editors/nedit/ChangeLog
+++ b/app-editors/nedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nedit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.31 2004/10/05 12:19:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.32 2004/10/23 21:41:48 lanius Exp $
+
+*nedit-5.5 (23 Oct 2004)
+
+  23 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -nedit-5.3-r2.ebuild,
+  -nedit-5.4_pre20030213.ebuild, +nedit-5.5.ebuild:
+  version bump; make /bin/sh the default shell
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> nedit-5.4.ebuild,
   nedit-5.4_pre20030213.ebuild:
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index f855c4423b9a..fe62e23460c4 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,8 +1,7 @@
-MD5 e1c51a45b93c4cc283cb95a881552915 ChangeLog 4569
-MD5 343dbe38eb0d616e147982c1a0a8020d nedit-5.3-r2.ebuild 1065
+MD5 884407ca64555494c782779687d2b273 nedit-5.5.ebuild 909
 MD5 271e2bcecfe9348e1393d0a1af150e2f nedit-5.4.ebuild 911
-MD5 ee150310bd8e9c5a0969da94da491049 nedit-5.4_pre20030213.ebuild 1081
-MD5 d67d5d17a4951126595fe2eb36897f15 files/digest-nedit-5.3-r2 68
-MD5 4223c3125634eaecc7bd7556581cc29b files/digest-nedit-5.4 69
-MD5 670415ebfa4cdbe202a201f5fabba73c files/digest-nedit-5.4_pre20030213 74
+MD5 e1c51a45b93c4cc283cb95a881552915 ChangeLog 4569
 MD5 f1de401822d203ac95aa0366234fb63a files/nedit-5.3-gentoo.diff 2629
+MD5 670415ebfa4cdbe202a201f5fabba73c files/digest-nedit-5.4_pre20030213 74
+MD5 4223c3125634eaecc7bd7556581cc29b files/digest-nedit-5.4 69
+MD5 6cf9b886dea4a5ed42e0a83603218a9d files/digest-nedit-5.5 67
diff --git a/app-editors/nedit/files/digest-nedit-5.3-r2 b/app-editors/nedit/files/digest-nedit-5.3-r2
deleted file mode 100644
index 8ad5b649f10d..000000000000
--- a/app-editors/nedit/files/digest-nedit-5.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47afb4e07698f45e95d49c27f3d2f9e1 nedit-5.3-source.tar.gz 991690
diff --git a/app-editors/nedit/files/digest-nedit-5.4_pre20030213 b/app-editors/nedit/files/digest-nedit-5.4_pre20030213
deleted file mode 100644
index d1030872f9ff..000000000000
--- a/app-editors/nedit/files/digest-nedit-5.4_pre20030213
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b31fd31d3ced0ae7deb095a5e369237 nedit-5.4_pre20030213.tar.gz 1173082
diff --git a/app-editors/nedit/files/digest-nedit-5.5 b/app-editors/nedit/files/digest-nedit-5.5
new file mode 100644
index 000000000000..02123be052a9
--- /dev/null
+++ b/app-editors/nedit/files/digest-nedit-5.5
@@ -0,0 +1 @@
+MD5 48cb3dce52d44988f3a4d7c6f47b6bbe nedit-5.5-src.tar.bz2 1124825
diff --git a/app-editors/nedit/nedit-5.4_pre20030213.ebuild b/app-editors/nedit/nedit-5.4_pre20030213.ebuild
deleted file mode 100644
index 365cb0da7d0f..000000000000
--- a/app-editors/nedit/nedit-5.4_pre20030213.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.4_pre20030213.ebuild,v 1.16 2004/10/05 12:19:43 pvdabeel Exp $
-
-inherit eutils gcc
-
-DESCRIPTION="multi-purpose text editor for the X Window System"
-HOMEPAGE="http://nedit.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~mips"
-IUSE="spell"
-
-RDEPEND="spell? ( virtual/aspell-dict )
-	virtual/x11"
-DEPEND="${RDEPEND}
-	dev-util/yacc
-	x11-libs/openmotif"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/nedit-5.3-gentoo.diff
-
-	sed -i "s:-O:${CFLAGS} -D__LINUX__:" \
-		${S}/makefiles/Makefile.linux
-}
-
-src_compile() {
-	make CC=$(gcc-getCC) linux || die
-}
-
-src_install() {
-	into /usr
-	dobin source/nedit
-	exeinto /usr/bin
-	newexe source/nc neditc
-	newman doc/nedit.man nedit.1
-	newman doc/nc.man neditc.1
-
-	dodoc README ReleaseNotes ChangeLog COPYRIGHT
-	cd doc
-	dodoc *.txt nedit.doc README.FAQ NEdit.ad
-	dohtml *.{dtd,xsl,xml,html,awk}
-}
diff --git a/app-editors/nedit/nedit-5.3-r2.ebuild b/app-editors/nedit/nedit-5.5.ebuild
index 45975c58bedb..79bd8194325e 100644
--- a/app-editors/nedit/nedit-5.3-r2.ebuild
+++ b/app-editors/nedit/nedit-5.5.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.3-r2.ebuild,v 1.15 2004/06/24 21:59:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5.ebuild,v 1.1 2004/10/23 21:41:48 lanius Exp $
 
-inherit eutils gcc
+inherit gcc
 
-MY_PV=${PV/./_}
 DESCRIPTION="multi-purpose text editor for the X Window System"
 HOMEPAGE="http://nedit.org/"
-SRC_URI="mirror://nedit/v${MY_PV}/${P}-source.tar.gz"
+SRC_URI="mirror://sourceforge/nedit/${P}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64 ~alpha"
 IUSE="spell"
 
 RDEPEND="spell? ( virtual/aspell-dict )
@@ -20,16 +19,8 @@ DEPEND="${RDEPEND}
 	dev-util/yacc
 	x11-libs/openmotif"
 
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	sed -i "s:-O:${CFLAGS} -D__LINUX__:" \
-	 ${S}/makefiles/Makefile.linux
-}
-
 src_compile() {
+	sed -i -e 's:"/bin/csh":"/bin/sh":' source/preferences.c
 	make CC=$(gcc-getCC) linux || die
 }