gentoo resync : 21.07.2018

5 files changed, 9 insertions, 9 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 95d95abd366d..375736535419 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 536ad3d3a2bc..7893e1bab650 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -2,12 +2,12 @@ AUX fix-insecure-tempfile.patch 3615 BLAKE2B a25ae5d15a1757d45901fd8d783bb5fa2c8
 AUX fix_cpuid_asm.patch 924 BLAKE2B 8c73d3034a70ec5a4b0b9b704ee10f6db99c5d592f68bc26f058c6ec99f681e1f0d04ae417d498a31bdfea4a52676cfb3a71d967bff9a79bbeee46b28837c546 SHA512 ad0ea8751e753340b541fc13849c2cb5b2be1c3c297a7b40e508d2ac9abdd1b153918ef507d89db1d4b15ec1e1eedfe7cb3619376649a10abfb1f5880f6d187c
 AUX gcc5.patch 1866 BLAKE2B 7792ec7852839317c9838617cb9fd85be0949afbe8cc456bf7f5587b0a934fb217a021c4d0a711d438553e15478e03e670f104bca122beaed4f68255c71139e8 SHA512 ad9a752bf3604136f2f3110c6053274581f6e5f6db56cede31fee2091d9b989b93f43d4658ca12f77bdf7c6ed78a0a06d8368ebea3ef20239fe707ae8e1a707a
 AUX hyphen-used-as-minus-sign.patch 2470 BLAKE2B e2c04874bae901475f1fadd1baf14d380182f25dd0ff41ab8879b1c2adf904475d6d5c64d0590abe638122653e7c0e3d8c44d713513b258b390df40f9f939fbb SHA512 05544e9f682bb6ccc1166182985ff4a4d19481ba555f63a0f030487ccc231cea9b2d1dfff83a95e9a2bcbf9d7dcc31cd331397cf84ef2ed253dac23fe9ecaa99
-AUX i7z-0.27.2-ncurses.patch 825 BLAKE2B 2538bcfcdb3f8597f33901c060974b3aa0e251f8c17b985452208e6e66940cedab29e21cdc3817070a91ec566b492c31bfcf3e3b727845bc9119a70b63f62e8a SHA512 6bf1773ccdf8b310be575eccdbbe351db5661bb4fef2621d2cf46dac073c627f27441e3a879b558c607305a5d73d53ef3687c98d49a2f0db7a1048019bd41a1a
+AUX i7z-0.27.2-ncurses.patch 831 BLAKE2B afe6112d6007be9c2dbdc494b128c890632caea31380627f1d9daf24a26f31b91597dc6095d4477d9b67bb39d9931392b2727cf429e573e0ce6d709a42db52ef SHA512 71bfc336ce4378ae23b960229586bfe5270b4148a57a41d4bdc3aea7ae627a06d570861baddada0095f36fd0e974a9b242bb381460ce85441caf6deaa44d32be
 AUX install-i7z_rw_registers.patch 802 BLAKE2B 186862e797e903766767b035565a0a20814a8197051519a308a2774ad1d9556f17a91eb299ea050c83f9b91850fd47e77cbb7b4a41a73a5356f11267eb3f3624 SHA512 677df9ea9884d138f1eecb88b49ab96ac16f49cb63caf11fa63892940815e3c31e2170afadd0c73a2a571ff62b824be6109c0cda72779d76e03907da546f48d9
 AUX nehalem.patch 477 BLAKE2B e0f30d54f1da1cac0aafaea91641d5e626bbbdea6bc2abc6e1f6acf3c5e3d613cb1f0da5ff337fd8a44bc4288b981d83eaa63541291c0c397619f859b34b1da0 SHA512 5a647455d4fc4ff24689c9d4d6e936c346065ff2219de0bc61613a1044236df40fb815df0a136510ba2645bd01f172ba67486cbb9dc072dddf4308fab1824d7e
 AUX qt5.patch 365 BLAKE2B 4aa56d2b643ecc119122f549678d4cd1525bdba923067366c92fa0ef3a3b183b17668ad593d825223cb69bba883ede461439b05ecda1da29d27e6b3085a54f52 SHA512 fc38423e82f774aff588023b45154ea3bf3fd553ee6bc4261dcd0e7911d1d589754461a1734e0da969d03d6d94e2b844da6f09a388ce4508090d4ba5c75c7df0
 AUX use_stdbool.patch 885 BLAKE2B 10365e67f43418213e8f38ab74d3588aab2783329d447834ad795f8973cdd53fdc40862d8f9abc723acaddfe03f49f3c471046ae865ed72f041db23ee1337c37 SHA512 5df3d042a580268971e6da0878bd070d2054e9a9732b518a88a489d6b3d62acae58f697fe44634ee6c847b108cae25df6592ed9e1f20ea4d7c6b36adb516830d
 DIST i7z-93_p20131012.tar.gz 879969 BLAKE2B 73b1f2e777cef9799fc9e11d366c989c37f4bad03676409855fdd8229a66d1075805068ad424ab0b46bb9bb4fe62431fb6c79b414fde0c1b1d29935ca4566839 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
