gentoo resync : 23.06.2018

4 files changed, 55 insertions, 10 deletions

diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index ff48c12e6cbc..aa44112cba35 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,7 +1,8 @@
+AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
 AUX powertop-2.9-libc++.patch 1182 BLAKE2B cad53198b44a1b402995207c33e33d06cec5f2994f3acb2b03fd81cbf78d5e7b85828fbbc1290b0308494fd29fd5c6b8b886bed7d206e530835db9d559963652 SHA512 ea4925df50118e0394e81a1eb18fc2559d7459065bc9e10978e60bd9ada0c757583b691cf98f4da07be9545163663cb993db72774ae3963b7873500767b86972
 DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
 DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
-EBUILD powertop-2.8.ebuild 3356 BLAKE2B ab7b2846e8752558a56545e94fb036d7c4f5322cf02d29b3f9c30e76c3f3b9690e2cb962c8180991b169363bc22d1109fd4139a287f87cf6c53edb251d659cdd SHA512 e243fd2facd6195480a121d665d80ce049561713d81a1165ced9a18756d2ac9728620b83c0c6acbe9433c5a87e568003f70980b77d1866b302a55d22e75c2e90
-EBUILD powertop-2.9.ebuild 3711 BLAKE2B 867ac2c796452430f1964571d1191b5bb17a6fa8b1bb636231c938ccd1be91ad3f34480f822818fb4dff012394512b34434ed73478bd5e6d6d3524911be46cc2 SHA512 271aa601d71ed156a619d382f27a9271f92e2a519db34be7f9c254b0c5e8175f26806f48fb4fa3abbfa5ee4cbdd7d3554c0c6b387665426012cd6512caa3febf
+EBUILD powertop-2.8.ebuild 3422 BLAKE2B 930fac60030bb84531e5155d29356a5d4f815705f2a7c1504bf50f5269b4f4f71807f6bc638a51af536f2ce79524bce7f7fa4941e47b5acd5e53044fffc3ca72 SHA512 22361930726c8af0fc97f111c534fb3fa26abbafd9ebb4aa2f0d5cd0b8e0a9a05fc48e646439f890de8847be913f8ee5a55dfd2b4b9e83370bc6b516a45b04f4
+EBUILD powertop-2.9.ebuild 3881 BLAKE2B 7069791fb24b1f0046ca14b930f7c33c3801c41a9f4c802293a502706bdcd907bba2a976cacee5934b52f4014b34fa336b07680fcbeadae69a1fc3f38eb7a7ee SHA512 8e881191b14e438c2a3164a17914419224dcd0b2f25ede1c863655652fb2e51495c7cba0687c62cd3ff57a0551c2719e39aae118708f09cb50f956fbbbd6fe6d
 EBUILD powertop-9999.ebuild 3663 BLAKE2B b020232c48201403e5467004745f82dad3f25231107b8bd6b227b257f20611a305545195a3ff89a7990a05f4cca3d73c761966af4d0b61b663118043fbf0e522 SHA512 9020b3bb5e59d05150cc8e3bc22f18d959c18c08db02256f1b06754a1a4293a04e400fe3d37b1a6910ff4f167221e2b37abf67a52d13d76a9c4941d7d6cbf8d7
 MISC metadata.xml 253 BLAKE2B 48f33288fc58b41b96f50af29bb4ce8989e714fa989ed445afc8933d1483e1026a019783805ad1b42399227819f461ed5c874df1c78c4bf144bccd07306ee995 SHA512 fad4a58e4c2a6eaa8bbbdc75e3995b5da53c9291f82480e35a9badfc1374bcc484663f2577790a46218be90d3b42bb45620297316c5493bc4a46af0dbd29189e
diff --git a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
new file mode 100644
index 000000000000..97769fb6728e
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
@@ -0,0 +1,41 @@
+From e1295099f8b42670718ba875cb6749a90042293f Mon Sep 17 00:00:00 2001
+From: Zentaro Kavanagh <zentaro@chromium.org>
+Date: Thu, 14 Jun 2018 13:13:37 -0700
+Subject: [PATCH] Fix configure to support ncurses w/ tinfo
+
+- The existing code checked for both ncursesw and ncurses and if
+  both were not found, NCURSES_LIBS was not set correctly.
+- Removed redundant concatenation to $LIBS since the makefile.am
+  already maps NCURSES_LIBS into LIBS.
+- Patch sent upstream to powertop mailing list [1]
+
+[1] - https://lists.01.org/pipermail/powertop/2018-June/002021.html
+---
+ configure.ac | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d6a15e1..c6ee50a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -110,10 +110,13 @@ AC_CHECK_FUNCS([ \
+ 
+ AC_SEARCH_LIBS([clock_gettime], [rt])
+ 
+-PKG_CHECK_MODULES([NCURSES], [ncursesw ncurses], [LIBS="$LIBS $ncurses_LIBS"], [
+-	AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [
+-		AC_MSG_ERROR([ncurses is required but was not found])
+-	], [])
++PKG_CHECK_MODULES([ncursesw], [ncursesw],
++	[NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"], [
++	PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++		AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [
++			AC_MSG_ERROR([ncurses is required but was not found])
++		])
++	])
+ ])
+ 
+ has_libpci=0
+-- 
+2.18.0.rc1.242.g61856ae69a-goog
+
diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild
index e0975e47ca83..2ec905b8419f 100644
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ b/sys-power/powertop/powertop-2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils linux-info
+inherit eutils linux-info autotools
 SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"
 KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
 
@@ -91,11 +91,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	else
-		default
-	fi
+	epatch "${FILESDIR}"/${P}-ncurses_tinfo.patch
+
+	# Call eautoreconf since ncurses patch touches configure.ac.
+	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild
index cf837648689f..d9536ebd1e01 100644
--- a/sys-power/powertop/powertop-2.9.ebuild
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils linux-info
+inherit eutils linux-info autotools
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
 	inherit git-r3 autotools
@@ -40,6 +40,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libc++.patch
+	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
 )
 
 pkg_setup() {
@@ -105,8 +106,11 @@ src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
 		scripts/version || die "Failed to extract version information"
-		eautoreconf
 	fi
+
+	# Call eautoreconf since ncurses patch touches configure.ac.
+	$(which aclocal) --install -Im4 2>/dev/null #599114
+	eautoreconf
 }
 
 src_configure() {