Update getline-rename.patch (#270452). Migrate to EAPI 2.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 42 insertions, 25 deletions

diff --git a/net-dialup/minicom/ChangeLog b/net-dialup/minicom/ChangeLog
index 730918d478ac..a1f334536328 100644
--- a/net-dialup/minicom/ChangeLog
+++ b/net-dialup/minicom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/minicom
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.68 2009/05/19 21:58:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/ChangeLog,v 1.69 2009/06/20 10:36:57 mrness Exp $
+
+*minicom-2.3-r2 (20 Jun 2009)
+
+  20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  files/minicom-2.3-getline-rename.patch, -minicom-2.3-r1.ebuild,
+  +minicom-2.3-r2.ebuild:
+  Update getline-rename.patch (#270452). Migrate to EAPI 2.
 
   19 May 2009; Markus Ullmann <jokey@gentoo.org> minicom-2.3-r1.ebuild,
   +files/minicom-2.3-getline-rename.patch:
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index cc88c727d33a..9360e4f25b6c 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,11 +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 2382 RMD160 962ce7c90ebf0afd835a8ee542a215b543c81516 SHA1 a1eb2b5e81e2a0b7a2ac248bae71e64322c91fcc SHA256 9d79ab8eb2942cdbde2b65ab7958b7c485c83428f31e5644f0f2af2c1d6bffb7
-AUX minicom-2.3-getline-rename.patch 3692 RMD160 5a384cb10e440c64c02be4cdd26ea6c318789714 SHA1 0c28f1eb5a74e8b7a43e60bf7cf324241865609b SHA256 a13c2b079ef8d9228a1e39074391d2ad1f2c6c70b02a529e842ec5d288ec40a8
+AUX minicom-2.3-getline-rename.patch 3761 RMD160 08cb8bb94662501372ea7bff365c75562510d659 SHA1 e6ae677d483f42a7f6187a7f2efda886c5cec805 SHA256 6dc394a4b6a246b9307f6db03097868c514b5583d271461317d52992b3443edf
 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 789162 RMD160 562995c04e6ff912d6bcab77b5007eac8950793a SHA1 407c4898a882f14639f30b394805382df0585b50 SHA256 2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb
 EBUILD minicom-2.2-r1.ebuild 1452 RMD160 70852b2d67c7370343f7589b71ee0857175572f2 SHA1 a8b3944eccb15f9b7922f30e673d5d73b074b44a SHA256 899da5b85e9c7b22ccb5f0a7812c88fcb9bcd7976152ef6b24b18d8b3e0bba80
-EBUILD minicom-2.3-r1.ebuild 1479 RMD160 0ade064da0abee7a9cfc7c7c08eb989f2484faf4 SHA1 344316c769b0cedc37f4856c467fafa4e2b1cac5 SHA256 4f101f65e85dce1db5d778cbe43457d709513aadc06dad39af719b384013ada8
-MISC ChangeLog 8626 RMD160 97ada216703f030b2b2d30490ea393a7e022a26f SHA1 b8d6997b7eccebd9290985229feee9cec8e77a90 SHA256 d5c472185fc094a110ac956b7ba6a8e803aff8f0d1e0e5717c8de4b4ef015ea4
+EBUILD minicom-2.3-r2.ebuild 1451 RMD160 b88879e5f04e141e8996c8f8bbd70e414927ced3 SHA1 28ace2660214f086ffed9c3741ccd8a64f64a3f4 SHA256 0d34f1ab5bca7ca3b9ec67d458dee1241ab3aea5b73bf82c6217aedd8bd9a936
+MISC ChangeLog 8859 RMD160 4e264db72d408e9f32edf66fb7a726464b86f765 SHA1 bf67da39d9f10a65fe9f1d3050f85d2b4e52e20f SHA256 ceccef6b0b884c80c5eb3d351bbe7a5aa7771efb58019a833aaf61c50445bffd
 MISC metadata.xml 347 RMD160 f6f4c9350a9198b25f9c9b71e23f5bce17affbf5 SHA1 6f640f41decae78a980f7d698a76a9a050ab3b1b SHA256 9e68a0adb4c54f783787ed3b7cd2d8dc56f6dc58d0998cc0ebcdcb263f4a1d82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko8u9cACgkQts85UDFmaOVyCgCffHsddZGXYElLhV6pnP+y/fx7
+mj8An06hjQA1q3lAF9V+ziTAMaI2PViY
+=MJNN
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/minicom/files/minicom-2.3-getline-rename.patch b/net-dialup/minicom/files/minicom-2.3-getline-rename.patch
index 5ea6c7622a9a..83196604df5c 100644
--- a/net-dialup/minicom/files/minicom-2.3-getline-rename.patch
+++ b/net-dialup/minicom/files/minicom-2.3-getline-rename.patch
@@ -1,11 +1,11 @@
 --- minicom-2.3.orig/src/minicom.c	2008-02-02 23:49:53.000000000 +0100
-+++ minicom-2.3/src/minicom.c	2009-05-19 22:09:13.121029740 +0200
++++ minicom-2.3/src/minicom.c	2009-06-08 09:42:32.151729441 +0200
 @@ -167,7 +167,7 @@
  #endif /*SIGTSTP*/
  
  /* Get a line from either window or scroll back buffer. */
 -static ELM *getline(WIN *w, int no)
-+static ELM *_getline(WIN *w, int no)
++static ELM *minic_getline(WIN *w, int no)
  {
    int i;
    static ELM outofrange[MAXCOLS] = {{0,0,0}};
@@ -14,7 +14,7 @@
    w->direct = 0;
    for (f = 0; f < w->ys; f++)
 -    mc_wdrawelm(w, f, getline(w, y++));
-+    mc_wdrawelm(w, f, _getline(w, y++));
++    mc_wdrawelm(w, f, minic_getline(w, y++));
    if (r)
      mc_wredraw(w, 1);
    w->direct = 1;
@@ -23,7 +23,7 @@
    w->direct = 0;
    for (f = 0; f < w->ys; f++) {
 -    tmp_e = getline(w, y++);
-+    tmp_e = _getline(w, y++);
++    tmp_e = minic_getline(w, y++);
  
      /* First we "accumulate" the line into a variable */
      mc_wdrawelm_var(w, tmp_e, tmp_line);
@@ -32,7 +32,7 @@
    for (next_line = hit_line; next_line <= all_lines; next_line++) {
      /* we do 'something' here... :-) */
 -    tmp_e = getline(w_hist, next_line);
-+    tmp_e = _getline(w_hist, next_line);
++    tmp_e = minic_getline(w_hist, next_line);
  
      /*
       * First we "accumulate" the line into a variable.
@@ -41,10 +41,10 @@
  {
    if (y+citey >= start && y+citey <= end)
 -    mc_wdrawelm_inverse(w, y, getline(w, y+citey));
-+    mc_wdrawelm_inverse(w, y, _getline(w, y+citey));
++    mc_wdrawelm_inverse(w, y, minic_getline(w, y+citey));
    else
 -    mc_wdrawelm(w, y, getline(w, y+citey));
-+    mc_wdrawelm(w, y, _getline(w, y+citey));
++    mc_wdrawelm(w, y, minic_getline(w, y+citey));
  }
  
  static void drawcite_whole(WIN *w, int y, int start, int end)
@@ -53,7 +53,7 @@
      vt_send('>');
      vt_send(' ');
 -    tmp_e = getline(w, y);
-+    tmp_e = _getline(w, y);
++    tmp_e = minic_getline(w, y);
      mc_wdrawelm_var(w, tmp_e, tmp_line);
      tmp_line[w->xs] = 0;
      for (x = w->xs-1; x >= 0; x--) {
@@ -62,7 +62,7 @@
            inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
          } else {
 -          tmp_e = getline(b_us, y);
-+          tmp_e = _getline(b_us, y);
++          tmp_e = minic_getline(b_us, y);
            if (wcslen(look_for) > 1) {
              /* quick scan for pattern match */
              mc_wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -71,10 +71,10 @@
  
          if (inverse)
 -          mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
-+          mc_wdrawelm_inverse(b_us, 0, _getline(b_us, y));
++          mc_wdrawelm_inverse(b_us, 0, minic_getline(b_us, y));
          else
 -          mc_wdrawelm(b_us, 0, getline(b_us, y));
-+          mc_wdrawelm(b_us, 0, _getline(b_us, y));
++          mc_wdrawelm(b_us, 0, minic_getline(b_us, y));
          if (citemode)
            mc_wlocate(b_us, 0, cite_y);
          mc_wflush();
@@ -83,7 +83,7 @@
            inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
          } else {
 -          tmp_e = getline(b_us, y + b_us->ys - 1);
-+          tmp_e = _getline(b_us, y + b_us->ys - 1);
++          tmp_e = minic_getline(b_us, y + b_us->ys - 1);
            if (wcslen(look_for) > 1) {
              /* quick scan for pattern match */
              mc_wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -92,11 +92,11 @@
          if (inverse)
            mc_wdrawelm_inverse(b_us, b_us->ys - 1,
 -                           getline(b_us, y + b_us->ys - 1));
-+                           _getline(b_us, y + b_us->ys - 1));
++                           minic_getline(b_us, y + b_us->ys - 1));
          else
            mc_wdrawelm(b_us, b_us->ys - 1,
 -                   getline(b_us, y + b_us->ys - 1));
-+                   _getline(b_us, y + b_us->ys - 1));
++                   minic_getline(b_us, y + b_us->ys - 1));
          if (citemode)
            mc_wlocate(b_us, 0, cite_y);
          mc_wflush();
@@ -105,7 +105,7 @@
          mc_wprintf(b_st, hline);
          mc_wredraw(b_st, 1);
 -        mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
-+        mc_wdrawelm_inverse(b_us, cite_y, _getline(b_us, cite_ystart));
++        mc_wdrawelm_inverse(b_us, cite_y, minic_getline(b_us, cite_ystart));
          mc_wlocate(b_us, 0, cite_y);
          break;
-       case K_ESC:
+       case K_ESC:
\ No newline at end of file
diff --git a/net-dialup/minicom/minicom-2.3-r1.ebuild b/net-dialup/minicom/minicom-2.3-r2.ebuild
index a6e1f15ed11a..3e4cd5bb2e46 100644
--- a/net-dialup/minicom/minicom-2.3-r1.ebuild
+++ b/net-dialup/minicom/minicom-2.3-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3-r1.ebuild,v 1.7 2009/05/19 21:58:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3-r2.ebuild,v 1.1 2009/06/20 10:36:57 mrness Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -26,19 +28,17 @@ RDEPEND="${COMMON_DEPEND}
 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}
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
 
 	#glibc name conflict
 	epatch "${FILESDIR}"/${P}-getline-rename.patch
 }
 
-src_compile() {
+src_configure() {
 	econf --sysconfdir=/etc/${PN} \
 		$(use_enable nls) \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {