Version bump.

Package-Manager: portage-2.1.2_rc1-r1

6 files changed, 265 insertions, 9 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/Manifest b/net-dialup/minicom/Manifest
index 96c2649e59e6..5064ae36b020 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -13,11 +13,20 @@ AUX minicom-2.1-memcpy-bounds.diff 487 RMD160 bfaaaec78a15a4063159c159682cabd3e7
 MD5 a31777cb2fefdf6dde761b58a8076333 files/minicom-2.1-memcpy-bounds.diff 487
 RMD160 bfaaaec78a15a4063159c159682cabd3e74e5d4f files/minicom-2.1-memcpy-bounds.diff 487
 SHA256 a7d202a3c83839ee1c5010cfb2f023547f37c28a820e0578c10c79eb12cd55ea files/minicom-2.1-memcpy-bounds.diff 487
+AUX minicom-2.2-gentoo-runscript.patch 1800 RMD160 8a0557655bb0891056e63dd6a34eb94afe67f0df SHA1 5c7bb07bf5bdf0c8012d03580423ab94c344775b SHA256 c3c78abff17d4f994edcb4de0eb3f5da3aefc093d5e14eacdb68da95a9ef4b58
+MD5 062b09d4e9c3d47d7eca3331e5a907cd files/minicom-2.2-gentoo-runscript.patch 1800
+RMD160 8a0557655bb0891056e63dd6a34eb94afe67f0df files/minicom-2.2-gentoo-runscript.patch 1800
+SHA256 c3c78abff17d4f994edcb4de0eb3f5da3aefc093d5e14eacdb68da95a9ef4b58 files/minicom-2.2-gentoo-runscript.patch 1800
+AUX minicom-2.2-one-off.patch 4973 RMD160 cfff10e6537730f14e391bd94e52cb68f08c59f9 SHA1 7f24409e26d30a64b84ba4650fcfb376630958e6 SHA256 db6109a7be1551b1e3ee96af35e8bfd55b8d1dbf24236a220118e849b47dbefd
+MD5 ea76d733a610b9ff619fbbd413ea750f files/minicom-2.2-one-off.patch 4973
+RMD160 cfff10e6537730f14e391bd94e52cb68f08c59f9 files/minicom-2.2-one-off.patch 4973
+SHA256 db6109a7be1551b1e3ee96af35e8bfd55b8d1dbf24236a220118e849b47dbefd files/minicom-2.2-one-off.patch 4973
 AUX minirc.dfl 66 RMD160 a2c022fc9eb61cf202a47110a9cf6744b8b69222 SHA1 650e923892ee800221711cffaf659a123a81a612 SHA256 d7a08c0a5befc155170b8e6009b028c0361e72da6c2c3f55e1858711eaaca5a0
 MD5 6362e781f7e7a1300d8a3c7b602ddd6f files/minirc.dfl 66
 RMD160 a2c022fc9eb61cf202a47110a9cf6744b8b69222 files/minirc.dfl 66
 SHA256 d7a08c0a5befc155170b8e6009b028c0361e72da6c2c3f55e1858711eaaca5a0 files/minirc.dfl 66
 DIST minicom-2.1.tar.gz 607939 RMD160 58121cf29991a92914acee855d6e86486c6d370d SHA1 720273f6ee8db5fb2da4379ac610a520a31aba70 SHA256 7f04535b3839fbbb0affa780108c32c330b924caf4e41dacd57dd23aa1fec392
+DIST minicom-2.2.tar.gz 720536 RMD160 2796e731078507160c466e952f3c9f6144b9c3f4 SHA1 75018c283f0d037d49a93fa077a186adde263569 SHA256 cc0406714ece77f5b1b1cb9e85e937531de556a72f962a3532c02da41b154d64
 EBUILD minicom-2.1-r1.ebuild 1159 RMD160 2e5caeea0d3032e3a7dbc964e7b0e3d25516146b SHA1 f82d69b67a84f6263038ba8d41b559b3987d35ea SHA256 7d8016dd3b4996cb25a8d34b427119893ac84a088cf9f2e2a74f0dc7dd5e8958
 MD5 9ee65fa1771556feb2c314a342a71f93 minicom-2.1-r1.ebuild 1159
 RMD160 2e5caeea0d3032e3a7dbc964e7b0e3d25516146b minicom-2.1-r1.ebuild 1159
@@ -26,10 +35,14 @@ EBUILD minicom-2.1-r2.ebuild 1471 RMD160 b72bbdb56bfc89a2b88c9aadf07907c4e497fe5
 MD5 4afb4e9e74596cf002a9a6c5a6bb31fc minicom-2.1-r2.ebuild 1471
 RMD160 b72bbdb56bfc89a2b88c9aadf07907c4e497fe56 minicom-2.1-r2.ebuild 1471
 SHA256 616c28c9c42c0ffcdece7713455d26fa588f82d8ddcc11a78248221952864413 minicom-2.1-r2.ebuild 1471
-MISC ChangeLog 4973 RMD160 2c50db11c323522dbf73ee3e526faa223099548c SHA1 758db173d8771ba6709b7501487036c3b2da0aaf SHA256 c611bed70b3e591bfaad030587a4272aee43c4ba11f5a8606fac6c9a4b2fc7ef
-MD5 9548c1dc473b6f901caffb193adab705 ChangeLog 4973
-RMD160 2c50db11c323522dbf73ee3e526faa223099548c ChangeLog 4973
-SHA256 c611bed70b3e591bfaad030587a4272aee43c4ba11f5a8606fac6c9a4b2fc7ef ChangeLog 4973
+EBUILD minicom-2.2.ebuild 1379 RMD160 7a0b60dbe13ce104e7834c8b15a66cd79e09aef2 SHA1 7b5ac3e320e3ca41d8985fe8968e498d3011ca33 SHA256 72fae221523f11257d07b47e37ed09f4873008abbfc9ffcad4b74f07afb14af2
+MD5 c8bde8e5d059dec74277ab2934ed2634 minicom-2.2.ebuild 1379
+RMD160 7a0b60dbe13ce104e7834c8b15a66cd79e09aef2 minicom-2.2.ebuild 1379
+SHA256 72fae221523f11257d07b47e37ed09f4873008abbfc9ffcad4b74f07afb14af2 minicom-2.2.ebuild 1379
+MISC ChangeLog 5171 RMD160 a11d81a6e90ef069661982a130e4370d2dcca9b3 SHA1 73ff763a6dddb4f4b5582e1fd34f86a0e036487a SHA256 22fd8c524840f2cafa43ff16ab7ee87d45f58904bd547839b05cc21221f7961a
+MD5 dedb76c2407292b4a06260e3a4c54040 ChangeLog 5171
+RMD160 a11d81a6e90ef069661982a130e4370d2dcca9b3 ChangeLog 5171
+SHA256 22fd8c524840f2cafa43ff16ab7ee87d45f58904bd547839b05cc21221f7961a ChangeLog 5171
 MISC metadata.xml 347 RMD160 f6f4c9350a9198b25f9c9b71e23f5bce17affbf5 SHA1 6f640f41decae78a980f7d698a76a9a050ab3b1b SHA256 9e68a0adb4c54f783787ed3b7cd2d8dc56f6dc58d0998cc0ebcdcb263f4a1d82
 MD5 75998ea6a61555c5bd7b815c0729e827 metadata.xml 347
 RMD160 f6f4c9350a9198b25f9c9b71e23f5bce17affbf5 metadata.xml 347
@@ -40,10 +53,13 @@ SHA256 60c01ee5b3a573afa675920c970e1b173de7284a56c208e632f4a74b62862ad8 files/di
 MD5 9337d3ae0f7451fecd883278139faf0b files/digest-minicom-2.1-r2 235
 RMD160 c1b4dcac4c983dc30e2936e0aff7fdf85d80cbda files/digest-minicom-2.1-r2 235
 SHA256 60c01ee5b3a573afa675920c970e1b173de7284a56c208e632f4a74b62862ad8 files/digest-minicom-2.1-r2 235
+MD5 61837fd7bb5ad9c7f86d43b611cb39fc files/digest-minicom-2.2 235
+RMD160 a68bad12e59efda71ce449148e8297207981311c files/digest-minicom-2.2 235
+SHA256 82e6079cb0c5d82f3cee624e238286e8ae12ae5f4d96292cd508669b02e2c99b files/digest-minicom-2.2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDGhPamhnQswr0vIRAlyIAKCmTi69cVdO4ZX4Ra7/LVf7cytPVQCfWLjr
-2z7hlKC7LYMx5rRn2s4eWWY=
-=0l0Y
+iD8DBQFFRvU3amhnQswr0vIRAhN4AJ4tc0ggr+ldMD1RRe7AjIDEAmvvTQCdHqAs
+fWffUjNgsfIlj09DekgDeuY=
+=CZhu
 -----END PGP SIGNATURE-----
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
+}