gentoo resync : 07.05.2021

13 files changed, 91 insertions, 85 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 16f803bc80ba..584958065c8e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/byld/Manifest b/sys-apps/byld/Manifest
index 188ca9cc45fc..a9129aef428e 100644
--- a/sys-apps/byld/Manifest
+++ b/sys-apps/byld/Manifest
@@ -1,3 +1,3 @@
 DIST byld-1_0_3.tgz 1128317 BLAKE2B c096cc3cfa4f467c9e5310a6f17d97d5f690fed20a03ce2d70b1d8476003df87815f4ba7c6262be7bfa2597e467c64e750eed8d5da386950d86c1413b62ff380 SHA512 ec141b5c7f636e611fd43bbfa69c8a06ebbfb766e5f58086ce4c0fce1271b8a0cd76333b748322efb19e46aaf2ed150cb3a5fc09c91aef55e10f80b1d1551eb0
-EBUILD byld-1.0.3.ebuild 681 BLAKE2B c0d28673e2e455541485b9d04794c96c5aa07c65370ff4b84b3a3413eca5c164e9050dfbf1d2539284c5b5d3b9824911b0787af0c102382a4f8f38e986ef2876 SHA512 289a995e44d01313ca68c803e771b2697adaceefaf2871357915aa5cb22e98ba55499641e125af4f345abc9a7f66514137e8d18244e84498046a1dd195210791
+EBUILD byld-1.0.3.ebuild 700 BLAKE2B 2ad9858aa85228c205fb0a6b2c11e484a6b055754de3ed7cbdfc449144bf5212cd8ce9c70e7f6f9cfa3b8139a9f9a5dd6deeb7deda4c464019f400d260f0b97a SHA512 174648bafee786b19b756ce3888144b34495fd97897d8d7e67f5d7fb569436cb44f7547c09925f911a514ea73c10353692211c70ae73759bd1f6c07852a1e683
 MISC metadata.xml 324 BLAKE2B 8b0f2c337f87797b823417bb4e81a8c6ed684acc8288cc4bf103a0d793d02003cd703f478ddad29877dfe3f88498adfa21c76dfdfe58a15291c3d44a68aa04d4 SHA512 51f62e5258feee75a0953d3f27dc8a990096d5289c7dbf2977fe0202e23b251bd635a29b00398a3dcc8c42c80d32fc58c566a90f0aefa971568c54bb7dfd1b91
diff --git a/sys-apps/byld/byld-1.0.3.ebuild b/sys-apps/byld/byld-1.0.3.ebuild
index 2c9a65e33e97..932d28c0c9f1 100644
--- a/sys-apps/byld/byld-1.0.3.ebuild
+++ b/sys-apps/byld/byld-1.0.3.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="build a Linux distribution on a single floppy"
+DESCRIPTION="Build a Linux distribution on a single floppy"
 HOMEPAGE="http://byld.sourceforge.net/"
 SRC_URI="mirror://sourceforge/byld/byld-${PV//./_}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
-RESTRICT="strip" #252054
+# bug #252054
+RESTRICT="strip"
 
 RDEPEND="sys-apps/util-linux"
 
