Fix building against sys-libs/ncurses[tinfo] (bug #457530). Clean up patches.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 34 insertions, 22 deletions

diff --git a/app-admin/logmon/ChangeLog b/app-admin/logmon/ChangeLog
index 392f98c1ad49..0bb0add3557d 100644
--- a/app-admin/logmon/ChangeLog
+++ b/app-admin/logmon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/logmon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logmon/ChangeLog,v 1.20 2014/11/26 18:29:45 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logmon/ChangeLog,v 1.21 2014/11/27 00:07:49 jer Exp $
+
+  27 Nov 2014; Jeroen Roovers <jer@gentoo.org> logmon-0.4.4-r1.ebuild,
+  files/logmon-0.4.4-char2int.diff, files/logmon-0.4.4-gcc43.patch,
+  files/logmon-0.4.4-maintainer-mode.patch, +files/logmon-0.4.4-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #457530). Clean up patches.
 
   26 Nov 2014; Sergey Popov <pinkbyte@gentoo.org> -logmon-0.4.4.ebuild,
   metadata.xml:
diff --git a/app-admin/logmon/Manifest b/app-admin/logmon/Manifest
index 15bdecbcd2e8..a282ea4f700b 100644
--- a/app-admin/logmon/Manifest
+++ b/app-admin/logmon/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX logmon-0.4.4-char2int.diff 202 SHA256 08e56bc2d854f0fc2e757affe40b57b9535ac0008a4d09d0a6acdc72855dfe2b SHA512 2ee511d8670e7c6910b048cc7598c19ec88617455e720f0ac4c9ba06e105031f47eccbd72a4d9f8f2da1feb000264a8a15173fd1b40a5644e98f4287397fc8c8 WHIRLPOOL 81ec52ac6c1e8d0d3cdc1c081946ef5d53d4bca4d1623185239876fd18d5f842e371fbb0fa4fb040e69f6658d3db620741199ca08c686d1813e5417433030ff7
-AUX logmon-0.4.4-gcc43.patch 378 SHA256 e1ceccf49285f12313171edf17224bcb6337c5214e028fe07b5ba9274485f392 SHA512 fe9181aafb6fee6f58132d8ca5f370df5bcd4c29170fcbb83799fb202924429d04028dd51142c1b7baef75ead89ca9a682adb0b49f4cbe9833f022dae4742b88 WHIRLPOOL b0c447911109cfe893a2bec8475c57913a7d0c95e8842ffe38642d56b16ac706a17c6dc99d607f987c50224cf67622ba01deeee653e23f9aeeaa56faa2de02e0
-AUX logmon-0.4.4-maintainer-mode.patch 451 SHA256 cd243237b5015c68ac9fc03dea7712f493822a16a7d3c36c2bcecb40d9c13efd SHA512 f3b195e02b40be538c67ee1d49156de63679176b00dbc45c055aa85b798600a1b503e6e6b1bbc03fe52ba1271892d5624bc570cf9c0db9e2abb8040ab069888a WHIRLPOOL f28744f86435e9fd5aa87556e1952ba20bf888e43270b71da29ab622b21cd6f405a97badf06fea884e1e49f47625db1a01db96878341889ff4ca294e939526df
+AUX logmon-0.4.4-char2int.diff 169 SHA256 6c549a9c88bf5839382f886b4afa360a70f22a426e43d84dfab18dec018950da SHA512 49e7c6564cda45c70007efab6a94f64d2b50dc157c535b1260c63d9e391e526bbf911850558ad9299c8422d6349bc0c25d9a30030d88b45dc3e8b644e6ec2e2e WHIRLPOOL 7bed4b9d5b15140f921b5be1b5aa0f2d0886842bfa06db5bbcba4542bfcaf91dda4ef5395337fa0d1fe318d5b45b5ac2ff45eaa86594ab44efd1c11617bd36ba
+AUX logmon-0.4.4-gcc43.patch 211 SHA256 2cfbf3d7ad00b2dd4b62f4b4a502d71b6aee1f1025609955d1c07d8c5dcb4bfd SHA512 8e5594fc769b1fe3807cc296e50dd2ae6f5035d60d6dc2faf586467d8693c1d7565f671025e2b588948abf27b2942d02f5afcdbeb02f4c60a3ce02f6acdfcd08 WHIRLPOOL d325715b59ce9420e4dd0eb35127433cceb4ca94d125c982fab0c0d0ec3dfb792d3d88ea93f2dc7de5c48da02dbae847d5671614ea273306e345c689de40af8b
+AUX logmon-0.4.4-maintainer-mode.patch 284 SHA256 9fe96d7da37a653b0585561b93c11074f4cd29f5638e6acb4353730c00455a62 SHA512 5720b1db0f9c449f02aee075cc677e83e0393b33ae990e6b88aa5d0b637b28d69d11b7813360f899510cf1a7d39b30d17117fccc1ceae2cf88aebb509eadb600 WHIRLPOOL 8e514bc4b94cbd31fd7f547e3c3d8ba8c6788ae0c114becb178be95b4b5ff12d8981529ce412bb69786016b2d62faf109d94ecf8cd5a9a132dc7375c84b91a47
+AUX logmon-0.4.4-tinfo.patch 247 SHA256 fff8f0cadcef25f19d1131981012aed19ddfe11ef293a898bc009d762f8a4b16 SHA512 3d11e8c19aff181a6886c6dd14cfe3956d1bc60c3919e9c1a1ce693111c407f9c631113386381c4391ccf4d81bdd6625fc255c7608c7f688880e22e84e9e1af7 WHIRLPOOL ef424bb0ce9c20c5131dee4303b2a6dc74bb9ee699c2be8ea0495c63ae6d34afd195833668b0ca5a5a19d00118bd68f3a68a3b24c3cc2abd94d8c6e3949d81d6
 DIST LogMon-0.4.4.tar.bz2 65975 SHA256 9b7192c651069cc7d98508b25841610b2cd7a318cbf3b1b55564ae6f0d5468f2 SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac WHIRLPOOL ffec8263e1559a22088bb228d075ee8919c577ef21267b2260eed96d43258a6e850be1194ae26727700f0dcaf88e8bc5017396a83748306f6a5956f1e4dd23d0
-EBUILD logmon-0.4.4-r1.ebuild 926 SHA256 d957cd897286a7d88fde8e0129d575bb5bcf198b6972705c6f7006e423e8ec02 SHA512 85ae02624847c7c059ec110c1126d78353f48f98f3c936e6e91bed55ab7d3d0614850b61974cddb182ad2dd8225de40febf6cc97a405825ee81c5f2980216889 WHIRLPOOL 8168b9cfedf69572e865d9201295ffff7148878c4fde8adfe131b0070a1674865b516f84aa49cd00a9d93c799c1c5d0caf4fffcb6f3777a365762f9ebc4e096f
-MISC ChangeLog 2832 SHA256 29153da4685256096224f4705f383dfe77c84ad0efe1bce33f55554bf12278dc SHA512 304204980af471272ccc7b149547b4291bd84d66ae5383f75aab9f88197f939d9eb188d65f098a479585797ef2200dd9c51e140ce244b31ceccfe35d98a1fd24 WHIRLPOOL 5a3390c5eeb1780cc4e2f70965859728960fbb0dab63a5a6a12c3b842d2c6b8353f1754c167a6cbe9001fa7adb36b2515bc7aaed0f13a54b1c08a37bb716ae01
+EBUILD logmon-0.4.4-r1.ebuild 961 SHA256 19375e093f2e263c135cda211c97768463ff98c291ca305d3b48088d2005b35e SHA512 39611298cf6ba7730925f944942df9a4d7d504f2d4deab2d5bfd711561b8b472b87dc31cdb3486e5bdbc7c019d095271779916a25f00e5e460e13627343775f5 WHIRLPOOL 41b0387ef87b82a7e38e4f012d66b02cfd244c1feb526c180798a69ded1ee6aa52fb2edec8c0c806aa201612556e3402c82df2881dba1d69c0be9deb7852ff23
+MISC ChangeLog 3124 SHA256 e77fe488e6642019dc35fa01f8c17ed9419ff133d0c78a6a646c583de87592ca SHA512 f4a43b341df5ca2761f3801b132a6e9906ea9b490d0de2a8b29deb9f62c5045d432f903347e96c426510f992e4d0f0aabf36f9f5ac68e7410cf8f871a5d55ce6 WHIRLPOOL d37fa33f224f41ad3313052bd7872d09cfa1045a92428a71e10d02624a1bbaf96a513cd7ae1d6c77e54f98ed25e199d28e07962c1251ae8db7c730818fb4a8fe
 MISC metadata.xml 322 SHA256 1e182dfdd8bdd4c7fef884fdd505850f08bda7fece2339dd6175c06cf344a92c SHA512 77b5a68ea908cd6a35aa085b9435d70b92f280903c44911f8e77f82afc2dd97772aa4813e27a876beae5422d942d146df1906fe12097dc0883cc112829409b1e WHIRLPOOL 3457d4974c005dfdd821894e02c71a0d841a765edc119b3bf6ae0b49aee3d0fd32b05e736d6c0e25e3fd902b8208fa4d468f5b23d3df8648fa3a0c2c1b402541
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUdhweAAoJECo/aRed9267wesH/2xxUuCQNda8yEmcB8kdIcOW
-vz5AFO6W6DwsHSqah3qxpvtbjZ9GO4HL8UjlDEMDLkX/SAm2JYMFtL9NxIFmERYB
-tzmIS6lU/qXNEoipFnuxJ/kVD9cKIpxMP+iZKmCaqmYdQuYqgpjfQQ52lFQbBt7h
-QnFF1+5MmZfw4jEwAsmAE/rBgykfsIVqOSQjRpoRmRBM85yP4Aahgz9Un7lMYObB
-YuKdykydlloA+41OOeF+d2mD+bU0XA440/qfZCFEH3+DSNsEe7fthQym5Lz9qhVa
-28DCSXvtylB5zBsKFNARLNmBgCy4onxrhppRf2xPaIQV8dN4vidjT1ceXPC3+9g=
-=1m7M
+iEYEAREIAAYFAlR2a1sACgkQVWmRsqeSphNRcACffHEBDFDlfkuOYZnJbG6TRYqN
+AAkAn3FDPxMC2UT1rddJpI4O6HtHiZeh
+=JXIT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logmon/files/logmon-0.4.4-char2int.diff b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
index f473cc44fbed..f460d182ed00 100644
--- a/app-admin/logmon/files/logmon-0.4.4-char2int.diff
+++ b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
@@ -1,5 +1,5 @@
---- Main.cc     (revision 80)
-+++ Main.cc     (working copy)
+--- a/Main.cc
++++ b/Main.cc
 @@ -264,7 +264,7 @@
  {
      (void) signal(SIGINT, sig_int);
diff --git a/app-admin/logmon/files/logmon-0.4.4-gcc43.patch b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
index 67a8a4b05d40..de58b5a35798 100644
--- a/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
+++ b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
@@ -1,6 +1,5 @@
-diff -NrU5 LogMon-0.4.4.orig/LineManip.cc LogMon-0.4.4/LineManip.cc
---- LogMon-0.4.4.orig/LineManip.cc	2008-12-18 23:07:40.000000000 +0100
-+++ LogMon-0.4.4/LineManip.cc	2008-12-18 23:08:14.000000000 +0100
+--- a/LineManip.cc
++++ b/LineManip.cc
 @@ -3,10 +3,11 @@
  // 
  
diff --git a/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
index 9753b52407b8..6f19ade7c9ad 100644
--- a/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
+++ b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
@@ -1,6 +1,5 @@
-diff -NrU5 LogMon-0.4.4.orig/configure.in LogMon-0.4.4/configure.in
---- LogMon-0.4.4.orig/configure.in	2008-12-18 23:07:40.000000000 +0100
-+++ LogMon-0.4.4/configure.in	2008-12-18 23:14:47.000000000 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -1,11 +1,11 @@
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(Main.cc)
diff --git a/app-admin/logmon/files/logmon-0.4.4-tinfo.patch b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
new file mode 100644
index 000000000000..4aa37b881ed2
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,6 +16,7 @@
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+ AC_CHECK_LIB(ncurses, initscr)
++AC_SEARCH_LIBS(halfdelay, tinfo)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild
index a6cf2256eb6a..d721164de658 100644
--- a/app-admin/logmon/logmon-0.4.4-r1.ebuild
+++ b/app-admin/logmon/logmon-0.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logmon/logmon-0.4.4-r1.ebuild,v 1.6 2014/07/31 11:02:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logmon/logmon-0.4.4-r1.ebuild,v 1.7 2014/11/27 00:07:49 jer Exp $
 
 EAPI="5"
 
@@ -30,6 +30,8 @@ src_prepare() {
 	# Fixes maintainer-mode detected.
 	epatch "${FILESDIR}"/${P}-maintainer-mode.patch
 
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
 	eautoreconf
 }