gentoo resync : 17.02.2021

4 files changed, 43 insertions, 59 deletions

diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 50fcc9c43adc..f976d28e9645 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,7 @@
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
-DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
+DIST libxc-5.1.1.tar.gz 43264474 BLAKE2B 887dc11a6385559edc5e2e62f3e00b16ff5695e1c384196bc3efe5aceff0a223d5f69fafaa08290bdf72f95390cb82d43e541ffaf6c4569e850eed3cb63aa5f6 SHA512 467ff09c39df30ccd50447dda5bbfe9e5f3e8f2876e069b6c16d49b3cfcc8b45316640f5b16c56ff7645355be9ec4dc571c794a17accb7731cd22bcce53f8b99
 EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
-EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
-EBUILD libxc-5.1.0.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
+EBUILD libxc-5.1.0.ebuild 754 BLAKE2B cf5a8a44a213a26f36dec2f3e117a67673bfe6c40fb010979e36400dd6f4453338b0d72bc9598791634a5ee58c9a159a743b184015b622b037d37c9ed9802683 SHA512 0030d324b01722be1f626eea903b3c7668eee887c95af75c191ab30b997c218a2006e55c33ce90d1cdd8fc480065eea69b4ac649a2dea367191317a49328a43b
+EBUILD libxc-5.1.1.ebuild 734 BLAKE2B f70b99de4e20a3a804e313df8cab0a19f4a49302e95cae04b0eaf903aab77360de15b0973e2da77d9c8683e67b6e763ccaa203b94eb75edbbf44dc0b99c6bcb8 SHA512 363fe83ad3db822e421f154c03d9909e63a8425066fb861540f55b65c1de73740a83523f374ad976c8b63508d06ba7a5466775f9e80d1de501a75007e99561ae
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-3.0.0.ebuild b/sci-libs/libxc/libxc-3.0.0.ebuild
deleted file mode 100644
index a54c26ddfc3a..000000000000
--- a/sci-libs/libxc/libxc-3.0.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=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic fortran-2 multilib
-
-MY_P=${P//_/-}
-
-DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="https://octopus-code.org/wiki/Libxc"
-SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="fortran static-libs -test"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "s:${PN}.f90:${PN}.F90:g" \
-		-i src/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_enable fortran) )
-	autotools-utils_src_configure
-}
-
-## Upstream recommends not running the test suite because it requires
-## human expert interpretation to determine whether output is an error or
-## expected under certain circumstances. Nevertheless, experts might want the option.
-# The autotools src_test function modified not to die. Runs emake check in build directory.
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	make check || ewarn "Make check failed. See above for details."
-	einfo "emake check done"
-	popd > /dev/null || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-}
diff --git a/sci-libs/libxc/libxc-5.1.0.ebuild b/sci-libs/libxc/libxc-5.1.0.ebuild
index bade5f34f401..884100437a30 100644
--- a/sci-libs/libxc/libxc-5.1.0.ebuild
+++ b/sci-libs/libxc/libxc-5.1.0.ebuild
@@ -33,6 +33,7 @@ src_configure() {
 
 src_install() {
 	default
+	dodoc ChangeLog.md
 
 	# no static archives
 	find "${ED}" -name '*.la' -type f -delete || die
diff --git a/sci-libs/libxc/libxc-5.1.1.ebuild b/sci-libs/libxc/libxc-5.1.1.ebuild
new file mode 100644
index 000000000000..bade5f34f401
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -type f -delete || die
+}