+QA_PREBUILT="*"
+
 src_install() {
 	dodoc BYLDING CREDITS README INSTALL FHS PAKING
-	rm MAKEDEV.8 BYLDING CREDITS README INSTALL FHS LICENSE PAKING
+	rm MAKEDEV.8 BYLDING CREDITS README INSTALL FHS LICENSE PAKING || die
 
 	insinto /usr/lib/${PN}
 	doins -r .
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 3a24500118ee..50a037a50723 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,7 +4,7 @@ DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b24
 DIST ethtool-5.12.tar.xz 311004 BLAKE2B 640d4a1576afea60c673a6060b649d10ccb2d2be64a817e4d74daeb6de4da2d30ccb059ff1113e05f9c44898f08beefd706be2ea6e323c42032c4d93926d380a SHA512 9825f0bf10851f0bd9c3e621785144a5ed5f3fbedacb1801aa6a9b4685c870fa9bfac8eb552c900d20be06240c017dd001fde6be7aecc8c466bbe9ade8b1d002
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
-EBUILD ethtool-5.10.ebuild 585 BLAKE2B 8388f5cdf04e2743c427f019344d38c26ea96ea13a2ab718d03fa11a181011036515d504094050b876a1a138251af16b67af28cd5722d763c00a2f0c08b83d29 SHA512 fe44358eb30bd1ed1c2d4095b714dcd669bde7da248e002fa09bb4d3e1240f91b117a39a7a3450576350dca6c8af808238e283cbe156140f1e81c894174da30e
+EBUILD ethtool-5.10.ebuild 584 BLAKE2B 60f911d7aeda794812f546fabb92eede1e079091882bc6e6263c12f0695b667065d1677314c84566978a89d7662786db45ddcc436c9603c35083ce169c563f4a SHA512 acb3529e9b7ed1e22d9ce910f7ad39121f4e5fb340b90edbfb58c046c8d3fe95e665b692f279bdbd210c34bba4cf04bcb5c67a3c60744d651b3b1affd49c7d9d
 EBUILD ethtool-5.12.ebuild 591 BLAKE2B b5c8ee339ab24f7738596a35ce897d6ccdac5819e659375b3986997c05f6cb7e87ba1c904775bc59aa00c96d95889a81f65999ad79893b2dbf3fe28eed0ca057 SHA512 b2eceda29fe07143e041ab129af00320a7e9001cf3e9b432fcf784137ad21297a1332e5a7619034ce0a8a0ee1b76d3cfd0af7178eb0d34ca6d0594f3c0580381
 EBUILD ethtool-5.4.ebuild 459 BLAKE2B 10c7df1a3e8df3cc1d1d2eabb54fd33fb1d59bc99486aaf5b1545bf62c663e5f4544b24e8bf7776fc9f92aacff48f2a86b38f4de80d98d4d8702e63f4be2b939 SHA512 bee519fea3dd8981660009d6a40c004d168a0fe9c06a7f45ff9a9cb757fc44889741fcc8df6ba97feefdea5961a44ab338344d51cc3bf6e85fc71b080c19cbbe
 EBUILD ethtool-5.8-r1.ebuild 704 BLAKE2B 7d5dd8bc5702829eacf956bb324dc8002ea9caf9e4f7d62df11fbf47d60dadf15b1f99c0802b4364c54f6ac6a2e387928a0ed4da28252692984156516f877a0f SHA512 2ed3b6e06e2dfcc4d76c58f7b4db449298bb43fdaa3223efe38db27ddf630af690fe19886e4ac6a472b9e31d868d44940df3d268926edb9066e65baefcd32fb3
diff --git a/sys-apps/ethtool/ethtool-5.10.ebuild b/sys-apps/ethtool/ethtool-5.10.ebuild
index f3c8b5406ccc..220991148470 100644
--- a/sys-apps/ethtool/ethtool-5.10.ebuild
+++ b/sys-apps/ethtool/ethtool-5.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+netlink"
 
 BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 16bcc5e07b21..ee177e13174c 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,5 +1,3 @@
 DIST qdirstat-1.7.1.tar.gz 8532003 BLAKE2B 4e3eec17dbfedf602580eb94a8264af40e77e2d5f67d4f0b9bf4a073bcd951ec48b9c3cac50463d0c0a2512a31c69adf10c1f77d6df317c617d4260c7fd845cf SHA512 e272cb603262966f6f24ef0dda268b4c9819783ec43e4f09181f7c6c7c9dac576403b8fc0c3a5b90b85bdc381f491ef3fd0db79ed88993f2bed3157529651ce0
-DIST qdirstat-1.7.tar.gz 8057173 BLAKE2B 7de2d74933dcce190240569ca043faf76925592576016090498ae21d2074a79aa9b1313fa491c270d5a841238cb35007a85ca3de9c343a353b3de9235f9e5032 SHA512 9af03c110663eab0df48f69f7d949421feebfdca1299205d25a216587cf2c9e472cbe99ad98f3cd6c783be2b02e0308cdbc2f5549bf662b3061ff5e059317b01
-EBUILD qdirstat-1.7.1.ebuild 983 BLAKE2B f8f4e993b7fbaba3da9a2265c74cb72b4e776aa5fc0ed53ce857a91d67a695ccb542f00c677ddee6249a15232055fea81f3273423879a22278d81467c2bd6f68 SHA512 9c0407b7d39282d205494d511ffae91331aa27112cb9b161e9ee317e26a70f54050652e7101cf702d19e6eb6da112437bda848520962052b395a6d6d4ad067e3
-EBUILD qdirstat-1.7.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
+EBUILD qdirstat-1.7.1.ebuild 981 BLAKE2B 4573e11212221fe9d1afc86e2767e8292fa0a30b3b8d92bf33251d5465b56761f562fd536f58f69e4e5f0eb1b9942abdb994585cf92a51ed4d5e82550db53fa7 SHA512 438d72ad5a9e91577a5f7c401c588b9bd0670159447f8dac121aacf2ccc69176912aaa92bad5c0cf47a3a4cae5a144cb40df8f680b47e78155d4980c99a81924
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
index a62fe9d3b636..cf382f9d1410 100644
--- a/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtgui:5
diff --git a/sys-apps/qdirstat/qdirstat-1.7.ebuild b/sys-apps/qdirstat/qdirstat-1.7.ebuild
deleted file mode 100644
index 1417eaf6d6f7..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt-based directory statistics"
-HOMEPAGE="https://github.com/shundhammer/qdirstat"
-SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-src_prepare() {
-	default
-
-	# Fix QA warning about incorrect use of doc path
-	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index ba53371cfabf..0c9ce0bd4aae 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,7 +2,9 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.21.tar.xz 434540 BLAKE2B c9af3b44e65d96d20b98996a4b9e35cccf6b62020d49522b9fcf50b097d4ffe3719bb334405226c5ee650943bced365547a5d8b0f707ed26ef5f12a4d15dadba SHA512 42b85e230bc89d0e02f22a7ee81b4efbb2c37ff9db24982b4b39487664a095d384101b16a4689863bd32ea91349347980b1c7f8eecb09225bc65619829c6a5b2
 DIST sandbox-2.22.tar.xz 437872 BLAKE2B 248920733ffcb56422bf02711f1ae69e81a176ffb59a1a45266bb81779e2916841eee0d237be4010062693604603893973f1fb295276c25a59654dc56a2593b4 SHA512 9c83e7748aad99e14d43ad81e6f3a8d818b821467023bbb3059ce8cee248090583d31500c1278705110f1b62cad5e5bf7f23390c6548095df709521c7d842eba
 DIST sandbox-2.23.tar.xz 437980 BLAKE2B fd417ea88512e7716a7f075442f684dc67b6c7d991e4375b47de4411353abd52764e5b85709aef06d175ba492b73edf5162c03e66e456cedb8586add18c8b5ea SHA512 d25b27bfeb5f5b9a331029a453be93947f32870b84d0e11efc5bb82044de6005111959a4efef87f1055e7065f76deccce6338d44bb7ab32e3a5ec053a429dbd5
+DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
 EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
-EBUILD sandbox-2.22.ebuild 1432 BLAKE2B 575c5ba04805d4e3dc37348ff96876e4ccf764f3db6bea776a7281b4b6ba2714f70e6f66ade8740dc77578f8d1bc816b38b3ea908d723c7845857836f68711e9 SHA512 610bf260406bf4c7e0e17b0c9858ce41aa0a8c19e423202f0b55de77a850f7d750a82c5afae5e06fd616bc4ba2a182d45bd2e33225dbb18803e50c8e815a867f
+EBUILD sandbox-2.22.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
 EBUILD sandbox-2.23.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
+EBUILD sandbox-2.24.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.22.ebuild b/sys-apps/sandbox/sandbox-2.22.ebuild
index b96dfe9cad45..3fcb495f4274 100644
--- a/sys-apps/sandbox/sandbox-2.22.ebuild
+++ b/sys-apps/sandbox/sandbox-2.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild
new file mode 100644
index 000000000000..844b1e1fe4cc
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.24.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	# -j1 to prevent test faiures caused by file descriptor
+	# injection GNU make does.
+	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_postinst() {
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 71d626b22723..4d8571bba827 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,4 +1,4 @@
-AUX x86info-1.30-makefile.patch 1939 BLAKE2B aadfe68d30fb12a71435e4ceb708cc69280c47d32e92d7ce0e95ca12199fe728bdbf2d3edfe4c296cf25a972df26e39355c0dd12a79cd4b1d8dc3c5680c4f6e9 SHA512 57ff52a78747abd75016b4b61a21e859c0b5023d5402d2025c7bd93e3a9511d291938da1c688e1eb60f912db64800140423d1e5ca19c159fc2d9c94dc97bc693
+AUX x86info-1.30-makefile.patch 2153 BLAKE2B d19254f4b1c3fcf18f570b88e729c4572f0ac1d3c7c92163c243427101066682befa29102ed3b5efa63aca7f4f0150eb50a8d2df3f91003942d51e51092ed9b8 SHA512 1dc4b5aeb280ee79e61ee6e979c59f2245b95688b6d0aed013202181810e6a5e55fb51c22b918213c86c0eb4dbc028f15db5d5ada325036680b0fba09223c09f
 AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4
 AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
 DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch
index 9e1768d68958..e513be7155aa 100644
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -1,27 +1,17 @@
---- a/lsmsr/Makefile
-+++ b/lsmsr/Makefile
-@@ -40,7 +40,8 @@
- 	generic_msr.h
- 
- %.h: %.regs createheader.py
--	@python createheader.py $< `basename $< .regs` >$@
-+	$(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
-+	mv $@.tmp $@
- 
- LSMSR_SRC = \
- 	lsmsr.c \
 --- a/Makefile
 +++ b/Makefile
-@@ -2,7 +2,7 @@
+@@ -1,8 +1,8 @@
+ VERSION=$(shell date +%Y-%m-%d)
  
- CFLAGS = -DVERSION="$(VERSION)"
+-CFLAGS = -DVERSION="$(VERSION)"
++CFLAGS += -DVERSION="$(VERSION)"
  
 -CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
 +CFLAGS += -Wall -W -I. -Iinclude
  ifneq ($(SYSROOT),)
  CFLAGS += --sysroot=$(SYSROOT)
  endif
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS += -Wswitch-enum
  CFLAGS += -Wundef
  CFLAGS += -Wwrite-strings
@@ -30,7 +20,7 @@
  
  # gcc specific
  ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
-@@ -33,20 +33,8 @@
+@@ -33,20 +33,8 @@ endif
  CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
  CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2)
  DEVEL   := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l)
@@ -52,7 +42,7 @@
  
  SHELL = /bin/sh
  
-@@ -68,15 +56,14 @@
+@@ -68,15 +56,14 @@ X86INFO_OBJS = $(sort $(patsubst %.c,%.o,$(wildcard *.c))) \
  	$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
  
  x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
@@ -70,3 +60,15 @@
  	@mkdir -p $(DEPDIR)/$(*D)
  	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
  	@mv -f $(df).d $(df).d.tmp
+--- a/lsmsr/Makefile
++++ b/lsmsr/Makefile
+@@ -40,7 +40,8 @@ LSMSR_TMP_HEADERS=AMD_k8.h \
+ 	generic_msr.h
+ 
+ %.h: %.regs createheader.py
+-	@python createheader.py $< `basename $< .regs` >$@
++	$(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++	mv $@.tmp $@
+ 
+ LSMSR_SRC = \
+ 	lsmsr.c \