5 files changed, 77 insertions, 90 deletions
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 4d850364f09a..348aca814d67 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -1,7 +1,5 @@
-DIST papi-5.3.0.tar.gz 3928589 BLAKE2B 64531442b5ebe846ba801455c3cb15437ee2d5eec8b4d567f4bf96f1c08e2af26aedcae0c5601e00e5454aa5ad5d482a6b113a52a20d5b2819161c82b51f8fb5 SHA512 a88d28d895a1b44b0d05ac90c39406b7e9806a1d865b39df405e55b27d7f6bb191330ed7df52d4f3f04f46ff94ce867e6c1bdd9b38c314652cff1ee9d838b226
-DIST papi-5.4.0.tar.gz 4075657 BLAKE2B 17d92eb379ef7c45071c32ca0bbf9baecd0044ed019a2aa731da32d9bb92fad707375f555dc87adc1a8e90e27d2d850c673fbc71c3f2a55f8621151ff21087bc SHA512 be4a929208a83765f99f2f34e98d6770bf46d4f336e492506cc86d6a34fbf84754b05cfd22db0949b382bb8f24ad0ed7f5e7c90941baad2593b82827ee27eb4a
 DIST papi-5.5.1.tar.gz 4233127 BLAKE2B e065bed5a5607bf5ce3459ea84e1dabd6a60cd1f78f3ec2fbed29676ff79a057c77bd4210b8c45428238d927016a5a1e16d7bdfb4a9f56ea1e180cb0b19ec182 SHA512 c65c3a4e95c33ee7ceb950c184c08019d83cfee38bfe1bac86e80670a5191918edab2916b6815b15001da961deb8b6cf51263541554eb92a817e1a48371cfcf5
