gentoo resync : 04.08.2018

6 files changed, 5 insertions, 75 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 375736535419..db76e05734a2 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 7893e1bab650..2a37413ab389 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -8,6 +8,5 @@ AUX nehalem.patch 477 BLAKE2B e0f30d54f1da1cac0aafaea91641d5e626bbbdea6bc2abc6e1
 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 1491 BLAKE2B 3d22e3168929e2270577126f13437f1d3d994cb14ec36708cda9ae8b65a0f3d6b5243eb139df07e027bb9a84fe3fe47d67eaaa23061b6a9f6599d946eb80cee7 SHA512 03d5d125dd335d23844ac76d9153114da9b785dd0bbd37bf35751b87a840522fa4256ac77e0a0d6a7ade67f108631c7f9ade486ce12b89397f15e3f648287318
-EBUILD i7z-93_p20131012-r2.ebuild 1308 BLAKE2B 89d33a86b56beb13c89835313911d80786dff6a92405a7a3055def5d30a77bbc2f7de2781daa99826e77ad218c7561dd99e373b32916d12877751f995a8d52c7 SHA512 bd0f12c4d3aee51db7901b920d86fee7d751979891243d514e900136bfb7af123cfd94b8cef67c89bd4c0758a5e2c43f4ed78ea217264dd190647812c4108b2a
+EBUILD i7z-93_p20131012-r2.ebuild 1307 BLAKE2B 62d44601edf4d3a29e13cc4fd3135e5b3cdb81d62ef2dd37e6cf4cb98b84bbc7dc96bdc6296a9f751e325518640a5799068e0d1fa5f494f9fae24f833330ff1f SHA512 0c4a0e169f0c9d0ece0fd7272d416994cda58196a0961906080d0e0e561407453bcb780222051aedfd00e1d62c2cae91ccf5688ea358a56f1269dcdc93b36d33
 MISC metadata.xml 296 BLAKE2B c58dcfad78dd439c5fb57ba43d2c7694eee04f21dd6feef0af39c06d4980c37a02da0a1cea423d41cc2d32265be75b731a1a3866cda1e855af8efd71917900fb SHA512 a73fd853e9d6da0d414da279e6fea520e9f1f1ff76c73295640be542ed81391871a83f30f5739271c7044692398182217e42b59d75fe65ad4c5d949015009668
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
deleted file mode 100644
index 20080024b0f3..000000000000
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-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"
-IUSE="qt5"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
-	"${FILESDIR}"/qt5.patch
-	"${FILESDIR}"/gcc5.patch
-
-	# From Debian
-	"${FILESDIR}"/fix-insecure-tempfile.patch
-	"${FILESDIR}"/fix_cpuid_asm.patch
-	"${FILESDIR}"/hyphen-used-as-minus-sign.patch
-	"${FILESDIR}"/install-i7z_rw_registers.patch
-	"${FILESDIR}"/use_stdbool.patch
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_configure() {
-	# The GUI segfaults with -O1. None of the documented flags make a
-	# difference. There may not be a specific flag for the culprit.
-	# Looks to work fine for me with -O2 (pacho - 20170530)
-#	filter-flags "-O*"
-
-	tc-export CC PKG_CONFIG
-	cd GUI || die
-
-	use qt5 && eqmake5 ${PN}_GUI.pro
-}
-
-src_compile() {
-	default
-
-	if use qt5; then
-		emake -C GUI clean
-		emake -C GUI
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
-
-	if use qt5; then
-		dosbin GUI/i7z_GUI
-	fi
-}
diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index d9e53c406e49..d121c8ebe66c 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="
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 7b1a8889ad2c..2b272769f8b6 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86
-DIST stress-ng-0.09.33.tar.xz 354140 BLAKE2B 301af9eb7b805619d2e91af205e6b8e1e47fc24de0b99409627a0d0b7b09d3512fab27f4b89676ffc298bb9ee86074518c919016b389e88dfe0e571ace6df397 SHA512 2add6dd17e64c7a324143f00a1e42fc3070448575bf3b65a1a4d0d261748546410d1c024ec4320249600e0c99867bfb42bbac987f297d080802ce9977240efd7
-EBUILD stress-ng-0.09.33.ebuild 679 BLAKE2B d3489ae39f79b3a064b6ccdd7bab945e1e7c2d8447ad9ebe13b405cfb21d769fa57a1e2c987429546dcfdc232905661bf7b0c5ca5fe907bee3a1619c9457a2e6 SHA512 abaa37e711a7748dab9a501fb487e634b2560aa781545cccb4f0714efd90002d4659b93601c508b98832fd2d8526ab7bf3a47f12035131cb9102b80f4bf913d7
+DIST stress-ng-0.09.35.tar.xz 353748 BLAKE2B fb1b111960bf383fd24e4b855a4a2e41c8f838c8eb869aaef8113f36020ceff0c657063f77b89d7a78c15981ca7fa79214ef671311e5989dd2dc9a8203d83782 SHA512 3d685ac6ed20437ad20859e9a3881426111dc966da5bb999bd70dc651e879fe68564f32099664b84c09422deb905020a6b17197e286e7a9315f2cd55959091c6
+EBUILD stress-ng-0.09.35.ebuild 681 BLAKE2B 7d819ff63bae78b55ade23ccf680fad63382ba39f88614c2cfb56d1b871130c0714bcde50848bc8329006c7bd00004e0fac5fb290b6840ed2a2a1fae9a20bf7e SHA512 1a33939cb65405e390a5e96052eef683d879ccd28506d4bca5effbf86de16cc459b0773e70707b310707cb448b2da762cf5411fe4eeed1634b08211c10d89ec2
 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.33.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.35.ebuild
index 728b7fb84338..ce7b1343e7dc 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.33.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.35.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="Stress test for a computer system with various selectable ways"
 HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"