Version bump (#215173).

Package-Manager: portage-2.1.4.4

5 files changed, 265 insertions, 3 deletions

diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index 7d1bac4ce026..ce5fc90b89b8 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/minicom
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.62 2007/12/27 09:12:16 mrness Exp $
+# 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 $
+
+*minicom-2.3 (14 Apr 2008)
+
+  14 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:
+  Version bump (#215173).
 
   27 Dec 2007; Alin Năstac <mrness@gentoo.org> minicom-2.2-r1.ebuild:
   Added nls support (#203225).
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index d25b5165c0b6..23185b7dbc1f 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX minicom-2.2-gentoo-runscript.patch 1800 RMD160 8a0557655bb0891056e63dd6a34eb94afe67f0df SHA1 5c7bb07bf5bdf0c8012d03580423ab94c344775b SHA256 c3c78abff17d4f994edcb4de0eb3f5da3aefc093d5e14eacdb68da95a9ef4b58
 AUX minicom-2.2-one-off.patch 4973 RMD160 cfff10e6537730f14e391bd94e52cb68f08c59f9 SHA1 7f24409e26d30a64b84ba4650fcfb376630958e6 SHA256 db6109a7be1551b1e3ee96af35e8bfd55b8d1dbf24236a220118e849b47dbefd
+AUX minicom-2.3-gentoo-runscript.patch 2386 RMD160 22e3aa82ea9ad4117fcc66015d686cff7a21552b SHA1 9caff11ef10245442c6478c84a25d3d4d162a99f SHA256 73e74b02e0192e2c7a8ddb9df99dd6807a7277937faece3069a42183264f9292
+AUX minicom-2.3-one-off.patch 4831 RMD160 47391456e5c7c458ae0a218c643b24e86c2cf372 SHA1 c28d7c57f894e7606207d889e846063ca287b7c4 SHA256 4e8074b42cd839fb4a8aa1d730946e7d8d96efb5356e690d10450a967ed383d4
 AUX minirc.dfl 66 RMD160 a2c022fc9eb61cf202a47110a9cf6744b8b69222 SHA1 650e923892ee800221711cffaf659a123a81a612 SHA256 d7a08c0a5befc155170b8e6009b028c0361e72da6c2c3f55e1858711eaaca5a0
 DIST minicom-2.2.tar.gz 720536 RMD160 2796e731078507160c466e952f3c9f6144b9c3f4 SHA1 75018c283f0d037d49a93fa077a186adde263569 SHA256 cc0406714ece77f5b1b1cb9e85e937531de556a72f962a3532c02da41b154d64
+DIST minicom-2.3.tar.gz 720536 RMD160 2796e731078507160c466e952f3c9f6144b9c3f4 SHA1 75018c283f0d037d49a93fa077a186adde263569 SHA256 cc0406714ece77f5b1b1cb9e85e937531de556a72f962a3532c02da41b154d64
 EBUILD minicom-2.2-r1.ebuild 1452 RMD160 472711c8f11e69549c41ced86cf2b947d84757b2 SHA1 26ccceb9cc99b67ccabd66873381653f87e1ea35 SHA256 3c77dd659932c2460c2ad17493c8c15b53b0a95fb8231f7580ae671b48f42c6b
-MISC ChangeLog 7684 RMD160 86213e5a4292e345673e2181878e82de0c497907 SHA1 598c86b7c1687865a2894dff3371f4c6a4fa5bcd SHA256 163dc21fef92acd7db442f2a7e7c31c4125e35b6ba22252f9e8d2f9f355d6996
+EBUILD minicom-2.3.ebuild 1628 RMD160 2ca2a5de0f2a98050e442d4c6dcabe87f404709b SHA1 e609f56303048bd25a2d7a9262b85eb7c10a4950 SHA256 46a2d2a2574d186f4ccc8acc65ca3fde40484ea1cdc62c8465a47f30204979b6
+MISC ChangeLog 7889 RMD160 f9bc114691e180839e8a83f6206a7c2704ca3ed8 SHA1 edc057515fae90a5118329e16df9219bf42b1289 SHA256 64caf2359505bc2c927ee3ec4b543ee7fc562f93b5ed0d5a1dff0d8645607f36
 MISC metadata.xml 347 RMD160 f6f4c9350a9198b25f9c9b71e23f5bce17affbf5 SHA1 6f640f41decae78a980f7d698a76a9a050ab3b1b SHA256 9e68a0adb4c54f783787ed3b7cd2d8dc56f6dc58d0998cc0ebcdcb263f4a1d82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIA77j+fWpoTWIA9ERAnRuAJ4uw6UKIpemulPwOzBg4EmJAb8htwCfTgyn
+Zhm+xp0RNSes3fO5KLprGCM=
+=8EmO
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
new file mode 100644
index 000000000000..7ef74b35d2b1
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch
@@ -0,0 +1,55 @@
+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
+@@ -1,5 +1,5 @@
+ # A little demonstration of the possibilities of "runscript".
+-# This script can be executed by typing: "runscript scriptdemo".
++# This script can be executed by typing: "/usr/bin/runscript 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
+@@ -418,7 +418,7 @@
+ .TP 0.5i
+ .B D - Script program
+ Which program to use as the script interpreter. Defaults to the
+-program "runscript", but if you want to use something else (eg,
++program "/usr/bin/runscript", but if you want to use something else (eg,
+ /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
+@@ -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"
+ .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 @@
+   { N_("No"),		0,  "kermreal" },
+   { "3",		0,   "colusage" },
+   /* The script program */
+-  { "runscript",	0,   "scriptprog" },
++  { "/usr/bin/runscript",	0,   "scriptprog" },
+   /* 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 @@
+   int matched;
+ 
+   if (conftype == CONFIG_GLOBAL)
+-    strcpy(P_SCRIPTPROG, "runscript");
++    strcpy(P_SCRIPTPROG, "/usr/bin/runscript");
+ 
+   line = malloc(line_size);
+   if (!line) {
diff --git a/net-dialup/minicom/files/minicom-2.3-one-off.patch b/net-dialup/minicom/files/minicom-2.3-one-off.patch
new file mode 100644
index 000000000000..4e4c61b3e960
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.3-one-off.patch
@@ -0,0 +1,128 @@
+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.ebuild
new file mode 100644
index 000000000000..302668980c0f
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.3.ebuild
@@ -0,0 +1,58 @@
+# 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.1 2008/04/14 20:30:15 mrness Exp $
+
+inherit eutils
+
+STUPID_NUM="1806"
+
+DESCRIPTION="Serial Communication Program"
+HOMEPAGE="http://alioth.debian.org/projects/minicom"
+SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls"
+
+COMM0N_DEPEND="sys-libs/ncurses"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}
+	net-dialup/lrzsz"
+
+# 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"
+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() {
+	econf --sysconfdir=/etc/${PN} \
+		$(use_enable nls) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "einstall failed"
+
+	dodoc AUTHORS ChangeLog NEWS README doc/minicom.FAQ
+	insinto /etc/minicom
+	doins "${FILESDIR}"/minirc.dfl
+}
+
+pkg_preinst() {
+	[[ -s ${ROOT}/etc/minicom/minirc.dfl ]] \
+		&& rm -f "${D}"/etc/minicom/minirc.dfl
+}