Version bump. Tidied the ebuilds.

8 files changed, 142 insertions, 30 deletions

diff --git a/app-editors/ne/ChangeLog b/app-editors/ne/ChangeLog
index 21af747cf140..153450da1d24 100644
--- a/app-editors/ne/ChangeLog
+++ b/app-editors/ne/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/ne
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.6 2004/08/03 11:44:14 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.7 2004/08/22 13:37:42 swegener Exp $
+
+*ne-1.36 (22 Aug 2004)
+
+  22 Aug 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml,
+  +files/1.36-include-fix.patch, ne-1.19.ebuild, ne-1.35.ebuild,
+  +ne-1.36.ebuild:
+  Version bump. Tidied the ebuilds.
 
   03 Aug 2004; David Holm <dholm@gentoo.org> ne-1.35.ebuild:
   Added to ~ppc.
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index e977601e1f99..302ffc938cae 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,19 @@
-MD5 3627c3e1a9012889fb04d9f162afa3df ChangeLog 750
-MD5 978319e7c4d0b2d7e79bb45639ab3bbd ne-1.19.ebuild 964
-MD5 f3dd6aee13aa8e639604b0908d030a9d ne-1.35.ebuild 967
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb96058abd9ff3c96cc3a29860d52062 ne-1.19.ebuild 1115
+MD5 30e4ffee105d0dc639b15042c25b9366 ne-1.35.ebuild 1129
+MD5 026b721839e148074249a3649f4ed65b ne-1.36.ebuild 1240
+MD5 96c5a9a96b7414a4cc00bb34c82d807c metadata.xml 275
+MD5 dd62a3364e8a78359c305fd0cd40a49d ChangeLog 963
 MD5 b72ecc1000da0c86c6f4f90fbba340e2 files/digest-ne-1.19 59
 MD5 83ea9a543f92f36ba8b56fe1d393e431 files/digest-ne-1.35 60
+MD5 f42f170988b1e65d3614a7f8c8e1e3d8 files/1.36-include-fix.patch 825
+MD5 00fcc22f5e66eaa8d63653b147365adb files/digest-ne-1.36 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBKKG3I1lqEGTUzyQRAoCXAJ9i6VirOLIcM0EeTyuwW58q3QdzcQCgwPbh
+oWysdJJdQD1PQdweRrHBQyI=
+=lR9J
+-----END PGP SIGNATURE-----
diff --git a/app-editors/ne/files/1.36-include-fix.patch b/app-editors/ne/files/1.36-include-fix.patch
new file mode 100644
index 000000000000..c9822ff29f8e
--- /dev/null
+++ b/app-editors/ne/files/1.36-include-fix.patch
@@ -0,0 +1,33 @@
+--- ne-1.36/src/term.c	2004-08-22 15:13:30.837485144 +0200
++++ ne-1.36-include-fix/src/term.c	2004-08-22 15:13:35.912713592 +0200
+@@ -34,7 +34,7 @@
+ 
+ #ifndef TERMCAP
+ #include <curses.h>
+-#include <ncurses/term.h>
++#include <term.h>
+ #else
+ #include "info2cap.h"
+ #endif
+--- ne-1.36/src/cm.c	2004-08-22 15:15:54.931579512 +0200
++++ ne-1.36-include-fix/src/cm.c	2004-08-22 15:16:00.143787136 +0200
+@@ -28,7 +28,7 @@
+ 
+ #ifndef TERMCAP
+ #include <curses.h>
+-#include <ncurses/term.h>
++#include <term.h>
+ #else
+ #include "info2cap.h"
+ #endif
+--- ne-1.36/src/ne.h.orig	2004-08-22 15:18:03.876976832 +0200
++++ ne-1.36-include-fix/src/ne.h	2004-08-22 15:18:10.033040968 +0200
+@@ -23,7 +23,7 @@
+ 
+ #ifndef TERMCAP
+ #include <curses.h>
+-#include <ncurses/term.h>
++#include <term.h>
+ #else
+ #include <stdio.h>
+ #include "info2cap.h"
diff --git a/app-editors/ne/files/digest-ne-1.36 b/app-editors/ne/files/digest-ne-1.36
new file mode 100644
index 000000000000..d0f9383c03ef
--- /dev/null
+++ b/app-editors/ne/files/digest-ne-1.36
@@ -0,0 +1 @@
+MD5 35aa750fb30b7ab17382b984f7f3ca29 ne-1.36.tar.gz 1075135
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
new file mode 100644
index 000000000000..826a30416291
--- /dev/null
+++ b/app-editors/ne/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>swegener@gentoo.org</email>
+		<description>primary maintainer</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-editors/ne/ne-1.19.ebuild b/app-editors/ne/ne-1.19.ebuild
index 77c8dda90c6d..0afbe9ce155d 100644
--- a/app-editors/ne/ne-1.19.ebuild
+++ b/app-editors/ne/ne-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.19.ebuild,v 1.6 2004/06/24 21:59:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.19.ebuild,v 1.7 2004/08/22 13:37:42 swegener Exp $
 
 DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
 HOMEPAGE="http://ne.dsi.unimi.it/"
