Fix for ncurses[tinfo], bug #553850

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 54 insertions, 19 deletions

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 9f4d522670b5..38ba1f59bc43 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/i7z
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.20 2013/12/27 21:38:05 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.21 2015/07/28 07:54:07 jlec Exp $
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org> +files/i7z-0.27.2-ncurses.patch,
+  i7z-0.27.2.ebuild:
+  Fix for ncurses[tinfo], bug #553850
 
   27 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/i7z-0.27.1-gentoo.patch:
   [QA] Remove unused files.
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 7f929eebe5ea..994d51efb124 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,18 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX i7z-0.27.2-ncurses.patch 821 SHA256 40e907b6151db6fc058186f836449c6a8819b26282fcb2029be79e98909ccd0b SHA512 f4f798c6cc6b2f8e53d1dbd241561188f34717c1bff4defc0b3450ea82806f097dbc995237b87a3b7c01f1d4067806b99b9498ca3e58513b952e08188cca8489 WHIRLPOOL 8c5473e8b07aaaf9534339ea3566ef9c08c9779856a69d1e87dbfb62199620ba5cbf1a5cadea2edaed55e8e080c056e3c7b699be064a5a9a0a1b92677a2709b0
 DIST i7z-0.27.2.tar.gz 51226 SHA256 a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb WHIRLPOOL aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
-EBUILD i7z-0.27.2.ebuild 843 SHA256 511ae23ce29791a2b0b2618af8eb4265ae3133bd5973dbdc3e455854abba8131 SHA512 c8b481de5af1004769175e762f464c758c5dd24332a6ea16a0096114f093b006c1cd2c70d5d74bd384f23c929dcece36ec214f5dd363c8d47814f398b1b31949 WHIRLPOOL 89f316e6d70e230b7de455330dcf5e732bc2e7ab1657953ff077ea578ec1bdd881f76ec0a2114728e7b0a7bf303dbb0a6ca99cf273f49fa731db2a8b02eac60f
-MISC ChangeLog 2684 SHA256 9059d4d38576d45ff0aba25cfc7636448f18179051cb9d619ee1c515ef3f67bb SHA512 cf649fbb1bfa5bcc2f49a1a014a0ef50f37ea3f7d8350da7eee95e924f616fa5f9daa234dbb59d2019d8b026a5a3890d76da8032ff190be238b6d8d1927a894c WHIRLPOOL 1ac929da88462069b3de057fa22e7dda9b9b320400b8e78fa7f6f6de48f8be9161e7e3333f3cdc024a775c2ab45470a47fc206a6a8e0a32150dcd7a2cacdf5be
+EBUILD i7z-0.27.2.ebuild 886 SHA256 3dd3797f174c7102296c4489eb772c93442298a1c75a7557621515c85f531741 SHA512 b36f360caed04c01977d4e89fcb3224a1b34e6ccb06b940b052831b1affbb88af0793c68e550189be3491a5cb49afc9d0a90e0176a70da02babdac693918daa2 WHIRLPOOL 8c5bde0ac1fea0e867bb73945acb77ccae89b3067665e80009a274864f9fbe9d293abd124050e807d6b4a297a7a4b0651d151280061dc96853ff710d72768321
+MISC ChangeLog 2822 SHA256 ec9e1b30916c1f1ab8b6f25768c798a8dcfd20d06303dea39afa55ad592da678 SHA512 5bac6a648afb861d3f15515a2fc00ef3749c6b8fcbe6c4cc173456d32c72403a2623cac16d27586d993317fed341e8231ffa66353f72e3c93b8bf2e701645762 WHIRLPOOL b28dc3a83e1f22ff810b77559ab25106c803047f11f69c61996b91b32c34cc26c22668905849289f8ff50c5ae98ed4ffecb316a2e1c063db54ef149f015d3ad9
 MISC metadata.xml 274 SHA256 99db8dacd71438ce8b9e6e2fce529fb4558d62e7fb34c6ee9f00705278d896d6 SHA512 e0e1052bc07e355daba76e2fb773d1c98618a2cd3bc1617299ffddbef5764640999a6752e11a9ba162e471c1ff8c4a779da9a53dd5a1ddce6ed1cc242875c3e9 WHIRLPOOL 0da25710f5676efd0793cb0b8e901abc24bf8295fe009e2e739aef7a3652b129f941f9981dc13fe41fc407a8a7cb8a036572e71b9420f1cbe78937b02b0dba58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJSvfMwAAoJEJWyH81tNOV9LFwIAIB6U03SgAwFEwjX7Wkk1sEr
