Fix building against sys-libs/ncurses[tinfo] (bug #529804). Remove unneeded IUSE linguas.

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

4 files changed, 43 insertions, 17 deletions

diff --git a/app-office/calcurse/ChangeLog b/app-office/calcurse/ChangeLog
index 154bd9144160..793b87845dc5 100644
--- a/app-office/calcurse/ChangeLog
+++ b/app-office/calcurse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calcurse
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/ChangeLog,v 1.37 2013/07/04 15:04:20 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/ChangeLog,v 1.38 2014/11/23 09:17:04 jer Exp $
+
+  23 Nov 2014; Jeroen Roovers <jer@gentoo.org>
+  +files/calcurse-3.1.4-tinfo.patch, calcurse-3.1.4.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #529804). Remove unneeded
+  IUSE linguas.
 
   04 Jul 2013; Michael Palimaka <kensington@gentoo.org> -calcurse-3.1.1.ebuild,
   -calcurse-3.1.2.ebuild, -calcurse-3.1.3.ebuild:
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 552b9fbec10f..f6f9d3b3b379 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX calcurse-3.1.4-tinfo.patch 644 SHA256 4ea4d2014cbf8f818fcb70d43ad903af0d2163a48c8852d09f312fb663a3904b SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f WHIRLPOOL 8096f364ff1fab4d01d92ce9c9edb0632c63dbab11c2dc69b477a60b2f6591a0224ac7a26af46df871341562ca78638b6c15852023449512c3cddfc288dc10ed
 DIST calcurse-3.1.4.tar.gz 684526 SHA256 4121b3b14ded3583af7613a99646332701ee2ccc8cf2b87397eb3c07b97390e3 SHA512 efdb655f96a176ca45a23a6246987735413a69046e5273efafffd5d2087f880969f84e387dd84672dacc8fae670a86ee7b132f6a4662e072ba92121492fd7ca7 WHIRLPOOL cc0802f6128068419de98524fcd984cf3213ca7f7f2cc003b122c808aed858230a87f387682368379329d0205bb42a55d232e5cf82f639535ffdda8ab51d9fa7
-EBUILD calcurse-3.1.4.ebuild 586 SHA256 8eb0c3f38daf7d39c4f8bb0eba114bd71ecae0221c05dc8ecc812ba7110cf716 SHA512 e18f8fefabb096354fa11b27e12e35cb3af10acb06ee029662a8c0f192412cdf55eb079196f50ecfec16a067107c06ec49a392fb5df2d10dcf5eb05e28c0d8a3 WHIRLPOOL ab923594fe8a97fb3997749db0401f409e2c7487b763600144185cfb3cb5c8817e585cd16cbf4447ec53ea7b9e035e495985c4582a0f2eb2ade93164fa667a0d
-MISC ChangeLog 4821 SHA256 8b7150e6438f8558eb831f41112e626f54446219a656d58d29403be674bfb4ce SHA512 acf94b4b5a26166cd77b1fcb2eb4efbc3656a5e9ac939da460315073da86126d5b05d8c542569080ff37c8b3f558c9b68b5c8dc5f6a3a6c208cce85d9543fe9d WHIRLPOOL 0de930db7cb17c33cf035982129152fcca60893cd8f7e0702e35eccdb81ff1c7bec917895712bdf18720ba95f83ec103879fc2409a9cdb742bd3aa5f25bf65a6
+EBUILD calcurse-3.1.4.ebuild 598 SHA256 49e48424f1ad1c43192f76342bf4d5a4113943cbcd4d6378d5a327097ccd2c40 SHA512 b2823e5eb755547727c6bb4ced2302b68149fb3e95a5b6270a146e0629675f3b63d9008f53f9599dce7ba9000ebd7a3da26fb47285f6dae473850c5e6f89994c WHIRLPOOL 21f286ed7394bf34f6bfcd8ac9ad9da4b754e035c10146733e423a04490b721b4b088e12e60386a226c06d1a84bd249e4479ffeceae47fbb42fbbb403ca31f91
+MISC ChangeLog 5016 SHA256 226bfaac1e1e9e35d90fcfe56acdae69cd05ab7c904f92bb9bdfd4ba216ba5e4 SHA512 e5451e25361fa2c57d4ef9b2ab4c10d98ddd8da8102d530c09559db7f970d9e13e7d3b96e5d41cb0ab70730cee7baee21b3fe1b85336c1ca661397b1dbc8233a WHIRLPOOL f1614263d92bc449283193663ac9a177ff009f2c2baad9081cec8625c507b9391ab5c026d12978dd209fd04ad69233a8fc06d8775e3acd1d58073c59e13a09be
 MISC metadata.xml 587 SHA256 8ccc3bd9e11e0f8f140c968c46464a0141e546d021a44853276029b09adc03db SHA512 4c68d1cbadc28060b16339f89999571d13735b53e7dbf6967e19a4d400366a2c195d0eff6cbdd9589411d0546957de05674b410800c33ec14db003291c62c3e1 WHIRLPOOL 34b5349f58369c8ca53554ff34ef08b538a3c9d9a707c90168f8beb3692e8e93a0d1758b154777f30fdf9986f1a605d681342a990176aabf9123bf31c9801373
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR1Y6WAAoJEMbwO6tnXQ0s/X0H+gPaE8217vKAVxFP/TLatNQY
-bljrGcsbgFW9RNwt8NuKEwl3SYVkKtJXj7DYbJ985elQelyptt/+DYLUkPX790vi
-fpokmSPwe9C74pO0t4pKnnMRPgqd5RQwmiC2eL3grsgtrddx9ZAqM3fkOqzAXT6A
-bePJDPp6qDKnAEPUPszrOjjZC6r5VgvaAUhTmGWs+p6Qb2qi9Ll7Cu7BYpH8bOB+
-jONAF+TQN0SQFmEkKbFIPhVuDW6ZSCy+mVpElRX6dsYlWEgKXeJ1OX19N93uukiu
-z3LHlX4qKHXPODV5xUTNEsHHWxbntlIkyib+zZfpgIh0j4i1NFPqo2woQlqUMPU=
-=9441
+iEYEAREIAAYFAlRxphEACgkQVWmRsqeSphO2cQCeIJs3v7GItMamw/Miz1OECxFN
+7XIAn189F3d75Dw5k5usTC/6rbZv/Ifk
+=rPgc
 -----END PGP SIGNATURE-----
diff --git a/app-office/calcurse/calcurse-3.1.4.ebuild b/app-office/calcurse/calcurse-3.1.4.ebuild
index db6abdb373e9..7cb13a676e9d 100644
--- a/app-office/calcurse/calcurse-3.1.4.ebuild
+++ b/app-office/calcurse/calcurse-3.1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.1.4.ebuild,v 1.4 2013/07/04 12:18:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.1.4.ebuild,v 1.5 2014/11/23 09:17:04 jer Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="a text-based calendar and scheduling application"
 HOMEPAGE="http://calcurse.org/"
@@ -11,11 +12,13 @@ SRC_URI="http://calcurse.org/files/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-CC_LINGUAS=( de en es fr nl pt_BR ru )
-IUSE+=" ${CC_LINGUAS[@]/#/linguas_}"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
diff --git a/app-office/calcurse/files/calcurse-3.1.4-tinfo.patch b/app-office/calcurse/files/calcurse-3.1.4-tinfo.patch
new file mode 100644
index 000000000000..f3d2aac897e9
--- /dev/null
+++ b/app-office/calcurse/files/calcurse-3.1.4-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #-------------------------------------------------------------------------------
+ AC_PREREQ(2.59)
+ AC_INIT([calcurse],
+-        m4_esyscmd([build-aux/git-version-gen .version]),
++        m4_esyscmd_s([cat .version]),
+         [bugs@calcurse.org])
+ AM_INIT_AUTOMAKE
+ #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+@@ -51,6 +51,9 @@
+   LIBS="$LIBS -l$available_ncurses"
+ ])
+ 
++AC_SEARCH_LIBS([cbreak], [tinfow tinfo],,
++    AC_MSG_ERROR([Cannot find a library providing cbreak]))
++
+ AC_CHECK_HEADERS([pthread.h], [
+     AC_CHECK_LIB(pthread, pthread_create, [
+ 	LIBS="$LIBS -pthread"