@@ -15,22 +15,23 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
 PROVIDE="virtual/editor"
 
 src_compile() {
-	if use ncurses ; then
-		emake -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die
+	if use ncurses
+	then
+		emake -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die "emake failed"
 	else
-		emake -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die
+		emake -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die "emake failed"
 	fi
 }
 
 src_install() {
-	gunzip doc/ne.info*gz
+	gunzip doc/ne.info*.gz || die "gunzip failed"
 
-	into /usr
-
-	dobin src/ne || die
-	doman doc/ne.1
-	doinfo doc/*.info*
-	dohtml doc/*.html
-	dodoc CHANGES README
-	dodoc doc/*.txt doc/*.ps doc/*.texinfo doc/default.*
+	dobin src/ne || die "dobin failed"
+	doman doc/ne.1 || die "doman failed"
+	doinfo doc/*.info* || die "doinfo failed"
+	dohtml doc/*.html || die "dohtml failed"
+	dodoc \
+		CHANGES README \
+		doc/*.txt doc/*.ps doc/*.texinfo doc/default.* \
+		|| die "dodoc failed"
 }
diff --git a/app-editors/ne/ne-1.35.ebuild b/app-editors/ne/ne-1.35.ebuild
index f11badc17a5f..c3923395270b 100644
--- a/app-editors/ne/ne-1.35.ebuild
+++ b/app-editors/ne/ne-1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.35.ebuild,v 1.2 2004/08/03 11:44:14 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.35.ebuild,v 1.3 2004/08/22 13:37:42 swegener Exp $
 
 DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
 HOMEPAGE="http://ne.dsi.unimi.it/"
@@ -15,22 +15,23 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
 PROVIDE="virtual/editor"
 
 src_compile() {
-	if use ncurses ; then
-		emake -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die
+	if use ncurses
+	then
+		emake -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die "emake failed"
 	else
-		emake -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die
+		emake -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die "emake failed"
 	fi
 }
 
 src_install() {
-	gunzip doc/ne.info*gz
+	gunzip doc/ne.info*.gz || die "gunzip failed"
 
-	into /usr
-
-	dobin src/ne || die
-	doman doc/ne.1
-	doinfo doc/*.info*
-	dohtml doc/*.html
-	dodoc CHANGES README
-	dodoc doc/*.txt doc/*.ps doc/*.texinfo doc/default.*
+	dobin src/ne || die "dobin failed"
+	doman doc/ne.1 || die "doman failed"
+	doinfo doc/*.info* || die "doinfo failed"
+	dohtml doc/*.html || die "dohtml failed"
+	dodoc \
+		CHANGES README
+		doc/*.txt doc/*.ps doc/*.pdf doc/*.texinfo doc/default.* \
+		|| die "dodoc failed"
 }
diff --git a/app-editors/ne/ne-1.36.ebuild b/app-editors/ne/ne-1.36.ebuild
new file mode 100644
index 000000000000..d67001da90cf
--- /dev/null
+++ b/app-editors/ne/ne-1.36.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.36.ebuild,v 1.1 2004/08/22 13:37:42 swegener Exp $
+
+inherit eutils
+
+DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="http://ne.dsi.unimi.it/"
+SRC_URI="http://ne.dsi.unimi.it/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
+PROVIDE="virtual/editor"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-include-fix.patch
+}
+
+src_compile() {
+	if use ncurses
+	then
+		emake -j1 -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die "emake failed"
+	else
+		emake -j1 -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die "emake failed"
+	fi
+}
+
+src_install() {
+	gunzip doc/ne.info*.gz || die "gunzip failed"
+
+	dobin src/ne || die "dobin failed"
+	doman doc/ne.1 || die "doman failed"
+	doinfo doc/*.info* || die "doinfo failed"
+	dohtml doc/*.html || die "dohtml failed"
+	dodoc \
+		CHANGES README \
+		doc/*.txt doc/*.ps doc/*.pdf doc/*.texinfo doc/default.* \
+		|| die "dodoc failed"
+}