7 files changed, 174 insertions, 2 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4e10704dd4ec..69c64bb890a1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index de86f042b4d0..2685f7e25afc 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,9 +4,11 @@ DIST ethtool-5.19.tar.xz 324472 BLAKE2B 44cc292db04f411a57a0a5ae0cdfbef733c7ee73
 DIST ethtool-6.1.tar.xz 327644 BLAKE2B 002a4edffda42520d77e8f0c27adf909090823f1a08689b67fc7c75de3048bdc9c94d7d32973bd17562d7dbf295479e796c2529b5db66b5fce42a2ede5851cd6 SHA512 6ca478ec75dae7cc347b859802e1965e6c78310ec4b276dec29bdf76d3464e4186c6e5ed0cb8f013171d6c0562c1156cb0442419f5b947c314e8b91ad9fd2d93
 DIST ethtool-6.2.tar.xz 332708 BLAKE2B b3fa2571b1efef3b686eb4f20b33e6cc32bdb8cff5f2e642454ca3d41c427b1953df7b07e5ac8ef149f8b4be614210e05e593233655e5fe317c48630b20b68e8 SHA512 ff1f14c7876163bef93ca48e22a3429f09b4bcb3e1d101ef297d9f226e3fc2d3c3f19faf5b85f54cb558479e4a408ef5356a2d12e7ba132cc4cadaf92effccaf
 DIST ethtool-6.3.tar.xz 338764 BLAKE2B c06509525db47f8ee7c220d0b880fe80323a4a00036e9698432b1b9c85ad75045e98b23498f6283497728cafd187ca173b15f3ad60f8e6f8b4d0c5688d84a1f9 SHA512 85e5ecd20abf737e94ddc093f15ab0b876f763a886e3327027c448c0efcc091628c3df42070f30583551fa12f866f5b49d41fb3333acdf854a59bba671646320
+DIST ethtool-6.4.tar.xz 340844 BLAKE2B 15fbd3f2db21b7a880d040bbd5fffc51f5335d182e1d3d23dc23d2cfd3b572fabb5914426f0e8470f4374ceddb07741ed1b57d058a57867b89c1ea2a78d13c10 SHA512 5e389564b41e9494df102f9fb703ae2d80ba38346d84ec6c89b024ec21c85eca9f58e88012290feaa88d3ce035d6f779913798b0ca177e8d0a08eff197eb6afd
 EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
 EBUILD ethtool-5.19.ebuild 605 BLAKE2B 1f0b0a87665434d31c5dc09d7902c629c118db82a39cbb3d63859bcfe7a60d69ac18e5a35c0244805926d9d044777e4ac6b4474d7526975436ed733970cb06bd SHA512 39862ccb79c301109d774a13e8862cc53654ff08278ac143a4a7b8b62178a47d6b2a341fa19804afd4d8691110c1c60cd4024f99b389bc9365ce82977f4996dc
 EBUILD ethtool-6.1.ebuild 641 BLAKE2B 30923d70692c4b580e03c17347f104d4b99ee23ebd9664c717d00273bfc22fda66e53800c71c0d2a873a186dc3ccdbef72fe3a4d7d64d5d253963f9138141b08 SHA512 7d313abdedf7c2bbe68d2f676ba85a12914b5fc80e6a132ab2da52c7c25212b06e591a186cb8f9ed949d3ab4bab404d47d357b278a6367f2c5385008a0f1112e
 EBUILD ethtool-6.2.ebuild 597 BLAKE2B 9c69f88683d78a567bff9953e758a8fd8a94582d6763cd104432a025137b7f2691a195c82e97d4499ff9194e3e7245f06ce62bff21e946d6b1f946eba394440d SHA512 a2f7a0224e8d6d7b3a2d3a7ab002cdfe7f5c40ce005f07460ecb445aea02f46979ecee1a05e4ff8ab6f0ca2e01e2135f6cd9654fe9f4ee9a9ba207711ce2d178
 EBUILD ethtool-6.3.ebuild 597 BLAKE2B 9c69f88683d78a567bff9953e758a8fd8a94582d6763cd104432a025137b7f2691a195c82e97d4499ff9194e3e7245f06ce62bff21e946d6b1f946eba394440d SHA512 a2f7a0224e8d6d7b3a2d3a7ab002cdfe7f5c40ce005f07460ecb445aea02f46979ecee1a05e4ff8ab6f0ca2e01e2135f6cd9654fe9f4ee9a9ba207711ce2d178