-EBUILD i7z-93_p20131012-r1.ebuild 1480 BLAKE2B d5fbec4df1b016bdcd875976eccb3f2a2627cfaa15a38c0ffb623089587980acc9a69309c695acc26b72500cf3a3b90fa5c78b49146578754250471088217b3d SHA512 866ba126d0743b1ec3c5fb57cad73729d43be1b9a61417208bca19a6ef50df092bad82c772ed86234b6eb46d538e3729fa298ca02986999795ce34874c80a91e
-EBUILD i7z-93_p20131012-r2.ebuild 1298 BLAKE2B f86d42dd03f42c5c94444be65e7b4f639ec7e103f1545d7fe94ff3c5e35cb6e380de539fe2623bfde38637b0f5c017e626de1a8ee6491aff37658ce1f66911a4 SHA512 5e67a7aae98ebb9e44041ab1df5cafd980c43d66b58714dc183c15281998b955aeb6e62b20736e9ca156cb26acd0e56db274022499f5945eb8f00a7416b4fb7c
+EBUILD i7z-93_p20131012-r1.ebuild 1491 BLAKE2B 3d22e3168929e2270577126f13437f1d3d994cb14ec36708cda9ae8b65a0f3d6b5243eb139df07e027bb9a84fe3fe47d67eaaa23061b6a9f6599d946eb80cee7 SHA512 03d5d125dd335d23844ac76d9153114da9b785dd0bbd37bf35751b87a840522fa4256ac77e0a0d6a7ade67f108631c7f9ade486ce12b89397f15e3f648287318
+EBUILD i7z-93_p20131012-r2.ebuild 1308 BLAKE2B 89d33a86b56beb13c89835313911d80786dff6a92405a7a3055def5d30a77bbc2f7de2781daa99826e77ad218c7561dd99e373b32916d12877751f995a8d52c7 SHA512 bd0f12c4d3aee51db7901b920d86fee7d751979891243d514e900136bfb7af123cfd94b8cef67c89bd4c0758a5e2c43f4ed78ea217264dd190647812c4108b2a
 MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
index 72695a951f7e..d521674af6cc 100644
--- a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -7,7 +7,7 @@ Index: Makefile
  CC       ?= gcc
  
 -LIBS  += -lncurses -lpthread -lrt -lm
-+LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
++LIBS  += `$(PKG_CONFIG) --libs ncurses` -lpthread -lrt -lm
  INCLUDEFLAGS = 
  
  BIN	= i7z
@@ -16,7 +16,7 @@ Index: Makefile
  #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
++	$(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-93_p20131012-r1.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
index d555d4c41fa5..20080024b0f3 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ src_configure() {
 	# Looks to work fine for me with -O2 (pacho - 20170530)
 #	filter-flags "-O*"
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 	cd GUI || die
 
 	use qt5 && eqmake5 ${PN}_GUI.pro
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 992080972ba0..d9e53c406e49 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ajaiantilal/i7z"
 SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="qt5"
 
 RDEPEND="
@@ -40,7 +40,7 @@ PATCHES=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 	cd GUI || die
 	use qt5 && eqmake5 ${PN}_GUI.pro
 }