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

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

4 files changed, 42 insertions, 12 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 06439eb14003..14f7a9d52028 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.222 2014/03/24 16:59:58 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.223 2014/10/28 20:54:26 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> conky-1.9.0-r3.ebuild,
+  +files/conky-1.9.0-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #498026).
 
   24 Mar 2014; Daniel Pielmeier <billie@gentoo.org> -conky-1.9.0-r2.ebuild:
   Remove old.
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 235fd4a6a8dc..b9e86be692a7 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -7,15 +7,16 @@ AUX conky-1.9.0-default-graph-size.patch 738 SHA256 3dafeeaec6c68223125b7d311ce0
 AUX conky-1.9.0-diskio-dmmajor.patch 846 SHA256 082e275bb7fb1cda62c7e7ecaa6b105f6f7b4cf26a2f5292d82d3e735e16ed5c SHA512 4eb1ee6a77dd9d1dc916ef4df6f94fb81986874e253278fb78a20cdad7e595e23202bb0393fdab49869bbff75641a3a875c4b10760f1f5002f1f365e6b4c9c1f WHIRLPOOL 98faf0c496d6a3e71511a19e7537d96ec3f117deb93c5a97a3c76abd2361e4bbbb3272a83b28ada29d0fa8f6e5d74df61cfc6e5c457a2cc8f148ea263292265e
 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
+AUX conky-1.9.0-tinfo.patch 926 SHA256 3db1036acd90432ecdce945370610d57d82f9c96a1dca7205613c72c1e4b60ff SHA512 95781ca1beeebd094a7efa44f4b8aa261586b28230ffb15ab5b4a9088d0e85b0ee28d47a5fe0812a32725efb5a6aabc65f635b53e28a4cd0ad4b51fdf5bd2ff8 WHIRLPOOL ab5bbf747dcdc6b7c600b523a18c30a5f5d0836399340494fa05b3f52c7eada27e2c260d9a39957d1d022b6963bb6073704a0a754764cb4a860f40622e4d5021
 AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
-EBUILD conky-1.9.0-r3.ebuild 4145 SHA256 fc9fc199b3707910e828c2754791df4c1ed450bae750c545ac5ccd50775559f9 SHA512 8d9263d9839b2b2b06598b46521fabd17df6fdf10f56e56fe931f0ab26c37791fb9b4c54c7ef4969dd5846208be3431d13b440f8e88568ef83fe23867c67f573 WHIRLPOOL 1301eb3337e97105412550bb0c5d1d81aa9b7e7dff3a53a42aabfd40328c3424e3d92417ca463d370654646d362401b6c68d46da1bf47f9a921c5ebeff42bea9
-MISC ChangeLog 33690 SHA256 d32f9e19c43d98e722f295539a3a2a9e0465e888e19a8f47343c05935c48f430 SHA512 c096c7da616120e853c2c193bd03f1f8840e03cdaf44094065b7878a3370496f24fb8efe448f03819ecbc9fede90be64e92bc2fb683c38d211b0ca73738d7ba1 WHIRLPOOL a9dddedbf031aca42ec27a01cd1cb160a6b93771c464aabd026c9f63fce7e6db6821527ba96f7b51c8f4e43860142c68a7b024782b408400f0535fa91a66b663
+EBUILD conky-1.9.0-r3.ebuild 4120 SHA256 0a4ef40b412cb2c4e1847a76c69d0b0a34f5bda8340579faa35c979a7ac63a62 SHA512 e03aa962c912ec9112fa0f68da499d169dd3243b39b72f7a33b29be804b0a1736ddeef319ce35c85a4a5d4062b34d5b6185e35ef43248c2813dacc37f96152ac WHIRLPOOL af23768a97464b9f5f24d484363e0254a47449edfc69950363cb8821c895cf5e4388056655d0224760a2dcf2b0789078dda60182ce1501c97d4d862c903f3b68
+MISC ChangeLog 33854 SHA256 840bfa75b73954ae7b648a7c48bf3973da7852236e47ec2563dfac7107e42e8f SHA512 eea76870759482d75a83832e284220984169324c2dcc51bc221b6643c442739fc5a324298ddad5d00f143c58614155faad1c1a104ba4078a0b203655fbc87e69 WHIRLPOOL 19073e292c99e56522c9398d81f10b9f5fc4c4eeb1ce3ccccc31f689ce8e777cbf0560491e68d97dddf605de43da5c5b589ff4f1737cff34ed8f38dda9a17c1d
 MISC metadata.xml 2065 SHA256 697fdf5628f91d6a489add4bb77b4cf926ac72feb3cf09de0f733e842e7d2a67 SHA512 33ec0b8e3e9098671f2e733115a1e97931757ecb7932814de2e4ba7dfd4e45b15e2eda48a10d0ed97becb27bd45d40ed09f3deb70a09314e3167d665f90bf9ae WHIRLPOOL 58ac38f69259e8d4ea3e41c3f1221537cdabc20e144048065198b1c8044ffd85ad5398346007aad1c46747a6073023a40e04eeebd37cdb006d84d959cc3e246d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMwZJMACgkQlcuUeyFa0U34GACgsGqr03boyI0J92NfW+Kr0RQp
-YgkAn2LbUPmtx0qozR0b6Zh2ytBfradZ
-=aWxW
+iEYEAREIAAYFAlRQAoMACgkQVWmRsqeSphNwLACggCNiMCaEtBkmkPo/TkYobJvw
+GlEAn1v46g2qfxiWmQ5u3rycQMAojdhT
+=N1FV
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild
index 06cbc99e8fc7..7135be4ba65b 100644
--- a/app-admin/conky/conky-1.9.0-r3.ebuild
+++ b/app-admin/conky/conky-1.9.0-r3.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/conky/conky-1.9.0-r3.ebuild,v 1.10 2014/03/24 15:12:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r3.ebuild,v 1.11 2014/10/28 20:54:26 jer Exp $
 
 EAPI=5
 
@@ -59,17 +59,20 @@ DEPEND="
 	"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
+	epatch \
+		"${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
 		"${FILESDIR}/${P}-ncurses.patch" \
 		"${FILESDIR}/${P}-lines-fix.patch" \
 		"${FILESDIR}/${P}-update-when-message-count-decreases.patch" \
 		"${FILESDIR}/${P}-apcupsd.patch" \
 		"${FILESDIR}/${P}-default-graph-size.patch" \
-		"${FILESDIR}/${P}-diskio-dmmajor.patch"
+		"${FILESDIR}/${P}-diskio-dmmajor.patch" \
+		"${FILESDIR}/${P}-tinfo.patch"
 
 	# Allow user patches #478482
-	# Only run autotools if user patched something
-	epatch_user && eautoreconf || elibtoolize
+	epatch_user
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-admin/conky/files/conky-1.9.0-tinfo.patch b/app-admin/conky/files/conky-1.9.0-tinfo.patch
new file mode 100644
index 000000000000..0018a726f3ff
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -134,7 +134,7 @@
+ 
+ AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
+ if test x$want_ncurses = xyes; then
+-      conky_LIBS="$conky_LIBS -lncurses"
++      PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
+       AC_DEFINE(NCURSES, 1, [Define for ncurses support])
+ 	  AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
+ fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,7 +134,7 @@
+ 
+ AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
+ if test x$want_ncurses = xyes; then
+-      conky_LIBS="$conky_LIBS -lncurses"
++      PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
+       AC_DEFINE(NCURSES, 1, [Define for ncurses support])
+ 	  AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
+ fi