-EBUILD papi-5.3.0.ebuild 772 BLAKE2B 9db4730a4a95a941529ffaf3e5489d780fe5c511d8c603fc9b03bb3194a9781e0410d9005b21b3bf3ccdb04e6d85e8b110dda405baeba88c48f0034638d08429 SHA512 f5e657cebfee7ee195c79d6a0ed4accbd23b9eab00dc4ec180c3462bfb294ff0fd4e79c68fb657df0d2312ff37b5c48a0f95d5d71f1e4c385cb367adce9a383d
-EBUILD papi-5.4.0.ebuild 772 BLAKE2B 06032f873fc2d668356e642b3dafa34a7c49b4e0ee4fa8872aa48c0ca129206d32ff3c90768d6592dc82f72973c7d094648401a29a8ab5986d49ddd64ce5ddbf SHA512 60b7c896577c5de092f3d9ca0212c7ed14c0cbbdf348b653625c02613d6a588aca59fbc912fa858cbce9c6fb173cbc1fbe0a457579dc8579f65f948645853717
-EBUILD papi-5.5.1.ebuild 772 BLAKE2B 2be068a30e34f1689019be6bb30e331b207ed0b2b85e2b632a14973f72c863fd3484e62fe8bd31cb17e2e9d41511d45497e32582e94ca146d60f7da082b804c1 SHA512 1f5a94fb7299e179bc2c479fc891ea63e65788ca5f55272c4faa1246770aff9480cb9a067726c78640d72b7f68c68e1535df19aaa138d2b092449da5ef0f3c79
+DIST papi-6.0.0.1.tar.gz 4665285 BLAKE2B 5b6b2de8c16510a05a57159ceba591625c78f2a6d4ea62979fea4dd3e72bce73138e36480d82e13713c9ff2298e00330619fa57fdc7f81d75e1ce519b6f600ae SHA512 54c37b49858e921bd1357d8b0bba12c27e40e89b1354d89e5a85672ef3e6d3a4784212079098004256369a172d744580fb283741e7b4ac2d6fa5642bc42ea2ad
+EBUILD papi-5.5.1.ebuild 817 BLAKE2B 6bfc966ebc939823b356d123fec16a8fe3c402a31fa0ed9218024cccd5cf7ce71a2c9263ae9b081f9048886c0a5ed09e17c3f7ae94968bf1a1792f4651451bb4 SHA512 d386295abaf4c244f4bcb5cff018c9be53c5732d90d5c78357449a9638b265ad2a2528481143e20f7589813b21ac3676a45ab2a490752a4052c70646fb3ea7fe
+EBUILD papi-6.0.0.1.ebuild 1118 BLAKE2B 841bc96e9e64018da26bc1ee9698d0e202d77fee3dd24dd364018c1bf013fd637d85f035807200acceb91a2ec3d01f1794f69b32e2d5c1613c05b7fc0ce6cbb3 SHA512 9fa6411201f4142169e477ae4f18039fa6076f7b5d58c4f449f6ad6ad14c60ed91d338fef15245c07b1878647a0351d022bb9e716c988ff06b20c77453ee0d9e
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-libs/papi/papi-5.3.0.ebuild b/dev-libs/papi/papi-5.3.0.ebuild
deleted file mode 100644
index e2aa6283e644..000000000000
--- a/dev-libs/papi/papi-5.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
-
-DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="http://icl.cs.utk.edu/papi/"
-SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/libpfm[static-libs]
-	virtual/mpi
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
-
-src_configure() {
-	local myeconfargs=(
-		--with-shlib
-		--with-perf-events
-		--with-pfm-prefix="${EPREFIX}/usr"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc ../RE*
-}
diff --git a/dev-libs/papi/papi-5.4.0.ebuild b/dev-libs/papi/papi-5.4.0.ebuild
deleted file mode 100644
index 9a415cc1b998..000000000000
--- a/dev-libs/papi/papi-5.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
-
-DESCRIPTION="Performance Application Programming Interface"
-HOMEPAGE="http://icl.cs.utk.edu/papi/"
-SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
-	dev-libs/libpfm[static-libs]
-	virtual/mpi
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
-
-src_configure() {
-	local myeconfargs=(
-		--with-shlib
-		--with-perf-events
-		--with-pfm-prefix="${EPREFIX}/usr"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	dodoc ../RE*
-}
diff --git a/dev-libs/papi/papi-5.5.1.ebuild b/dev-libs/papi/papi-5.5.1.ebuild
index 0d2f0f2c48e2..2667603df0e8 100644
--- a/dev-libs/papi/papi-5.5.1.ebuild
+++ b/dev-libs/papi/papi-5.5.1.ebuild
@@ -1,38 +1,47 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils fortran-2 versionator
+inherit autotools fortran-2
 
 DESCRIPTION="Performance Application Programming Interface"
 HOMEPAGE="http://icl.cs.utk.edu/papi/"
 SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)/src"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
 
 DEPEND="
-	dev-libs/libpfm[static-libs]
+	dev-libs/libpfm
 	virtual/mpi
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
 
 src_configure() {
 	local myeconfargs=(
 		--with-shlib
 		--with-perf-events
 		--with-pfm-prefix="${EPREFIX}/usr"
+		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-shared-lib=yes
+		--with-static-lib=no
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	dodoc ../RE*
 }
diff --git a/dev-libs/papi/papi-6.0.0.1.ebuild b/dev-libs/papi/papi-6.0.0.1.ebuild
new file mode 100644
index 000000000000..f63cab71642c
--- /dev/null
+++ b/dev-libs/papi/papi-6.0.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2 toolchain-funcs
+
+DESCRIPTION="Performance Application Programming Interface"
+HOMEPAGE="http://icl.cs.utk.edu/papi/"
+SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libpfm[static-libs]
+	virtual/mpi
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	# TODO: Could try adding
+	# --with-static-user-events=no
+	# --with-static-papi-events=no
+	# --with-static-lib=no
+	# --with-static-tools=no
+	# but this requires fixing the homebrew configure logic for
+	# little gain
+	local myeconfargs=(
+		--with-perf-events
+		--with-pfm-prefix="${EPREFIX}/usr"
+		--with-pfm-libdir="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc ../RE*
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}