gentoo resync : 08.01.2021

4 files changed, 3 insertions, 80 deletions

diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index b428e0664498..709f816ddb21 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,6 +1,3 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
-DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.10.1-r1.ebuild 943 BLAKE2B f7bed42ab115ce1621b1937f81fc5e3cc76a11047bb6f1f8484170f6c7fc94db4e5c382112e8caca83242df5173b3c6426bae8ecefa4d35f070b46b0262c9a4f SHA512 73644399740a6c5b855b4becd7feb02c966549553081d9f3214c943823ec12371ee35dfe518115dcdb1683bd7a0d84091350a8315e8c3aa17bf2d704423102a5
-EBUILD libpfm-4.10.1.ebuild 911 BLAKE2B ac53ebf9f52a16f7e858a3ed19f819a2fac6b701ca0d004161560c8d7fe6fff89ff8e2e554c7daf0ac27b15fad3c141ed56fa56cb392b674f2ee6176110ffa59 SHA512 3144203053c462d094ffc34932328837898dac743bbccaa46d0bf0a1e076294cac0bfd4cb639e68dc0ed5e1cef1ad443060c139bebb25fc3eac7889e6a683f96
-EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
+EBUILD libpfm-4.10.1-r1.ebuild 938 BLAKE2B a57f15b153b0c398c04567f3bce545b72f8d59c9643effe8589dabe4c2756489f53caf846c01780d60ed49fd8e249b4860cab99bb880a89710461756d680e022 SHA512 36e56b878cd1674914d3ee10f8d848187547b56b739faaf2515500187b76249340daafb790686affb38436568436ad12623e8d0e442e7dfca67846b225a3dabf
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index 1e0e67de31be..c99c4ffbcb76 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libpfm/libpfm-4.10.1.ebuild b/dev-libs/libpfm/libpfm-4.10.1.ebuild
deleted file mode 100644
index cb4c5baa3478..000000000000
--- a/dev-libs/libpfm/libpfm-4.10.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Hardware-based performance monitoring interface for Linux"
-HOMEPAGE="http://perfmon2.sourceforge.net"
-SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
-		-i lib/Makefile || die
-	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
-		-i config.mk || die
-}
-
-src_compile() {
-	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake CC=$(tc-getCC) DBG=
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr"  install
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' +
-	dodoc README
-}
diff --git a/dev-libs/libpfm/libpfm-4.8.0.ebuild b/dev-libs/libpfm/libpfm-4.8.0.ebuild
deleted file mode 100644
index 6bc1cc01205c..000000000000
--- a/dev-libs/libpfm/libpfm-4.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Hardware-based performance monitoring interface for Linux"
-HOMEPAGE="http://perfmon2.sourceforge.net"
-SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
-		-i lib/Makefile || die
-	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
-		-i config.mk || die
-}
-
-src_compile() {
-	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake CC=$(tc-getCC) DBG=
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr"  install
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' +
-	dodoc README
-}