-s4KXOdjV98e5c7LUCQXSMcZ8mbE36rb2m7uUb/p91aXfzGiholCzuqbCCVy+8NaJ
-uDckT7Cfkl36nKHxccXR60J7lLlOeYPuOpDG6nJwkHLrRsoH4KulJxzU3J1MTENk
-fALc+pHkj1TzZnxGI7W+4WPqmmDE+Fb+ZDn6vVRci/K03r3XlW22ZEsfuFaIhxfE
-HQl+Q8ymWyB54XMt1DwcLD2VWgquSFPePnhxL3sNiQe/dOv+5EbIL09s/x2TiIuE
-z0A9lrvZmC3imPDvAsflFinC3aKXHl5M2AWCZsDvyYN1FpimNLDL6PZA8ASagUQ=
-=t0Nh
+iQJ8BAEBCgBmBQJVtzUNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3NIP/irfaC1lBEvuzMRHn9A8E2e2
+hdkWnrEoUvH1uB+Amt5uWzSs9Lt24pGlWgofhKvtQyot6i2Y0iTHYj349QPotaIA
++TJRCwMd7pbWySLpfFFgAhvGka78T8Ij2VM7xl703dpfuyUqbwYhIl/HcC8IKfHJ
+psN4FQBRaUG+4oRYzNpBlpXG1kbzuPaqLYaRrCe1MCqC/iZKQFOXB1Biw6sFVTow
+D9Am4llKeLRIutetF9+325Vg3cvbvSqB3ZD5z/JFDbAB7HYm+6EenoiJhL/q+1ub
+Y17aLP895WRQrQhCiN05Q1HnDur30M9t/b1kV7TznRYzOOEMJuxpdYbJKtqPUtc5
+MfhTUSeQ02SwyHS8ObSLXxunkiEwaZ0poOL30ZkfV+VM27029URs9dsnZvmgPs7A
+jVQoKvBbGM8nFN2owv1W3ZDvulThHvjmH9UInuoFxz0vrWWoVBOeduEqat00OWpl
+TS83CvS8eppB4uCbSizHiwpy/k6Rk4n/la7gsgGq2NvfL30PN4mwGVe290xAI29l
+x/AWQLV1AnE60VT6WwAv1IM4k+EqGl5C68Z5hSlhsxybUoH92I30Wxq8sLdGCwjk
+NlL6nUFEDwkU+OJADs/gUYMnN09GvVJ5EH920E7a+Wo3Q4pIkZjpjFjdv+kMg+WY
+NZaKXWi6nRsSx+rWO/XP
+=T0ra
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
new file mode 100644
index 000000000000..2d0a5a1e9b87
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -0,0 +1,22 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 109)
++++ Makefile	(working copy)
+@@ -19,7 +19,7 @@
+ 
+ CC       ?= gcc
+ 
+-LIBS  += -lncurses -lpthread -lrt -lm
++LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
+ INCLUDEFLAGS = 
+ 
+ BIN	= i7z
+@@ -42,7 +42,7 @@
+ 
+ #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
+ static-bin: message $(OBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
+ 
+ # perfmon-bin: message $(OBJ)
+ # 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS)
diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild b/app-benchmarks/i7z/i7z-0.27.2.ebuild
index 71a41a4333c3..23be3e59e057 100644
--- a/app-benchmarks/i7z/i7z-0.27.2.ebuild
+++ b/app-benchmarks/i7z/i7z-0.27.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.5 2013/03/02 19:12:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.6 2015/07/28 07:54:07 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils flag-o-matic qt4-r2 toolchain-funcs
+inherit eutils flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
 HOMEPAGE="http://code.google.com/p/i7z/"
@@ -21,6 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-ncurses.patch
 	tc-export CC
 }
 
@@ -28,8 +29,7 @@ src_compile() {
 	default
 	if use X; then
 		cd GUI
-		eqmake4 ${PN}_GUI.pro
-		emake clean && emake
+		eqmake4 ${PN}_GUI.pro && emake clean && emake
 	fi
 }