+EBUILD ethtool-6.4.ebuild 605 BLAKE2B 5f3dc535aca5067e234b9a3893c6101f78fc9998351a958be068f8aa16a1bcc5d46df9459f061c801a49a79af7390e3a86281dc5f5c130ad8a9c1d9fb44fe9f3 SHA512 40e6f1d78d664fd8f5b0e15269018ae6973dcb8447cef86a49dd0a78c5d5e5eee1d73005141d49082c5735576197d21bc7bd10241d2359050b1d2d056416223f
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.4.ebuild b/sys-apps/ethtool/ethtool-6.4.ebuild
new file mode 100644
index 000000000000..a7eff7664c78
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-6.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+netlink"
+
+RDEPEND="netlink? ( net-libs/libmnl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index f8f150be1ab3..4a62e3788c81 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,6 +1,8 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
 DIST likwid-5.2.1.tar.gz 2308041 BLAKE2B 1913212fb5157365a439757018ab58b4555e2b4401575ee05c784d038e13296644a7d0a89769599eef0444b13ed10f0357ad09b9cbae712f7d1fb9cca65fb1e3 SHA512 f096dcc071e976284c874aeb254dcb83c66ae808876a8c6be7b05e359d06800f1da25c01c072950c3493eb9ca10f6f9d81624feef61cc7a01f40fc0d003f98a7
+DIST likwid-5.2.2.tar.gz 2312420 BLAKE2B ceb5ee35fc266e6669f5a304bc222ae5fa598b76b0b2af9b37a214279033e8189f6c7726bdb41ad111f331a2fea52f6ff49cf190d7150b813ea651dbdc06d53f SHA512 5949933341092a1ccb81add47771c8e5613c9faef8650d70ed8e7f81cee4e6d87bc6838686873bd6270f4cfef3fd57d8a69b067f943134e4ac08c14664105d0d
 EBUILD likwid-4.3.4.ebuild 5514 BLAKE2B c7bdc0310f21b8985128bc6006f57a3bfa3746783a8bbdd6187a7569ad4ea74580a67ee6a250e0aa73960adf01066d0428a75b21479011c23a79bec54eaa4d8c SHA512 b9a511141568693eb960a4837914e8357dc814280b58e062286ba6472aedadca86e9f6cbaab89320a456df99a2edf1c61ee3978411d2d38f78690aba93160914
 EBUILD likwid-5.2.1.ebuild 4173 BLAKE2B a7525c50019c522701d7f529c22751579beaae02db35183b715fd5fb3ee5fb2a6d3a514f3637ce5c6de5606641749c8fa73e9621c189843c086f46b7416ea663 SHA512 5347087addf99de7410931de8c25bf14357dfc54f1469a1eb2103e233ad6834d6a7f4a74b01d5ed228ff963adff35d3fa615cdd4f4505ee4512d527956bc1bd3
