old

Package-Manager: portage-2.1_pre3-r1

12 files changed, 10 insertions, 345 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 5843c3a71c52..11ada7d32ddf 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,21 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 b8e8ebabee94510ea3d9378fe2c40f80 ChangeLog 10011
-MD5 c3684059e73752ce1f114e768ecbaa2b files/1.3.4-nanobrack.patch 557
-MD5 4cf6c77ed7c28d94c8de44d8318176c3 files/1.3.4-nomac.patch 511
 MD5 b075a7a5fe393380c5f00e4efd3146fb files/digest-nano-1.2.5 62
 MD5 12a38b1eed4e09bc09aa3e26f3d4886e files/digest-nano-1.3.10 64
-MD5 959e0d50769b5362d326d0d26809ff02 files/digest-nano-1.3.7 63
-MD5 a5c8733d0235f5a0958b395ad9f44611 files/digest-nano-1.3.8 63
 MD5 babc61f182cc2692e1c4f5689ea30f3e files/digest-nano-1.3.9 63
-MD5 4fd1c712601540686888c2f8e4927ab3 files/nano-1.3.10-disp.patch 659
-MD5 60ac26176596b3e131acc70a327fde01 files/nano-1.3.6-debug-typo.patch 415
-MD5 ebe8f2a4d216c558d080645929ad7176 files/nano-1.3.6-nomac.patch 883
-MD5 7da73db140725a63af026111d6bbc4ff files/nano-1.3.8-display.patch 2328
-MD5 186cedbceeaf68b6146eda881e9db05a files/nano-1.3.8-rep.patch 305
 MD5 e96987d3e608193dd5a2c0c0122571b5 files/nanorc-gentoo 1864
 MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
 MD5 b297797b490f7c6ca8d5f40f2d6347cc metadata.xml 1015
 MD5 32ad8dd2260ac44dbbeb2d50e2ed0df6 nano-1.2.5.ebuild 1429
 MD5 9221a1c204707554b4c05ad03d5042e6 nano-1.3.10.ebuild 1954
-MD5 042d14bbc6965489bd62af12f5943519 nano-1.3.7.ebuild 1742
-MD5 45fcb350931e56594b7bfcc19838f5c9 nano-1.3.8.ebuild 1880
 MD5 02ab1949e07d6f81c569e5fe3f607173 nano-1.3.9.ebuild 1863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDzs7I2+ySkm8kpY0RApXrAJ0UdLmwkmVjQ93PdMBo2ziJ9lFlEACglw83
