Version bump.

(Portage version: 2.1.2_rc1-r1)

5 files changed, 242 insertions, 2 deletions

diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index 9859461c6e51..3d2917c866ea 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/minicom
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.39 2006/07/08 23:28:01 kumba Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.40 2006/10/31 07:03:03 vapier Exp $
+
+*minicom-2.2 (31 Oct 2006)
+
+  31 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/minicom-2.2-gentoo-runscript.patch,
+  +files/minicom-2.2-one-off.patch, +minicom-2.2.ebuild:
+  Version bump.
 
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> minicom-2.1-r2.ebuild:
   Marked stable on mips.
diff --git a/net-dialup/minicom/files/digest-minicom-2.2 b/net-dialup/minicom/files/digest-minicom-2.2
new file mode 100644
index 000000000000..958a4ac5684f
--- /dev/null
+++ b/net-dialup/minicom/files/digest-minicom-2.2
@@ -0,0 +1,3 @@
+MD5 13933c8777839f00e3730df23599dc93 minicom-2.2.tar.gz 720536
+RMD160 2796e731078507160c466e952f3c9f6144b9c3f4 minicom-2.2.tar.gz 720536
+SHA256 cc0406714ece77f5b1b1cb9e85e937531de556a72f962a3532c02da41b154d64 minicom-2.2.tar.gz 720536
diff --git a/net-dialup/minicom/files/minicom-2.2-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.2-gentoo-runscript.patch
new file mode 100644
index 000000000000..8307baded857
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.2-gentoo-runscript.patch
@@ -0,0 +1,51 @@
+--- minicom-2.2/extras/scriptdemo
++++ minicom-2.2/extras/scriptdemo
+@@ -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 :-)
+--- minicom-2.2/man/minicom.1
++++ minicom-2.2/man/minicom.1
+@@ -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
+--- minicom-2.2/man/runscript.1
++++ minicom-2.2/man/runscript.1
+@@ -5,7 +5,7 @@
+ .\" for conditions under which this file may be redistributed.
+ .TH RUNSCRIPT 1 "$Date: 2006/10/31 07:03:03 $" "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]]"
+--- minicom-2.2/src/rwconf.c
++++ minicom-2.2/src/rwconf.c
+@@ -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.2-one-off.patch b/net-dialup/minicom/files/minicom-2.2-one-off.patch
new file mode 100644
index 000000000000..46159365be30
--- /dev/null
+++ b/net-dialup/minicom/files/minicom-2.2-one-off.patch
@@ -0,0 +1,127 @@
+menu display is wonkey
+
+http://alioth.debian.org/tracker/index.php?func=detail&aid=304061&group_id=30018&atid=100031
+
+--- src/config.c
++++ src/config.c
+@@ -936,7 +936,7 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+           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 @@ static void doscrkeyb(void)
+           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 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+           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 @@ static void doscrkeyb(void)
+           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 @@ static void doscrkeyb(void)
+         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 @@ static void doscrkeyb(void)
+         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.2.ebuild b/net-dialup/minicom/minicom-2.2.ebuild
new file mode 100644
index 000000000000..12dc08476ff9
--- /dev/null
+++ b/net-dialup/minicom/minicom-2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.2.ebuild,v 1.1 2006/10/31 07:03:03 vapier Exp $
+
+inherit eutils flag-o-matic
+
+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=""
+
+DEPEND=">=sys-libs/ncurses-5.2-r3"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
+	epatch "${FILESDIR}"/${P}-one-off.patch
+}
+
+src_compile() {
+	# avoid lazy binding (minicom is sgided)
+	append-ldflags $(bindnow-flags)
+	econf --sysconfdir=/etc/${PN} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "einstall failed"
+
+	# minicom must be uucp sgided is needed for being able to
+	# lock serial ports when run as simple user
+	fowners root:uucp /usr/bin/minicom
+	fperms g+s /usr/bin/minicom
+
+	dodoc AUTHORS ChangeLog NEWS README doc/minicom.FAQ
+	insinto /etc/minicom
+	doins "${FILESDIR}"/minirc.dfl
+}
+
+pkg_preinst() {
+	[[ -s /etc/minicom/minirc.dfl ]] \
+		&& rm -f "${D}"/etc/minicom/minirc.dfl
+}