old

(Portage version: 2.1.2.2)

14 files changed, 2 insertions, 752 deletions

diff --git a/app-editors/nano/files/digest-nano-1.3.11-r2 b/app-editors/nano/files/digest-nano-1.3.11-r2
deleted file mode 100644
index 4134e437cf8b..000000000000
--- a/app-editors/nano/files/digest-nano-1.3.11-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ad6c2270fd674065ef994a58d3a8a7b7 nano-1.3.11.tar.gz 1172504
-RMD160 44156620181f5b968375c682b3713d869810f193 nano-1.3.11.tar.gz 1172504
-SHA256 5f8d718bf5274be6a3a7100ae6693b5001ad15f4b505f0ba670cc28f9b9fc798 nano-1.3.11.tar.gz 1172504
diff --git a/app-editors/nano/files/digest-nano-2.0.0 b/app-editors/nano/files/digest-nano-2.0.0
deleted file mode 100644
index 460e0f95c722..000000000000
--- a/app-editors/nano/files/digest-nano-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d1a8ac92b1985217f405a4c54562d8f3 nano-2.0.0.tar.gz 1298469
-RMD160 2de6bbc119ddc814a101b52dade3ab30309b7cf1 nano-2.0.0.tar.gz 1298469
-SHA256 c55a0f8aa7222d47bbfdf9772b5c94e0177c2de28cb9b3f73e69b9fd74a021ae nano-2.0.0.tar.gz 1298469
diff --git a/app-editors/nano/files/digest-nano-2.0.1 b/app-editors/nano/files/digest-nano-2.0.1
deleted file mode 100644
index d2664d8e8d28..000000000000
--- a/app-editors/nano/files/digest-nano-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8abe33be6816ad9acd17391806b42d92 nano-2.0.1.tar.gz 1299203
-RMD160 bce343f9f31c1cc63bd4b37a66fefcaa159a11cf nano-2.0.1.tar.gz 1299203
-SHA256 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2 nano-2.0.1.tar.gz 1299203
diff --git a/app-editors/nano/files/nano-1.3.10-crash.patch b/app-editors/nano/files/nano-1.3.10-crash.patch
deleted file mode 100644
index f0fdd856b6c7..000000000000
--- a/app-editors/nano/files/nano-1.3.10-crash.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-http://bugs.gentoo.org/111564
-http://lists.gnu.org/archive/html/nano-devel/2006-02/msg00006.html
-
-diff -ur nano-1.3.7/src/winio.c nano-1.3.7-fixed/src/winio.c
---- nano-1.3.7/src/winio.c	2005-04-10 23:51:22.000000000 -0400
-+++ nano-1.3.7-fixed/src/winio.c	2006-02-02 23:47:01.000000000 -0500
-@@ -2253,10 +2253,22 @@
- 
-     assert(column <= start_col);
- 
--    /* Allocate enough space for the entire line. */
--    alloc_len = (mb_cur_max() * (COLS + 1));
-+    /* Make sure there's enough room for the initial character, whether
-+     * it's a multibyte control character, a non-control multibyte
-+     * character, a tab character, or a null terminator.  Rationale:
-+     *
-+     * multibyte control character followed by a null terminator:
-+     *     1 byte ('^') + mb_cur_max() bytes + 1 byte ('\0')
-+     * multibyte non-control character followed by a null terminator:
-+     *     mb_cur_max() bytes + 1 byte ('\0')
-+     * tab character followed by a null terminator:
-+     *     mb_cur_max() bytes + (tabsize - 1) bytes + 1 byte ('\0')
-+     *
-+     * Since tabsize has a minimum value of 1, it can substitute for 1
-+     * byte above. */
-+    alloc_len = (mb_cur_max() + tabsize + 1) * 128;
-+    converted = charalloc(alloc_len);
- 
--    converted = charalloc(alloc_len + 1);
-     index = 0;
- 
-     if (buf[start_index] != '\t' && (column < start_col || (dollars &&
-@@ -2295,9 +2306,17 @@
- #endif
-     }
- 
--    while (index < alloc_len - 1 && buf[start_index] != '\0') {
-+    while (buf[start_index] != '\0') {
- 	buf_mb_len = parse_mbchar(buf + start_index, buf_mb, NULL);
- 
-+	/* Make sure there's enough room for the next character, whether
-+	 * it's a multibyte control character, a non-control multibyte
-+	 * character, a tab character, or a null terminator. */
-+	if (index + mb_cur_max() + tabsize + 1 >= alloc_len - 1) {
-+	    alloc_len += (mb_cur_max() + tabsize + 1) * 128;
-+	    converted = charealloc(converted, alloc_len);
-+	}
-+
- 	/* If buf contains a tab character, interpret it. */
- 	if (*buf_mb == '\t') {
- #if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
-@@ -2379,8 +2398,10 @@
- 	start_index += buf_mb_len;
-     }
- 
--    if (index < alloc_len - 1)
--	converted[index] = '\0';
-+    assert(alloc_len >= index + 1);
-+
-+    /* Null terminate converted. */
-+    converted[index] = '\0';
- 
-     /* Make sure converted takes up no more than len columns. */
-     index = actual_x(converted, len);
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.11-backupfix.patch b/app-editors/nano/files/nano-1.3.11-backupfix.patch
deleted file mode 100644
index 32dd74f0aac8..000000000000
--- a/app-editors/nano/files/nano-1.3.11-backupfix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ur nano-1.3.11/src/files.c nano-1.3.11-fixed/src/files.c
---- nano-1.3.11/src/files.c	2006-02-24 14:38:20.000000000 -0500
-+++ nano-1.3.11-fixed/src/files.c	2006-05-18 08:59:47.000000000 -0400
-@@ -1336,7 +1336,10 @@
- 		statusbar(_("Error reading %s: %s"), realname,
- 			strerror(errno));
- 		beep();
--		goto cleanup_and_exit;
-+		/* If we can't read from the original file, go on, since
-+		 * only saving the original file is better than saving
-+		 * nothing. */
-+		goto skip_backup;
- 	    }
- 	}
- 
-@@ -1375,8 +1378,10 @@
- 		    _("Too many backup files?"));
- 		free(backuptemp);
- 		free(backupname);
--		fclose(f);
--		goto cleanup_and_exit;
-+		/* If we can't write to the backup, go on, since only
-+		 * saving the original file is better than saving
-+		 * nothing. */
-+		goto skip_backup;
- 	    } else {
- 		free(backupname);
- 		backupname = backuptemp;
-@@ -1398,8 +1403,9 @@
- 	    free(backupname);
- 	    if (backup_file != NULL)
- 		fclose(backup_file);
--	    fclose(f);
--	    goto cleanup_and_exit;
-+	    /* If we can't write to the backup, go on, since only saving
-+	     * the original file is better than saving nothing. */
-+	    goto skip_backup;
- 	}
- 
- #ifdef DEBUG
-@@ -1414,7 +1420,6 @@
- 		openfile->current_stat->st_uid,
- 		openfile->current_stat->st_gid) == -1 ||
- 		utime(backupname, &filetime) == -1) {
--	    free(backupname);
- 	    if (copy_status == -1) {
- 		statusbar(_("Error reading %s: %s"), realname,
- 			strerror(errno));
-@@ -1422,11 +1427,15 @@
- 	    } else
- 		statusbar(_("Error writing %s: %s"), backupname,
- 			strerror(errno));
--	    goto cleanup_and_exit;
-+	    /* If we can't read from or write to the backup, go on,
-+	     * since only saving the original file is better than saving
-+	     * nothing. */
- 	}
- 
- 	free(backupname);
-     }
-+
-+  skip_backup:
- #endif /* !NANO_TINY */
- 
-     /* If NOFOLLOW_SYMLINKS is set and the file is a link, we aren't
-@@ -1454,6 +1463,17 @@
- 	int fd_source;
- 	FILE *f_source = NULL;
- 
-+	if (f == NULL) {
-+	    f = fopen(realname, "rb");
-+
-+	    if (f == NULL) {
-+		statusbar(_("Error reading %s: %s"), realname,
-+			strerror(errno));
-+		beep();
-+		goto cleanup_and_exit;
-+	    }
-+	}
-+
- 	tempname = safe_tempfile(&f);
- 
- 	if (tempname == NULL) {
diff --git a/app-editors/nano/files/nano-1.3.11-columnfix.patch b/app-editors/nano/files/nano-1.3.11-columnfix.patch
deleted file mode 100644
index ef49780e77d7..000000000000
--- a/app-editors/nano/files/nano-1.3.11-columnfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur nano-1.3.11/src/winio.c nano-1.3.11-fixed/src/winio.c
---- nano-1.3.11/src/winio.c	2006-03-29 20:18:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/winio.c	2006-05-19 14:08:24.000000000 -0400
-@@ -1857,7 +1857,12 @@
- 	    }
- 	}
- #ifdef ENABLE_UTF8
--	else if (ISSET(USE_UTF8) && mbwidth(buf_mb) > 1) {
-+	else if (ISSET(USE_UTF8) && mbwidth(buf_mb) == 2) {
-+	    if (column >= start_col) {
-+		converted[index++] = ' ';
-+		start_col++;
-+	    }
-+
- 	    converted[index++] = ' ';
- 	    start_col++;
- 
diff --git a/app-editors/nano/files/nano-1.3.11-parse.patch b/app-editors/nano/files/nano-1.3.11-parse.patch
deleted file mode 100644
index 0a70335f13cf..000000000000
--- a/app-editors/nano/files/nano-1.3.11-parse.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur nano-1.3.11/src/rcfile.c nano-1.3.11-fixed/src/rcfile.c
---- nano-1.3.11/src/rcfile.c	2006-01-06 17:04:38.000000000 -0500
-+++ nano-1.3.11-fixed/src/rcfile.c	2006-04-15 12:43:25.000000000 -0400
-@@ -275,7 +275,7 @@
- void parse_syntax(char *ptr)
- {
-     const char *fileregptr = NULL, *nameptr = NULL;
--    const syntaxtype *tmpsyntax;
-+    syntaxtype *tmpsyntax;
-     exttype *endext = NULL;
- 	/* The end of the extensions list for this syntax. */
- 
-@@ -300,11 +300,16 @@
-     if (ptr == NULL)
- 	return;
- 
-+    /* Search for a duplicate syntax name.  If we find one, free it, so
-+     * that we always use the last syntax with a given name. */
-     for (tmpsyntax = syntaxes; tmpsyntax != NULL;
- 	tmpsyntax = tmpsyntax->next) {
- 	if (strcmp(nameptr, tmpsyntax->desc) == 0) {
--	    rcfile_error(N_("Duplicate syntax name %s"), nameptr);
--	    return;
-+	    syntaxtype *prev_syntax = tmpsyntax;
-+
-+	    tmpsyntax = tmpsyntax->next;
-+	    free(prev_syntax);
-+	    break;
- 	}
-     }
- 
diff --git a/app-editors/nano/files/nano-1.3.11-regexfix.patch b/app-editors/nano/files/nano-1.3.11-regexfix.patch
deleted file mode 100644
index 4a4f6d4dc06b..000000000000
--- a/app-editors/nano/files/nano-1.3.11-regexfix.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -ur nano-1.3.11/src/winio.c nano-1.3.11-fixed/src/winio.c
---- nano-1.3.11/src/winio.c	2006-03-29 20:18:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/winio.c	2006-05-08 12:38:16.000000000 -0400
-@@ -2383,10 +2383,8 @@
- 				_("Refusing zero-length regex match"));
- 		    } else if (startmatch.rm_so < endpos &&
- 			startmatch.rm_eo > startpos) {
--			if (startmatch.rm_so <= startpos)
--			    x_start = 0;
--			else
--			    x_start = strnlenpt(fileptr->data,
-+			x_start = (startmatch.rm_so <= startpos) ? 0 :
-+				strnlenpt(fileptr->data,
- 				startmatch.rm_so) - start;
- 
- 			index = actual_x(converted, x_start);
-@@ -2430,129 +2428,135 @@
- 			goto step_two;
- 		    start_line = start_line->prev;
- 		}
--		/* No start found, so skip to the next step. */
--		if (start_line == NULL)
--		    goto step_two;
--		/* Now start_line is the first line before fileptr
--		 * containing a start match.  Is there a start on this
--		 * line not followed by an end on this line? */
--		start_col = 0;
--		while (TRUE) {
--		    start_col += startmatch.rm_so;
--		    startmatch.rm_eo -= startmatch.rm_so;
-- 		    if (regexec(tmpcolor->end, start_line->data +
--			start_col + startmatch.rm_eo, 0, NULL,
--			(start_col + startmatch.rm_eo == 0) ? 0 :
--			REG_NOTBOL) == REG_NOMATCH)
--			/* No end found after this start. */
--			break;
--		    start_col++;
--		    if (regexec(tmpcolor->start, start_line->data +
--			start_col, 1, &startmatch,
--			REG_NOTBOL) == REG_NOMATCH)
--			/* No later start on this line. */
-+		if (startmatch.rm_so == startmatch.rm_eo) {
-+		    startmatch.rm_eo++;
-+		    statusbar(_("Refusing zero-length regex match"));
-+		} else {
-+		    /* No start found, so skip to the next step. */
-+		    if (start_line == NULL)
- 			goto step_two;
--		}
--		/* Indeed, there is a start not followed on this line by
--		 * an end. */
-+		    /* Now start_line is the first line before fileptr
-+		     * containing a start match.  Is there a start on
-+		     * this line not followed by an end on this line? */
-+		    start_col = 0;
-+		    while (TRUE) {
-+			start_col += startmatch.rm_so;
-+			startmatch.rm_eo -= startmatch.rm_so;
-+			if (regexec(tmpcolor->end, start_line->data +
-+				start_col + startmatch.rm_eo, 0, NULL,
-+				(start_col + startmatch.rm_eo == 0) ?
-+				0 : REG_NOTBOL) == REG_NOMATCH)
-+			    /* No end found after this start. */
-+			    break;
-+			start_col++;
-+			if (regexec(tmpcolor->start, start_line->data +
-+				start_col, 1, &startmatch,
-+				REG_NOTBOL) == REG_NOMATCH)
-+			    /* No later start on this line. */
-+			    goto step_two;
-+		    }
-+		    /* Indeed, there is a start not followed on this
-+		     * line by an end. */
- 
--		/* We have already checked that there is no end before
--		 * fileptr and after the start.  Is there an end after
--		 * the start at all?  We don't paint unterminated
--		 * starts. */
--		end_line = fileptr;
--		while (end_line != NULL && regexec(tmpcolor->end,
-+		    /* We have already checked that there is no end
-+		     * before fileptr and after the start.  Is there an
-+		     * end after the start at all?  We don't paint
-+		     * unterminated starts. */
-+		    end_line = fileptr;
-+		    while (end_line != NULL && regexec(tmpcolor->end,
- 			end_line->data, 1, &endmatch, 0) == REG_NOMATCH)
--		    end_line = end_line->next;
-+			end_line = end_line->next;
- 
--		/* No end found, or it is too early. */
--		if (end_line == NULL || (end_line == fileptr &&
-+		    /* No end found, or it is too early. */
-+		    if (end_line == NULL || (end_line == fileptr &&
- 			endmatch.rm_eo <= startpos))
--		    goto step_two;
-+			goto step_two;
- 
--		/* Now paint the start of fileptr. */
--		if (end_line != fileptr)
--		    /* If the start of fileptr is on a different line
--		     * from the end, paintlen is -1, meaning that
--		     * everything on the line gets painted. */
--		    paintlen = -1;
--		else
--		    /* Otherwise, paintlen is the expanded location of
--		     * the end of the match minus the expanded location
--		     * of the beginning of the page. */
--		    paintlen = actual_x(converted,
--			strnlenpt(fileptr->data, endmatch.rm_eo) -
--			start);
-+		    /* Now paint the start of fileptr. */
-+		    if (end_line != fileptr)
-+			/* If the start of fileptr is on a different
-+			 * line from the end, paintlen is -1, meaning
-+			 * that everything on the line gets painted. */
-+			paintlen = -1;
-+		    else
-+			/* Otherwise, paintlen is the expanded location
-+			 * of the end of the match minus the expanded
-+			 * location of the beginning of the page. */
-+			paintlen = actual_x(converted,
-+				strnlenpt(fileptr->data,
-+				endmatch.rm_eo) - start);
- 
--		mvwaddnstr(edit, line, 0, converted, paintlen);
-+		    mvwaddnstr(edit, line, 0, converted, paintlen);
- 
-   step_two:
--		/* Second step, we look for starts on this line. */
--		start_col = 0;
-+		    /* Second step, we look for starts on this line. */
-+		    start_col = 0;
- 
--		while (start_col < endpos) {
--		    if (regexec(tmpcolor->start, fileptr->data +
--			start_col, 1, &startmatch, (start_col == 0) ?
--			0 : REG_NOTBOL) == REG_NOMATCH || start_col +
--			startmatch.rm_so >= endpos)
--			/* No more starts on this line. */
--			break;
--		    /* Translate the match to be relative to the
--		     * beginning of the line. */
--		    startmatch.rm_so += start_col;
--		    startmatch.rm_eo += start_col;
-+		    while (start_col < endpos) {
-+			if (regexec(tmpcolor->start, fileptr->data +
-+				start_col, 1, &startmatch, (start_col ==
-+				0) ? 0 : REG_NOTBOL) == REG_NOMATCH ||
-+				start_col + startmatch.rm_so >= endpos)
-+			    /* No more starts on this line. */
-+			    break;
-+			/* Translate the match to be relative to the
-+			 * beginning of the line. */
-+			startmatch.rm_so += start_col;
-+			startmatch.rm_eo += start_col;
- 
--		    if (startmatch.rm_so <= startpos)
--			x_start = 0;
--		    else
--			x_start = strnlenpt(fileptr->data,
-+			x_start = (startmatch.rm_so <= startpos) ? 0 :
-+				strnlenpt(fileptr->data,
- 				startmatch.rm_so) - start;
- 
--		    index = actual_x(converted, x_start);
-+			index = actual_x(converted, x_start);
- 
--		    if (regexec(tmpcolor->end, fileptr->data +
--			startmatch.rm_eo, 1, &endmatch,
--			(startmatch.rm_eo == 0) ? 0 : REG_NOTBOL) ==
--			0) {
--			/* Translate the end match to be relative to the
--			 * beginning of the line. */
--			endmatch.rm_so += startmatch.rm_eo;
--			endmatch.rm_eo += startmatch.rm_eo;
--			/* There is an end on this line.  But does it
--			 * appear on this page, and is the match more
--			 * than zero characters long? */
--			if (endmatch.rm_eo > startpos &&
-+			if (regexec(tmpcolor->end, fileptr->data +
-+				startmatch.rm_eo, 1, &endmatch,
-+				(startmatch.rm_eo == 0) ? 0 :
-+				REG_NOTBOL) == 0) {
-+			    /* Translate the end match to be relative to
-+			     * the beginning of the line. */
-+			    endmatch.rm_so += startmatch.rm_eo;
-+			    endmatch.rm_eo += startmatch.rm_eo;
-+			    /* There is an end on this line.  But does
-+			     * it appear on this page, and is the match
-+			     * more than zero characters long? */
-+			    if (endmatch.rm_eo > startpos &&
- 				endmatch.rm_eo > startmatch.rm_so) {
--			    paintlen = actual_x(converted + index,
--				strnlenpt(fileptr->data,
--				endmatch.rm_eo) - start - x_start);
--
--			    assert(0 <= x_start && x_start < COLS);
-+				paintlen = actual_x(converted + index,
-+					strnlenpt(fileptr->data,
-+					endmatch.rm_eo) - start -
-+					x_start);
-+
-+				assert(0 <= x_start && x_start < COLS);
-+
-+				mvwaddnstr(edit, line, x_start,
-+					converted + index, paintlen);
-+			    }
-+			} else {
-+			    /* There is no end on this line.  But we
-+			     * haven't yet looked for one on later
-+			     * lines. */
-+			    end_line = fileptr->next;
- 
--			    mvwaddnstr(edit, line, x_start, converted +
--				index, paintlen);
--			}
--		    } else {
--			/* There is no end on this line.  But we haven't
--			 * yet looked for one on later lines. */
--			end_line = fileptr->next;
--
--			while (end_line != NULL &&
-+			    while (end_line != NULL &&
- 				regexec(tmpcolor->end, end_line->data,
- 				0, NULL, 0) == REG_NOMATCH)
--			    end_line = end_line->next;
-+				end_line = end_line->next;
- 
--			if (end_line != NULL) {
--			    assert(0 <= x_start && x_start < COLS);
-+			    if (end_line != NULL) {
-+				assert(0 <= x_start && x_start < COLS);
- 
--			    mvwaddnstr(edit, line, x_start, converted +
--				index, -1);
--			    /* We painted to the end of the line, so
--			     * don't bother checking any more starts. */
--			    break;
-+				mvwaddnstr(edit, line, x_start,
-+					converted + index, -1);
-+				/* We painted to the end of the line, so
-+				 * don't bother checking any more
-+				 * starts. */
-+				break;
-+			    }
- 			}
-+			start_col = startmatch.rm_so + 1;
- 		    }
--		    start_col = startmatch.rm_so + 1;
- 		}
- 	    }
- 
diff --git a/app-editors/nano/files/nano-1.3.11-wrapfix.patch b/app-editors/nano/files/nano-1.3.11-wrapfix.patch
deleted file mode 100644
index 509d1afbfa7d..000000000000
--- a/app-editors/nano/files/nano-1.3.11-wrapfix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur nano-1.3.11/src/text.c nano-1.3.11-fixed/src/text.c
---- nano-1.3.11/src/text.c	2006-02-18 16:32:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/text.c	2006-05-18 13:51:50.000000000 -0400
-@@ -607,14 +607,14 @@
- 	 * found with short enough display width.  */
-     ssize_t cur_loc = 0;
- 	/* Current index in line. */
-+    size_t cur_pos = 0;
-+	/* Current column position in line. */
-     int line_len;
- 
-     assert(line != NULL);
- 
--    while (*line != '\0' && goal >= 0) {
--	size_t pos = 0;
--
--	line_len = parse_mbchar(line, NULL, &pos);
-+    while (*line != '\0' && goal >= cur_pos) {
-+	line_len = parse_mbchar(line, NULL, &cur_pos);
- 
- 	if (is_blank_mbchar(line)
- #ifndef DISABLE_HELP
-@@ -629,12 +629,11 @@
- #endif
- 	}
- 
--	goal -= pos;
- 	line += line_len;
- 	cur_loc += line_len;
-     }
- 
--    if (goal >= 0)
-+    if (goal >= cur_pos)
- 	/* In fact, the whole line displays shorter than goal. */
- 	return cur_loc;
- 
diff --git a/app-editors/nano/nano-1.3.11-r2.ebuild b/app-editors/nano/nano-1.3.11-r2.ebuild
deleted file mode 100644
index aa8c1aa155ac..000000000000
--- a/app-editors/nano/nano-1.3.11-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.11-r2.ebuild,v 1.12 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-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 ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="build debug justify minimal ncurses nls slang spell 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}"
-	# fixes from upstream, see mailing list
-	epatch "${FILESDIR}"/${P}-backupfix.patch
-	epatch "${FILESDIR}"/${P}-regexfix.patch
-	epatch "${FILESDIR}"/${P}-columnfix.patch
-	epatch "${FILESDIR}"/${P}-wrapfix.patch
-	epatch "${FILESDIR}"/${P}-parse.patch
-}
-
-src_compile() {
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die "autogen failed"
-	fi
-
-	local myconf=""
-	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) \
-		$(use_enable minimal tiny) \
-		${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() {
-	elog "More helpful info about nano, visit the GDP page:"
-	elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.0.ebuild b/app-editors/nano/nano-2.0.0.ebuild
deleted file mode 100644
index fd68c3d19803..000000000000
--- a/app-editors/nano/nano-2.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.0.ebuild,v 1.4 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-
-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/v${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell 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}"
-
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die "autogen failed"
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	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) \
-		$(use_enable minimal tiny) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-	dohtml *.html
-	insinto /etc
-	newins doc/nanorc.sample nanorc
-
-	insinto /usr/share/nano
-	doins "${FILESDIR}"/*.nanorc || die
-	echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
-	dodir /usr/bin
-	dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-	elog "More helpful info about nano, visit the GDP page:"
-	elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.1.ebuild b/app-editors/nano/nano-2.0.1.ebuild
deleted file mode 100644
index 9b60ef1fa0a4..000000000000
--- a/app-editors/nano/nano-2.0.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.1.ebuild,v 1.12 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-
-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/v${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell 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}"
-
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die "autogen failed"
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	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) \
-		$(use_enable minimal tiny) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-	dohtml *.html
-	insinto /etc
-	newins doc/nanorc.sample nanorc
-
-	insinto /usr/share/nano
-	doins "${FILESDIR}"/*.nanorc || die
-	echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
-	dodir /usr/bin
-	dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-	elog "More helpful info about nano, visit the GDP page:"
-	elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.3.ebuild b/app-editors/nano/nano-2.0.3.ebuild
index 4d24d2d3a931..3f670a3fdcbf 100644
--- a/app-editors/nano/nano-2.0.3.ebuild
+++ b/app-editors/nano/nano-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.3.ebuild,v 1.3 2007/03/10 22:26:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.3.ebuild,v 1.4 2007/03/10 22:28:22 vapier Exp $
 
 if [[ ${PV} == "9999" ]] ; then
 	ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
@@ -9,10 +9,10 @@ if [[ ${PV} == "9999" ]] ; then
 	ECVS_USER="anonymous"
 	inherit cvs
 else
+	MY_P=${PN}-${PV/_}
 	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
 fi
 
-MY_P=${PN}-${PV/_}
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
 HOMEPAGE="http://www.nano-editor.org/"