Correct SRC_URI (#218353).

(Portage version: 2.1.4.4)

4 files changed, 27 insertions, 153 deletions

diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index ce5fc90b89b8..7e3fed63b9e8 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/minicom
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.63 2008/04/14 20:30:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.64 2008/04/20 02:39:26 mrness Exp $
+
+*minicom-2.3-r1 (20 Apr 2008)
+
+  20 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  files/minicom-2.3-gentoo-runscript.patch,
+  -files/minicom-2.3-one-off.patch, -minicom-2.3.ebuild,
+  +minicom-2.3-r1.ebuild:
+  Correct SRC_URI (#218353).
 
 *minicom-2.3 (14 Apr 2008)
 
diff --git a/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
index 7ef74b35d2b1..ff72db966b85 100644
--- a/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
+++ b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
@@ -1,6 +1,6 @@
-diff -Nru minicom-2.2.orig/extras/scriptdemo minicom-2.2/extras/scriptdemo
---- minicom-2.2.orig/extras/scriptdemo	2003-03-30 21:55:39.000000000 +0300
-+++ minicom-2.2/extras/scriptdemo	2008-04-14 23:05:48.000000000 +0300
+diff -ru minicom-2.3.orig/extras/scriptdemo minicom-2.3/extras/scriptdemo
+--- minicom-2.3.orig/extras/scriptdemo	2003-03-30 21:55:39.000000000 +0300
++++ minicom-2.3/extras/scriptdemo	2008-04-20 05:27:19.000000000 +0300
 @@ -1,5 +1,5 @@
  # A little demonstration of the possibilities of "runscript".
 -# This script can be executed by typing: "runscript scriptdemo".
@@ -8,9 +8,9 @@ diff -Nru minicom-2.2.orig/extras/scriptdemo minicom-2.2/extras/scriptdemo
  #
  # Adjust the stty's below to your system: BSD-like or SysV-like.
  # Linux ofcourse accepts both :-)
-diff -Nru minicom-2.2.orig/man/minicom.1 minicom-2.2/man/minicom.1
---- minicom-2.2.orig/man/minicom.1	2005-11-06 21:22:07.000000000 +0200
-+++ minicom-2.2/man/minicom.1	2008-04-14 23:05:48.000000000 +0300
+diff -ru minicom-2.3.orig/man/minicom.1 minicom-2.3/man/minicom.1
+--- minicom-2.3.orig/man/minicom.1	2008-02-24 12:22:43.000000000 +0200
++++ minicom-2.3/man/minicom.1	2008-04-20 05:27:19.000000000 +0300
 @@ -418,7 +418,7 @@
  .TP 0.5i
  .B D - Script program
@@ -20,22 +20,22 @@ diff -Nru minicom-2.2.orig/man/minicom.1 minicom-2.2/man/minicom.1
  /bin/sh or "expect") it is possible.  Stdin and stdout are connected
  to the modem, stderr to the screen.
  .RS 0.5i
-diff -Nru minicom-2.2.orig/man/runscript.1 minicom-2.2/man/runscript.1
---- minicom-2.2.orig/man/runscript.1	2003-10-31 17:39:01.000000000 +0200
-+++ minicom-2.2/man/runscript.1	2008-04-14 23:05:48.000000000 +0300
+diff -ru minicom-2.3.orig/man/runscript.1 minicom-2.3/man/runscript.1
+--- minicom-2.3.orig/man/runscript.1	2007-11-13 23:35:06.000000000 +0200
++++ minicom-2.3/man/runscript.1	2008-04-20 05:27:19.000000000 +0300
 @@ -5,7 +5,7 @@
  .\" for conditions under which this file may be redistributed.
- .TH RUNSCRIPT 1 "$Date: 2008/04/14 20:30:16 $" "User's Manual"
+ .TH RUNSCRIPT 1 "$Date: 2008/04/20 02:39:28 $" "User's Manual"
  .SH NAME
 -runscript \- script interpreter for minicom
 +/usr/bin/runscript \- script interpreter for minicom
  .SH SYNOPSIS
  .B runscript
  .RI "scriptname [logfile [homedir]]"
-diff -Nru minicom-2.2.orig/src/rwconf.c minicom-2.2/src/rwconf.c
---- minicom-2.2.orig/src/rwconf.c	2006-04-02 12:52:30.000000000 +0300
-+++ minicom-2.2/src/rwconf.c	2008-04-14 23:05:48.000000000 +0300
-@@ -114,7 +114,7 @@
+diff -ru minicom-2.3.orig/src/rwconf.c minicom-2.3/src/rwconf.c
+--- minicom-2.3.orig/src/rwconf.c	2007-10-10 23:18:20.000000000 +0300
++++ minicom-2.3/src/rwconf.c	2008-04-20 05:27:19.000000000 +0300
+@@ -118,7 +118,7 @@
    { N_("No"),		0,  "kermreal" },
    { "3",		0,   "colusage" },
    /* The script program */
@@ -44,7 +44,7 @@ diff -Nru minicom-2.2.orig/src/rwconf.c minicom-2.2/src/rwconf.c
    /* Modem parameters */
    { "~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M",   0,   "minit" },
    { "^M~ATZ^M~",	0,   "mreset" },
-@@ -242,7 +242,7 @@
+@@ -246,7 +246,7 @@
    int matched;
  
    if (conftype == CONFIG_GLOBAL)
diff --git a/net-dialup/minicom/files/minicom-2.3-one-off.patch b/net-dialup/minicom/files/minicom-2.3-one-off.patch
deleted file mode 100644
index 4e4c61b3e960..000000000000
--- a/net-dialup/minicom/files/minicom-2.3-one-off.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-menu display is wonkey
-
-http://alioth.debian.org/tracker/index.php?func=detail&aid=304061&group_id=30018&atid=100031
-
-diff -Nru minicom-2.2.orig/src/config.c minicom-2.2/src/config.c
---- minicom-2.2.orig/src/config.c	2006-04-02 12:52:30.000000000 +0300
-+++ minicom-2.2/src/config.c	2008-04-14 23:07:44.000000000 +0300
-@@ -936,7 +936,7 @@
-         else
-           sprintf(buf, "^%c           ", (c & 0x1f) + 'A' - 1);
-         psets(P_ESCAPE, buf);
--        wlocate(w, mbslen (command_key) + 1, 1);
-+        wlocate(w, mbslen (command_key) + 1, 0);
-         wputs(w, _(buf));
-         clr = 1;
-         alt_override = 0;
-@@ -960,7 +960,7 @@
-           psets(P_BACKSPACE, "BS");
-         else
-           psets(P_BACKSPACE, "DEL");
--        wlocate(w, mbslen (backspace_key) + 1, 2);
-+        wlocate(w, mbslen (backspace_key) + 1, 1);
-         wprintf(w, "%s ", P_BACKSPACE);
-         keyboard(KSETBS, P_BACKSPACE[0] == 'B' ? 8 : 127);
-         break;
-@@ -974,12 +974,12 @@
-           if (LINES > 24)
-             tempst = 0;
-         }
--        wlocate(w, mbslen (status_line) + 1, 3);
-+        wlocate(w, mbslen (status_line) + 1, 2);
-         wprintf(w, "%s ", _(P_STATLINE));
-         break;
-       case 'D':
-         psets(P_SOUND, yesno(P_SOUND[0] == 'N'));
--        wlocate(w, mbslen (alarm_sound) + 1, 4);
-+        wlocate(w, mbslen (alarm_sound) + 1, 3);
-         wprintf(w, "%s", _(P_SOUND));
-         break;
-       case 'E': /* fmg - letters cycle colors */
-@@ -988,7 +988,7 @@
-         else
-           mfcolor++;
-         psets(P_MFG, J_col[mfcolor]);
--        wlocate(w, mbslen (foreground_color_menu) + 1, 5);
-+        wlocate(w, mbslen (foreground_color_menu) + 1, 4);
-         wprintf(w, "%s   ", _(J_col[mfcolor]));
-         break;
-       case 'F': /* fmg - letters cycle colors */
-@@ -997,7 +997,7 @@
-         else
-           mbcolor++;
-         psets(P_MBG, J_col[mbcolor]);
--        wlocate(w, mbslen (background_color_menu) + 1, 6);
-+        wlocate(w, mbslen (background_color_menu) + 1, 5);
-         wprintf(w, "%s   ", _(J_col[mbcolor]));
-         break;
-       case 'G': /* fmg - letters cycle colors */
-@@ -1006,7 +1006,7 @@
-         else
-           tfcolor++;
-         psets(P_TFG, J_col[tfcolor]);
--        wlocate(w, mbslen (foreground_color_term) + 1, 7);
-+        wlocate(w, mbslen (foreground_color_term) + 1, 6);
-         wprintf(w, "%s   ", _(J_col[tfcolor]));
-         if (us)
-           vt_pinit(us, tfcolor, tbcolor);
-@@ -1017,7 +1017,7 @@
-         else
-           tbcolor++;
-         psets(P_TBG, J_col[tbcolor]);
--        wlocate(w, mbslen (background_color_term) + 1, 8);
-+        wlocate(w, mbslen (background_color_term) + 1, 7);
-         wprintf(w, "%s   ", _(J_col[tbcolor]));
-         if (us)
-           vt_pinit(us, tfcolor, tbcolor);
-@@ -1038,7 +1038,7 @@
-           show_status();
-         }
-         psets(P_SFG, J_col[sfcolor]);
--        wlocate(w, mbslen (foreground_color_stat) + 1, 9);
-+        wlocate(w, mbslen (foreground_color_stat) + 1, 8);
-         wprintf(w, "%s   ", _(J_col[sfcolor]));
-         break;
-       case 'J': /* fmg - letters cycle colors & redraw stat line */
-@@ -1057,11 +1057,11 @@
-           show_status();
-         }
-         psets(P_SBG, J_col[sbcolor]);
--        wlocate(w, mbslen (background_color_stat) + 1, 10);
-+        wlocate(w, mbslen (background_color_stat) + 1, 9);
-         wprintf(w, "%s   ", _(J_col[sbcolor]));
-         break;
-       case 'K': /* MARK updated 02/17/95 - Config history size */
--        pgets(w, mbslen (history_buffer_size) + 1, 11,
-+        pgets(w, mbslen (history_buffer_size) + 1, 10,
-               P_HISTSIZE, 5, 5);
- 
-         /* In case gibberish or a value was out of bounds, */
-@@ -1073,11 +1073,11 @@
-         else if (atoi(P_HISTSIZE) >= 5000)
-           strcpy(P_HISTSIZE,"5000");
- 
--        wlocate(w, mbslen (history_buffer_size) + 1, 11);
-+        wlocate(w, mbslen (history_buffer_size) + 1, 10);
-         wprintf(w, "%s     ", P_HISTSIZE);
-         break;
-       case 'L': /* fmg - get local macros storage file */
--        pgets(w, mbslen (macros_file) + 1, 12, P_MACROS, 64, 64);
-+        pgets(w, mbslen (macros_file) + 1, 11, P_MACROS, 64, 64);
- 
-         /* Try to open the file to read it in. */
-         fp = sfopen(pfix_home(P_MACROS), "r+");
-@@ -1105,12 +1105,12 @@
-         break;
-       case 'N':
-         psets(P_MACENAB, yesno(P_MACENAB[0] == 'N'));
--        wlocate(w, mbslen (macros_enabled) + 1, 14);
-+        wlocate(w, mbslen (macros_enabled) + 1, 13);
-         wprintf(w, "%s", _(P_MACENAB));
-         break;
-       case 'O': /* Character conversions - jl / 04.09.97 */
-         doconv();
--        wlocate(w, mbslen (character_conversion) + 1, 15);
-+        wlocate(w, mbslen (character_conversion) + 1, 14);
-         wprintf(w, "%-16.16s", _(P_CONVF));
-         break;
-       case 'P':
diff --git a/net-dialup/minicom/minicom-2.3.ebuild b/net-dialup/minicom/minicom-2.3-r1.ebuild
index b252dfd31df8..0249309ac7ba 100644
--- a/net-dialup/minicom/minicom-2.3.ebuild
+++ b/net-dialup/minicom/minicom-2.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3.ebuild,v 1.2 2008/04/15 01:54:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3-r1.ebuild,v 1.1 2008/04/20 02:39:26 mrness Exp $
 
 inherit eutils
 
-STUPID_NUM="1806"
+STUPID_NUM="2332"
 
 DESCRIPTION="Serial Communication Program"
 HOMEPAGE="http://alioth.debian.org/projects/minicom"
@@ -23,18 +23,12 @@ RDEPEND="${COMMON_DEPEND}
 
 # Supported languages and translated documentation
 # Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu ja no pl pt_BR ro ru rw sv vi zh_TW"
+MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu ja nb pl pt_BR ro ru rw sv vi zh_TW"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
-	epatch "${FILESDIR}"/${P}-one-off.patch
-
-	# remove these lines when upstream release a new version
-	mv ${PN}-2.2 ${P} || die "apparently version number has been corrected"
-	cd "${S}"
-	sed -i -e "s/2[.]2/2.3/" configure
 }
 
 src_compile() {