+b6fSd5P9RmLjOureIzGwSOk=
+=GImV
+-----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/1.3.4-nanobrack.patch b/app-editors/nano/files/1.3.4-nanobrack.patch
deleted file mode 100644
index 606f0580bc04..000000000000
--- a/app-editors/nano/files/1.3.4-nanobrack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur nano-1.3.4/src/rcfile.c nano-1.3.4-fixed/src/rcfile.c
---- nano-1.3.4/src/rcfile.c	2004-08-18 05:31:26.000000000 +0200
-+++ nano-1.3.4-fixed/src/rcfile.c	2004-08-18 18:01:24.000000000 +0200
-@@ -611,9 +611,10 @@
- 			    else
- #endif
- 			    if (strcasecmp(rcopts[i].name, "tabsize") == 0) {
--				if (!parse_num(option, &tabsize) || tabsize <= 0)
-+				if (!parse_num(option, &tabsize) || tabsize <= 0) {
- 				    rcfile_error(N_("Requested tab size %s invalid"), option);
- 				    tabsize = -1;
-+				}
- 			    }
- 			} else
- 			    SET(rcopts[i].flag);
diff --git a/app-editors/nano/files/1.3.4-nomac.patch b/app-editors/nano/files/1.3.4-nomac.patch
deleted file mode 100644
index 99787f01a966..000000000000
--- a/app-editors/nano/files/1.3.4-nomac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/global.c.orig	2004-08-18 00:00:51.573889920 -0400
-+++ src/global.c	2004-08-18 00:00:54.842393032 -0400
-@@ -1043,8 +1043,6 @@
- 		N_("No conversion from DOS/Mac format"), NO_CONVERT);
- 	toggle_init_one(TOGGLE_DOS_KEY, N_("Writing file in DOS format"),
- 		DOS_FILE);
--	toggle_init_one(TOGGLE_MAC_KEY, N_("Writing file in Mac format"),
--		MAC_FILE);
- 	toggle_init_one(TOGGLE_BACKUP_KEY, N_("Backup files"), BACKUP_FILE);
-     }
-     toggle_init_one(TOGGLE_SMOOTH_KEY, N_("Smooth scrolling"), SMOOTHSCROLL);
diff --git a/app-editors/nano/files/digest-nano-1.3.7 b/app-editors/nano/files/digest-nano-1.3.7
deleted file mode 100644
index b89307b34aa4..000000000000
--- a/app-editors/nano/files/digest-nano-1.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d47badfae9f45174cf1ec69b742f961 nano-1.3.7.tar.gz 1008999
diff --git a/app-editors/nano/files/digest-nano-1.3.8 b/app-editors/nano/files/digest-nano-1.3.8
deleted file mode 100644
index 4d2955c73f81..000000000000
--- a/app-editors/nano/files/digest-nano-1.3.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20633397bf5d462255f37dfcc7cad4e7 nano-1.3.8.tar.gz 1064222
diff --git a/app-editors/nano/files/nano-1.3.10-disp.patch b/app-editors/nano/files/nano-1.3.10-disp.patch
deleted file mode 100644
index 01201c37fd3f..000000000000
--- a/app-editors/nano/files/nano-1.3.10-disp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00000.html
-http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00001.html
-
-diff -ur nano-1.3.10/src/winio.c nano-1.3.10-fixed/src/winio.c
---- nano-1.3.10/src/winio.c	2005-12-08 02:24:54.000000000 -0500
-+++ nano-1.3.10-fixed/src/winio.c	2006-01-10 03:10:14.000000000 -0500
-@@ -2772,6 +2772,11 @@
- 
- 	openfile->edittop = old_edittop;
- 
-+	/* Update old_current if we're not on the first page and/or
-+	 * we're not on the same page as before. */
-+	if (do_redraw)
-+	    update_line(old_current, 0);
-+
- 	/* Scroll the edit window up or down until edittop is in range
- 	 * of current. */
- 	if (nlines < 0)
diff --git a/app-editors/nano/files/nano-1.3.6-debug-typo.patch b/app-editors/nano/files/nano-1.3.6-debug-typo.patch
deleted file mode 100644
index 3d13327a55c1..000000000000
--- a/app-editors/nano/files/nano-1.3.6-debug-typo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix a simple typo when building with debug turned on.
-
-http://bugs.gentoo.org/show_bug.cgi?id=86339
-
---- src/chars.c
-+++ src/chars.c
-@@ -455,7 +455,7 @@
- {
-     size_t pos_prev = pos;
- 
--    assert(str != NULL && pos <= strlen(buf));
-+    assert(buf != NULL && pos <= strlen(buf));
- 
-     /* There is no library function to move backward one multibyte
-      * character.  Here is the naive, O(pos) way to do it. */
diff --git a/app-editors/nano/files/nano-1.3.6-nomac.patch b/app-editors/nano/files/nano-1.3.6-nomac.patch
deleted file mode 100644
index bfa4e05a1b02..000000000000
--- a/app-editors/nano/files/nano-1.3.6-nomac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/global.c.orig	2005-03-22 00:58:51.000000000 -0500
-+++ src/global.c	2005-03-22 00:59:09.000000000 -0500
-@@ -349,7 +349,6 @@
- #endif
- #ifndef NANO_SMALL
-     const char *nano_dos_msg = N_("Write file out in DOS format");
--    const char *nano_mac_msg = N_("Write file out in Mac format");
- #endif
-     const char *nano_append_msg = N_("Append to the current file");
-     const char *nano_prepend_msg = N_("Prepend to the current file");
-@@ -859,11 +858,6 @@
- 		IFHELP(nano_dos_msg, TOGGLE_DOS_KEY), NANO_NO_KEY,
- 		NANO_NO_KEY, NOVIEW, NULL);
- 
--    /* Translators: try to keep this string under 16 characters long */
--    if (!ISSET(RESTRICTED))
--	sc_init_one(&writefile_list, NANO_NO_KEY, N_("Mac Format"),
--		IFHELP(nano_mac_msg, TOGGLE_MAC_KEY), NANO_NO_KEY,
--		NANO_NO_KEY, NOVIEW, NULL);
- #endif
- 
-     /* Translators: try to keep this string under 16 characters long */
diff --git a/app-editors/nano/files/nano-1.3.8-display.patch b/app-editors/nano/files/nano-1.3.8-display.patch
deleted file mode 100644
index 2f3aacdc0634..000000000000
--- a/app-editors/nano/files/nano-1.3.8-display.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-http://lists.gnu.org/archive/html/nano-devel/2005-09/msg00012.html
-
---- nano-1.3.8/src/global.c
-+++ nano-1.3.8/src/global.c
-@@ -528,11 +528,11 @@
- 
-     sc_init_one(&main_list, NANO_FORWARD_KEY, N_("Forward"),
- 	IFHELP(nano_forward_msg, NANO_NO_KEY), NANO_NO_KEY,
--	NANO_NO_KEY, VIEW, do_right_void);
-+	NANO_NO_KEY, VIEW, do_right);
- 
-     sc_init_one(&main_list, NANO_BACK_KEY, N_("Back"),
- 	IFHELP(nano_back_msg, NANO_NO_KEY), NANO_NO_KEY,
--	NANO_NO_KEY, VIEW, do_left_void);
-+	NANO_NO_KEY, VIEW, do_left);
- 
-     sc_init_one(&main_list, NANO_HOME_KEY, N_("Home"),
- 	IFHELP(nano_home_msg, NANO_NO_KEY), NANO_NO_KEY,
---- nano-1.3.8/src/move.c
-+++ nano-1.3.8/src/move.c
-@@ -248,7 +248,7 @@
-     update_line(current, current_x);
- }
- 
--void do_left(bool allow_update)
-+void do_left(void)
- {
-     size_t pww_save = placewewant;
-     if (current_x > 0)
-@@ -259,16 +259,11 @@
-     }
-     placewewant = xplustabs();
-     check_statusblank();
--    if (allow_update && need_horizontal_update(pww_save))
-+    if (need_horizontal_update(pww_save))
- 	update_line(current, current_x);
- }
- 
--void do_left_void(void)
--{
--    do_left(TRUE);
--}
--
--void do_right(bool allow_update)
-+void do_right(void)
- {
-     size_t pww_save = placewewant;
-     assert(current_x <= strlen(current->data));
-@@ -281,11 +276,6 @@
-     }
-     placewewant = xplustabs();
-     check_statusblank();
--    if (allow_update && need_horizontal_update(pww_save))
-+    if (need_horizontal_update(pww_save))
- 	update_line(current, current_x);
- }
--
--void do_right_void(void)
--{
--    do_right(TRUE);
--}
---- nano-1.3.8/src/nano.c
-+++ nano-1.3.8/src/nano.c
-@@ -1304,7 +1304,7 @@
- void do_backspace(void)
- {
-     if (current != fileage || current_x > 0) {
--	do_left(FALSE);
-+	do_left();
- 	do_delete();
-     }
- }
-@@ -4093,7 +4093,7 @@
- 	    mark_beginx += char_buf_len;
- #endif
- 
--	do_right(FALSE);
-+	do_right();
- 
- #ifndef DISABLE_WRAPPING
- 	/* If we're wrapping text, we need to call edit_refresh(). */
---- nano-1.3.8/src/proto.h
-+++ nano-1.3.8/src/proto.h
-@@ -353,10 +353,8 @@
- void do_page_down(void);
- void do_up(void);
- void do_down(void);
--void do_left(bool allow_update);
--void do_left_void(void);
--void do_right(bool allow_update);
--void do_right_void(void);
-+void do_left(void);
-+void do_right(void);
- 
- /* Public functions in nano.c. */
- void print_view_warning(void);
diff --git a/app-editors/nano/files/nano-1.3.8-rep.patch b/app-editors/nano/files/nano-1.3.8-rep.patch
deleted file mode 100644
index 8bfd5520419a..000000000000
--- a/app-editors/nano/files/nano-1.3.8-rep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch from upstream.
---- nano-1.3.8/src/search.c
-+++ nano-1.3.8/src/search.c
-@@ -907,6 +907,8 @@
- 	last_search = mallocstrcpy(last_search, answer);
-     }
- 
-+    last_replace = mallocstrcpy(last_replace, "");
-+
-     i = statusq(FALSE, replace_list_2, last_replace,
- #ifndef NANO_SMALL
- 	&replace_history,
diff --git a/app-editors/nano/nano-1.3.7.ebuild b/app-editors/nano/nano-1.3.7.ebuild
deleted file mode 100644
index 3d3fde2c7027..000000000000
--- a/app-editors/nano/nano-1.3.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.7.ebuild,v 1.10 2005/09/15 02:02:03 kito Exp $
-
-inherit eutils
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="nls build spell justify debug slang ncurses nomac unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	nls? ( sys-devel/gettext )
-	!ncurses? ( slang? ( sys-libs/slang ) )"
-PROVIDE="virtual/editor"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use nomac && epatch "${FILESDIR}"/${PN}-1.3.6-nomac.patch
-}
-
-src_compile() {
-	local myconf=""
-	use build && myconf="${myconf} --disable-wrapping-as-root"
-	use ncurses || myconf="${myconf} $(use_with slang)"
-
-	econf \
-		--bindir=/bin \
-		--enable-color \
-		--enable-multibuffer \
-		--enable-nanorc \
-		$(use_enable spell) \
-		$(use_enable justify) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable unicode utf8) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	if use build ; then
-		rm -rf "${D}"/usr/share
-	else
-		cat "${FILESDIR}"/nanorc-* >> doc/nanorc.sample
-		dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-		dohtml *.html
-		insinto /etc
-		newins doc/nanorc.sample nanorc
-	fi
-
-	dodir /usr/bin
-	dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-	einfo "More helpful info about nano, visit the GDP page:"
-	einfo "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-1.3.8.ebuild b/app-editors/nano/nano-1.3.8.ebuild
deleted file mode 100644
index 668111700ed5..000000000000
--- a/app-editors/nano/nano-1.3.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.8.ebuild,v 1.5 2005/10/03 21:52:47 vapier Exp $
-
-inherit eutils
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build spell justify debug slang ncurses nomac unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	nls? ( sys-devel/gettext )
-	!ncurses? ( slang? ( sys-libs/slang ) )"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-rep.patch
-	epatch "${FILESDIR}"/${P}-display.patch
-	use nomac && epatch "${FILESDIR}"/${PN}-1.3.6-nomac.patch
-}
-
-src_compile() {
-	local myconf=""
-	use build && myconf="${myconf} --disable-wrapping-as-root"
-	use ncurses \
-		&& myconf="--without-slang" \
-		|| myconf="${myconf} $(use_with slang)"
-
-	econf \
-		--bindir=/bin \
-		--enable-color \
-		--enable-multibuffer \
-		--enable-nanorc \
-		--disable-wrapping-as-root \
-		$(use_enable spell) \
-		$(use_enable justify) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable unicode utf8) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	if use build ; then
-		rm -rf "${D}"/usr/share
-	else
-		cat "${FILESDIR}"/nanorc-* >> doc/nanorc.sample
-		dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-		dohtml *.html
-		insinto /etc
-		newins doc/nanorc.sample nanorc
-	fi
-
-	dodir /usr/bin
-	dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-	einfo "More helpful info about nano, visit the GDP page:"
-	einfo "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}