+EBUILD likwid-5.2.2.ebuild 4173 BLAKE2B 62a928cd75119076637a43651f95958d573a1dee01f1f1f5a9b3bc9644a76fc67ea5e8df1b2e152f1d6af2be0ed45915270db37b9cac3ebd314f59b55d1fa7fe SHA512 4d6e74ccf735351a27b90813eb8c883fdfc7479aa3abcf9990c443ff2cddbeb6141c195b298fef66856c29c667f7e293c2a5dca74893f722b5f33d1570733aa8
 MISC metadata.xml 334 BLAKE2B 206f8a2f15ea7991479d3ca98b36da8b334f242063d1522addd4cbe29e8a71f77f16a2053eca6bfce78fdf38e11c4962ea70dfd3f35298f312832e312f7ababb SHA512 31565b8fb881011bb9d2f25c453e5b2b8644348cdec699ab8c28efed8dc281a35895bb795958b2376a99097eb90edb40d3998f6eea041dd979fcf716edb1731e
diff --git a/sys-apps/likwid/likwid-5.2.2.ebuild b/sys-apps/likwid/likwid-5.2.2.ebuild
new file mode 100644
index 000000000000..9e9d5ae85a94
--- /dev/null
+++ b/sys-apps/likwid/likwid-5.2.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+inherit fcaps fortran-2 linux-info toolchain-funcs
+
+DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
+HOMEPAGE="https://github.com/rrze-likwid/likwid"
+SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
+
+LICENSE="GPL-3+ BSD MIT"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran"
+
+CDEPEND="dev-lang/perl"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD
+	--
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# Ensure we build with a non executable stack
+	sed \
+		-e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \
+		-i make/include_{GCC*,CLANG}.mk \
+		|| die "Failed to set nonexecstack"
+
+	# Make the install targets respect Q= for being quiet or not
+	# MUCH easier for debugging
+	sed -r \
+		-e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \
+		-i \
+		Makefile || die "Failed to sed Makefile"
+
+	sed -i \
+		-e '/^\.NOTPARALLEL:/d' \
+		Makefile \
+		bench/Makefile \
+		ext/hwloc/Makefile || die "Failed to re-enable parallel"
+
+	default
+}
+
+export_emake_opts() {
+	# Warning: this build system uses PREFIX in a way that differs from
+	# autoconf! It's more like:
+	# PREFIX=$(DESTDIR)$(INSTALLED_PREFIX)
+	# it's not 100% like that, because parts of the Makefiles are inconsistent.
+	# this is the same solution used in the upstream RPM specs
+	# these variables are uppercase so they match what's put into Make.
+	local INSTALLED_PREFIX=/usr
+	local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
+	local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
+	# If the build is too loud, pass 'Q=@'
+	src_compile_opts=(
+		"Q="
+		"INSTALLED_PREFIX=${INSTALLED_PREFIX}"
+		"INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}"
+		"PREFIX=${INSTALLED_PREFIX}"
+		"LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${INSTALLED_MANPREFIX}"
+		"CC=$(tc-getCC)"
+		"ANSI_CFLAGS=${CFLAGS}"
+		"INSTRUMENT_BENCH=true"
+		"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
+		"FC=$(usex fortran "${FC}" false)"
+		"FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly
+	)
+	src_install_opts=(
+		"PREFIX=${D}${INSTALLED_PREFIX}"
+		"LIBPREFIX=${D}${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${D}${INSTALLED_MANPREFIX}"
+	)
+}
+
+src_compile() {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		|| die 'emake failed'
+}
+
+src_install () {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		"${src_install_opts[@]}" \
+		DESTDIR="${D}" \
+		install || die 'emake install failed'
+
+	use fortran && doheader likwid.mod
+
+	# Fix Python filter added shortly after 4.3.3
+	#python_fix_shebang "${D}"/usr/share/likwid/filter/
+
+	# Do NOT use 'doman'! The upstream 'make install' target does a sed as it's
+	# generating the final manpage to the real install dir; and the copies in
+	# ${S} are unmodified.
+	dodoc README.md CHANGELOG
+	dodoc doc/*.txt
+	dodoc doc/*.md
+	dodoc -r doc/applications doc/archs
+	# Fix upstream partial doc install
+	rm -rf "${D}"/usr/share/likwid/docs || die
+	ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die
+}
+
+pkg_preinst() {
+	# This is now a symlink, but used to be a plain directory
+	OLDDOCDIR=/usr/share/likwid/docs
+	if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then
+		einfo "Cleaning up old docdir at ${OLDDOCDIR}"
+		rm -rf "${OLDDOCDIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!"
+	einfo
+	ewarn "To enable users to access performance counters it is necessary to"
+	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
+	ewarn "It can be accomplished by adding the following line to file"
+	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
+	ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660"
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 231c4f239e39..63aafe43d638 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,5 @@
 DIST osinfo-db-20230308.tar.xz 138760 BLAKE2B d4b6a2b80f1fd20c57da0f37d47fda30a7fa254f657d173086b3bc3d6cb9b955e1d8b5bd82312c1396c2e4f300ace13f4bdf46e3cec94da33af81f1bd3e73acd SHA512 d59effc4b36a47b95f03a881a392594cd82f0d4b406003288468e7e31be002db061af4674082af34f339a00835d245d7a38d3788e58b74e3cdf01a455b94b860
 DIST osinfo-db-20230518.tar.xz 142340 BLAKE2B d64a53fd4891b3f71d3e6470fc57dbd59d314f7eca6561d9b4a1985a24cd662a9fc35943b67f35f73a218028e16a2f15f3bc7b771fe1231508f2b76941a53c28 SHA512 16a275c8df9df8256b117896b749b060f7b63aa59e468d968fafdb68ee8654c73cd659c6b8bf36e91a0d5892d6d83a29d98b9fc77dd1286f8f25ffca289bba4e
 EBUILD osinfo-db-20230308.ebuild 699 BLAKE2B d039878d19b83c2c72c4e791de677279aa69a0015bffba18adc7f57444ee5c9b942b09bf36e350d19ffcbe8d3ba62640cf2591452da7af3c680ddde139434016 SHA512 52cb2fadb90628750b39e822da6afd0e7acdbbc414241bc87bf75d66fb276227e35f470d788f40c77aa51bab23ea614c521689d2e330d0aadaeb756589e53dcd
-EBUILD osinfo-db-20230518.ebuild 702 BLAKE2B 51a14f3f014f2aeab578adb2092bea20500f7144666056c74870d1963d227c8fbd52121dd5ad5afd8b85520d788e05e2d7ab74fd5797276f2ce2ce38661b0bdc SHA512 2c1e9ca52148b6246bb494846989657d232a348e7b5526cb83cb108ca9f8b7496776743a63e386803faa70570da9f6b4f217e5ea463db64d19fbcc7dcf02b081
+EBUILD osinfo-db-20230518.ebuild 701 BLAKE2B d7516d548c63cb4eaadd1f9fc7cfa46bbaa99efa25be707e3c2cd8bcbac0aafbbc27210a1dd7e220e06a3e5761cafeaf17ffada4a8a0efa7792b7bb3837f96b4 SHA512 83070ec2bfc065ba5f89c014d3a40151d1ceec564080967baf89b2e5a304c48f3d7345930c30d65a96c3b48f2c9467b415e1072ca46963945fd2bc4b28ef890c
 MISC metadata.xml 348 BLAKE2B fcfdacef0e6fc650338b935811d7b2ff4460497bb332b87312bd4c69c7ac260d9dc5288b383be27b1522a9ff9717a51fd4b2bd8d97f67e359ca8e5ff6c2c5c64 SHA512 4519bf98303033ae9fa40088f38eb6d703053eb6896d939756669dcf50404c5dac577fd3870afa4be5e40da4d4901b65f452b6779dac886d1673866b3e0f6f2c
diff --git a/sys-apps/osinfo-db/osinfo-db-20230518.ebuild b/sys-apps/osinfo-db/osinfo-db-20230518.ebuild
index 82e86e48b879..020661983bca 100644
--- a/sys-apps/osinfo-db/osinfo-db-20230518.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20230518.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"