gentoo resync : 03.03.2021

4 files changed, 12 insertions, 71 deletions

diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 9d0c99be91f0..9c30d0424b33 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,7 +1,6 @@
 AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
-EBUILD libint-1.1.6.ebuild 955 BLAKE2B 3b9e1a5074e9d8ff91ad97b7682a0cd658abe256c331c9b270056148aba64fd0e0eb9a0f93388b25d880c9ef017408e768888fe5463900e8264f85e0c843645a SHA512 53f1b0ffc316cb021f05ca6432c24ea8c316bcb87f02149a7a0f8b6401c845d13a5f20b4fa954eee0c25c32b5325bc1f01de8ac183492c9b6f36994c7fddc491
-EBUILD libint-2.6.0-r2.ebuild 1410 BLAKE2B c7711ab08a0479791d75e93906b328d469fcaedbc34f53a9fa6e92f4bfaf0cef9dc84c5f61407ac73ace663cf1d586da8380be268ff3632421f9154d9096b7ed SHA512 d65fc01982c69a7a291f1481e3c2e2aedda5f0401a54949748011288acac9478d68a48027714390072ba34fdc22eb741df69addf3c52431db45f2576ee93c94d
-EBUILD libint-2.6.0.ebuild 1141 BLAKE2B a2c257f44c010d68f80b14e32b7f260d0019daa9b30f0bdffd691e51875dcf74b076d8f9d5700aa666588944b210429b9e3598f3494a3b33f23dda30e65279a4 SHA512 96e8d062ac2237fc357a6d93161ac364491c0be9a91da5ca11ef66f65492667658cef1c82d98185b4d93554e91bf11d3c51fbf18be5cf04e4ed2847a0f071b08
+EBUILD libint-1.1.6.ebuild 874 BLAKE2B 334ebcd9d4a9a076197af69a0ce563173ba550917c4edb5427010355873716d2210d46e978e97078926cf280914129ff61fdf8d399f743d182bad68145cdb542 SHA512 0a8a04f2416c199d9c346d02cd11011cf3558f04d9c141a67b073cd9ecf2b77cace9ff8eda1b3a6e611a018ad235e5febd6a62e2d1a809444952a191c2f20210
+EBUILD libint-2.6.0-r2.ebuild 1408 BLAKE2B 7cca957dcd7de7df144a8350885cfce49f908f2b5da4359cd6e8bb18400f619fd8d05fe50a00259a62f49c33a056405a889129c4300531753c920a149339f791 SHA512 d9751f547c86c9e55df05791a93f86acc08f3e6fd4854dd45e667bdab6dcf107d38f1a9e19c8680836d24bef357a2de92c25fb8088a08d995988bb6b51d3d546
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index 760d266a7811..f3a93eaaacdf 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.6.ebuild
@@ -1,20 +1,17 @@
-# 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_AUTORECONF=true
-
-inherit autotools-utils fortran-2 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators -)"
+MY_PV="$(ver_rs 0- -)"
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
 HOMEPAGE="https://github.com/evaleev/libint"
 SRC_URI="https://github.com/evaleev/libint/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="1"
 LICENSE="GPL-2"
+SLOT="1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
@@ -24,7 +21,8 @@ PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
 src_prepare() {
 	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -36,5 +34,5 @@ src_configure() {
 		--with-cc-optflags="${CFLAGS}"
 		--with-cxx-optflags="${CXXFLAGS}"
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
diff --git a/sci-libs/libint/libint-2.6.0-r2.ebuild b/sci-libs/libint/libint-2.6.0-r2.ebuild
index 0297d5bfea81..a07d7360830c 100644
--- a/sci-libs/libint/libint-2.6.0-r2.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r2.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="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
deleted file mode 100644
index 774bdc758b4a..000000000000
--- a/sci-libs/libint/libint-2.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="https://github.com/evaleev/libint"
-SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs doc"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/gmp[cxx]
-	doc? (
-		dev-texlive/texlive-latex
-		dev-tex/latex2html
-	)"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-cxx=$(tc-getCXX) \
-		--with-cxx-optflags="${CXXFLAGS}" \
-		--with-cxxgen-optflags="${CXXFLAGS}" \
-		--with-cxxdepend=$(tc-getCXX) \
-		--with-ranlib=$(tc-getRANLIB) \
-		--with-ar=$(tc-getAR) \
-		--with-ld=$(tc-getLD) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-
-	use doc && emake html pdf
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		DOCS=( doc/progman/progman.pdf )
-		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
-		einstalldocs
-	fi
-}