Fix building against sys-libs/ncurses[tinfo] (bug #527570).

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

4 files changed, 43 insertions, 11 deletions

diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index 4a4eef1612c7..d22218459216 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/up-imapproxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.30 2014/08/10 20:47:04 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.31 2014/11/15 00:42:13 jer Exp $
+
+  15 Nov 2014; Jeroen Roovers <jer@gentoo.org>
+  +files/up-imapproxy-1.2.7-tinfo.patch, up-imapproxy-1.2.7.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #527570).
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> up-imapproxy-1.2.7.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index 812e34b4c282..22edf3966c4a 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -5,14 +5,15 @@ AUX imapproxy.initd 514 SHA256 8c64f726f44f80e655ad4bd1ff636acef3053f1a69516a1fc
 AUX imapproxyd.8 1984 SHA256 b1fcedc62f40664c6e820b2cc0e967d45aefa8334cc373dcf206bceba84beba2 SHA512 1368e4843fb026943beb0e547c679c319aa90a834792f856e6f06dd8a91e8142a8fe93a622b4289ed2cea21c12875e6fa37678b71297dfd24a9d2cd6cad52268 WHIRLPOOL e34a58b3c8c3a81d3bd8442b55fd6fda91976cbc11a508eef8a9374150438fcc5797316c3774e19869d6f21cd6fbcdb5cbd1f5fb94dc8fe1d516896aa3d4fc1c
 AUX pimpstat.8 836 SHA256 3bd8bb0ed654eda55123b5fc7e4b1a1bac4dfd822e59a91805cd5eab652e4cd8 SHA512 3fa58de9b9cdfaf4f9d3d04e5182ec1398e7d17fa505403266b16fa9ecf33736033b305a99addb81343450666b9f60afe8e905273ec4b8a34e8086fffb2aedcd WHIRLPOOL 3638d2d381a5733d120cd3ebee4ad76b450d76c0ae45408adb962aa9420ee47128cee4016c421dd31441ec7a10a8e9f3b1de9306969ed51775cd8a4ba6e7c2c9
 AUX up-imapproxy-1.2.7-ldflags.patch 521 SHA256 fb72b47b7c90c27fe07850a07cc51c2115c67b5973aa8b1f86419b4da3cd076a SHA512 56bed6cb49e0a7821ca40a9f73b586601f8e6c323266fb82065e3199df9d934fe4e60dfd386dbdf47b1fddeff9a678478d4f972fca715724aea801762dca0d45 WHIRLPOOL 8193c7397119de3c51158e312ec05f5ce680fc16c5c08a5df24f51bff409cb45731f2668271fdd7f16432d6d59e8f1ecc990e2c8ee2d938ba75a1cfdc8ff6ed6
+AUX up-imapproxy-1.2.7-tinfo.patch 555 SHA256 238dd2108d3e2067ead5ff4b82c07d0d700acde9eaf1ea85f03b1d2509bc9cbc SHA512 e4cd2a72337481d4060a091a4540f70997e79863ceb999b9ee64c03042b020718939caabed20706ecb4b876a0cce078559468946c5e29a7afbc185dca70f983a WHIRLPOOL 790e55eef5aa4236fa8c520b6e49600075ff0fd828f998bc09e835e80fc83b1fa333e96093b7ad66930e7b6f34637208489763e5786cf163eed48ba773ded6b1
 DIST squirrelmail-imap_proxy-1.2.7.tar.bz2 111651 SHA256 dd8ad40e3e457bd76fc9f19ef1c0d89911e3e3cc722415d1183f765dcac1ae48 SHA512 4b341fe5ea13241983c780ad2487ad5bd97136652b095f54ccf8f61d0f0818236d0d6e1005d46811cf3bd15896160fb172a40ae805ccc3ce7d6fc984099d2b2e WHIRLPOOL b0627781294cff742b189d802aa7e69ef6e60ffacefb800476f8dd28bbe973dc59c6e0b87d3fa1429ce06cf02b23c9fc9b6943ef9eaa7cb6f7f0ae8010a4a3e6
-EBUILD up-imapproxy-1.2.7.ebuild 1469 SHA256 bef31ed8b491e522ee350f082b0dfe7888f4d773e3df9e2e25a73dc7df34fd47 SHA512 bd590c65fc4e9633654b04931630c0682df2541ec7c0effbce78a4efcbff53e28b7b43bf7e7a6ed61bbc1c4cacf60e1d670f8da0d5be18cbfca6e8ced44f4c48 WHIRLPOOL 141d245bfe1d0b03766b199a2db897f6a660258bd137e85f1eab9c5c12f76676450a4079a85a6cdb5362d5196e58b081d7090592c6c8105337c92b3818b7b1be
-MISC ChangeLog 4484 SHA256 7c6ecc8d65cc1355c4ef4a810ea821a41a8c2a39b2102a086c4ac3fab60afbed SHA512 64ed6c6a1de8c57d97a625dda44bef9064bfa4f3f0eb48cb7a7943dbd56c3284c5971494dec8b3468eaa8daff890f5342d4c5ce7950e54a69f27c11bef69a7b2 WHIRLPOOL 576a53218191eb30bf5c6049d988084826c58f2146c6d122050231f4cb77fc34f5d86601a9d4c75fd7b77f6e41e24809d86b37d92ac8a2f546befbaa8e8dc58f
+EBUILD up-imapproxy-1.2.7.ebuild 1571 SHA256 e04f8397c4752ddb30f8a79a713ebbdb9c3df614db07011b19380c8a56525951 SHA512 2309be95660c3b2539b9e77c1c097e805fcd035385b443ccb0d4e5a61964205194f0d48341f3e0b49feca2ee3eb1e49858995c301d1e0e18d325596700f587f7 WHIRLPOOL cc4eab6b1748bea26d8f5f340ae35ab66ecad6dac9ee1a23696c2c096a8db7d444a9468b24caffee0f290f19f42f1634c49c0b79539960327ad2fcbd1db3501e
+MISC ChangeLog 4659 SHA256 958485c2bea5d5fccfbd05948992f450e5567648b747ff65109a5aa378b675fe SHA512 e41f082faf3aa863ef2c9deea73948b2ea3ed30eaf7d361dfac6a4055258374b132263c2936fca4939365ad2d7f3eed216e346f29f15dc98d09503369134f752 WHIRLPOOL 4aa60f27dfb0dc3363b07477f0b77c0b3c82b342046da8c745e641ed387b2f24c06deb8cd7f3682f0ca5ee430fd3f7677e6adf50e0743f16e21b1316d91bc134
 MISC metadata.xml 163 SHA256 38427b537ef2f561a685876ae3a7799382a1bf7fabef6c2d8765ca9d05056aa2 SHA512 4103bc8a7c46de8e432db9c5ac4004d8f06a3c2ef54a88c150fef940b9cef1a8101383187d7eb1ff3e143580b82335d86035601b8fd93009897ce27294e0ac9f WHIRLPOOL cf2262ca51f7450a69f95e79a0b78acf487eb6490275a82aa0a179556bd2ebdd11c5063984732369836e2816188aeecdb72db6f5fb46c6da706b91c82a4a2299
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2kkACgkQcaHudmEf86oaCACeIkmQrQziUjuTauwyRuGkmuWq
-LnIAn0P4qSBuyHxTMO9qlsg0sK0/RD+z
-=fyFA
+iEUEAREIAAYFAlRmoWYACgkQVWmRsqeSphOjzgCfeN/HmuQCM7mZzgsXn8bsAJ2u
+LgMAlRUXdSWT+l4JDMn+ihBgGzVVU/U=
+=d/5m
 -----END PGP SIGNATURE-----
diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
new file mode 100644
index 000000000000..cbe19e8c0eb7
--- /dev/null
+++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.7-tinfo.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -121,12 +121,16 @@
+ save_LIBS="$LIBS"
+ LIB_CURSES=""
+ AC_CHECK_LIB(curses, initscr, LIB_CURSES="-lcurses", [ curses_found=no ])
+-if test "$curses_found" == no; then
++if test "$curses_found" = no; then
+   AC_CHECK_LIB(ncurses, initscr, LIB_CURSES="-lncurses",
+  AC_ERROR([Can't compile without curses!!!]))
+ fi
+ 
+ LIBS="$save_LIBS"
++
++AC_SEARCH_LIBS(stdscr, tinfo curses ncurses, [LIB_CURSES="$LIB_CURSES $ac_cv_search_stdscr"],
++ AC_MSG_ERROR([Cannot find a library providing stdscr]))
++
+ AC_SUBST(LIB_CURSES)
+ 
+ 
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
index 08dca3e9f022..f60befc8b0a4 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild,v 1.4 2014/08/10 20:47:04 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild,v 1.5 2014/11/15 00:42:13 jer Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server"
 HOMEPAGE="http://www.imapproxy.org/"
@@ -26,8 +27,11 @@ S=${WORKDIR}/squirrelmail-imap_proxy-${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}"-ldflags.patch
-	sed -i -e 's:in\.imapproxyd:imapproxyd:g' \
-		README Makefile.in include/imapproxy.h || die "sed failed"
+	epatch "${FILESDIR}/${P}"-tinfo.patch
+
+	sed -i \
+		-e 's:in\.imapproxyd:imapproxyd:g' \
+		README Makefile.in include/imapproxy.h || die
 
 	#buffer oveflow
 	#http://lists.andrew.cmu.edu/pipermail/imapproxy-info/2010-June/000874.html
@@ -35,9 +39,12 @@ src_prepare() {
 		-e "/define BUFSIZE/s/4096/8192/" \
 		-e "/define MAXPASSWDLEN/s/64/8192/" \
 		include/imapproxy.h
+
+	eautoreconf
 }
 
 src_configure() {
+	tc-export CC
 	econf \
 		$(use_with kerberos krb5) \
 		$(use_with ssl openssl) \