gentoo resync : 31.05.2021

10 files changed, 9 insertions, 190 deletions

diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 3a310b8d597b..214c4b6c36b5 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
index 1534cc18ff8d..7986db0feccd 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1,3 +1,3 @@
 DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
-EBUILD gelemental-2.0.0-r1.ebuild 770 BLAKE2B c7b578b3da601e3691b14a1bd8715d67a249e0c029a342871cb039a333291d208d9dd23c8b034a6f36f61dc8e68252efdcd7af67bd8f0f0837f1955d9fc032a8 SHA512 987740e122b7d9128120ce1878ae578d6e8a2cfd67ec7b50be91ca8c98a3d9765160b7ff7eb276f6536ef99a66b3325eab546dd5800a6b60ab7791b1b365f777
+EBUILD gelemental-2.0.0-r1.ebuild 818 BLAKE2B 85091e4b1bd360cf0c86790ace65e6f0a289bc21d76ac174802aac13127886d34bec680958b377107fb1a324b75c312b551cd01ce3fb26e471cebfca3e3b3993 SHA512 fb33c8b0fcdc207f42432857c79aeceebf6c4a52c53dbb29eccf27866003cebd88a75a00df89376901b6c49621908b673546c6cfb3a190f5cce9fcc1d99f9b08
 MISC metadata.xml 455 BLAKE2B 7db9d6b4a8896df6385ae2c8c2b8c771c1a6ae82a1072f6d3f9b27fbd7c4d0f3546a03ced3350331d25f48e5631855fc9653a808d49631803f2d526db75b3ac7 SHA512 815bcad86f574f7cb2dfef3205e2a6398f5fd2512395c0c016733d4cb001f70c0003f494a69bc9bc66d675a9eaa89c203ace13f17f4a9f2c6805a34fcf5125d8
diff --git a/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
index 99ac4cd0e9fb..bcad4a31e18e 100644
--- a/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
+++ b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
@@ -33,9 +33,12 @@ src_prepare() {
 src_configure() {
 	append-cxxflags -std=c++11 #566450
 
-	local myeconfargs=(
+	econf \
+		--disable-static \
 		$(use_enable doc api-docs)
-	)
+}
 
-	econf "${myeconfargs[@]}"
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-chemistry/gmxapi/Manifest b/sci-chemistry/gmxapi/Manifest
deleted file mode 100644
index f1576e68d745..000000000000
--- a/sci-chemistry/gmxapi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gmxapi-0.0.7.1.tar.gz 671400 BLAKE2B 5db024bceaed262fc1bd2ef35c0c24a31eff12abde7766ba0eea9d5aabe04c435cdf3c79c04d7932f2110de837a0d06e1f66239f22ba6f313410ed8c9d899788 SHA512 4103d67be3c869907613ec74fc46f14b15242ad93a973fc984dbb25e79bb0bb697d9d2ad9b67a8da2500e5a89b8f78ea1ef1632455af29830e11c2bf1f11bc44
-EBUILD gmxapi-0.0.7.1-r1.ebuild 1190 BLAKE2B ae63d0c7e5671d366514ed3bfbad84086931f31c509f7f9d6b898e26fde7f29001ada3d8aa7949b96991152b4363083d015b34d47ea837bdb3b5ecab9fdf4075 SHA512 a6841d9d67846125a19d722aa87d445fac06cd91fa225daa66bc47bd05a5c3dd9b2a54f6ba2d871f63710d58db50b4e23010ece7c14250fe9f363d4c2f9965aa
-MISC metadata.xml 374 BLAKE2B d93e2ad2f09971909382ad65fc5f5033487979b0694f9dc656439573973f55ce1865e5a30584e55e1c48fdd93898601ac2b11e269fb2b1c5adc3ff8dde66f35d SHA512 1c61c58e1cfbbb42342f7a87625e0044e51523f7a2f7270ecfea537c622965e64195fc88eb8f70fac648a0154a19f4a852b88383de1dcd6e17ff0ac0dc6e22d8
diff --git a/sci-chemistry/gmxapi/gmxapi-0.0.7.1-r1.ebuild b/sci-chemistry/gmxapi/gmxapi-0.0.7.1-r1.ebuild
deleted file mode 100644
index 8f1ee185df7f..000000000000
--- a/sci-chemistry/gmxapi/gmxapi-0.0.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="Gromacs API bindings"
-HOMEPAGE="https://github.com/kassonlab/gmxapi"
-SRC_URI="https://github.com/kassonlab/gmxapi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=sci-chemistry/gromacs-2019:="
-RDEPEND="
-	${DEPEND}
-	dev-python/networkx[${PYTHON_USEDEP}]
-"
-BDEPEND=""
-
-src_configure() {
-	my_impl_src_configure() {
-		local mycmakeargs=(
-			-DCMAKE_STRIP="${EPREFIX}/bin/true"
-			-DCMAKE_INSTALL_PREFIX="${ED}/usr"
-			-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-			-DGMXAPI_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${EPYTHON}/site-packages/gmx"
-		)
-
-		cmake-utils_src_configure
-	}
-
-	python_foreach_impl my_impl_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make
-}
-
-src_install() {
-	my_impl_src_install() {
-		cd "${BUILD_DIR}" || die
-		cmake-utils_src_install
-		python_optimize
-	}
-
-	python_foreach_impl my_impl_src_install
-}
diff --git a/sci-chemistry/gmxapi/metadata.xml b/sci-chemistry/gmxapi/metadata.xml
deleted file mode 100644
index 7daa2ce7e5f8..000000000000
--- a/sci-chemistry/gmxapi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-chemistry/gnome-chemistry-utils/Manifest b/sci-chemistry/gnome-chemistry-utils/Manifest
index 0775a087ed1e..11ba426ba895 100644
--- a/sci-chemistry/gnome-chemistry-utils/Manifest
+++ b/sci-chemistry/gnome-chemistry-utils/Manifest
@@ -1,6 +1,4 @@
-AUX gnome-chemistry-utils-0.14.17-gnumeric.patch 2242 BLAKE2B 1fef5e8aa58e26d22cf2b3e57250f335950e1ddca635f72c00d4f09d1b3a7654691b53628d7628d9ff33690542d99d42a885a596c2a5484478e0455af2d2b757 SHA512 3f723f5bce350f8b2c778755c323c2d6009e761c16634ec40764a330ddfdfa057b5d9eabadeb212cedab300b44f09ae4778530d599c1c989ed4046b5da8b2cd2
 DIST gnome-chemistry-utils-0.14.17.tar.xz 5911248 BLAKE2B 5d3bb4afbe3d3f620912e810717f08674d56a11c384b1fb239788cfbbb625797e8c52de2b6d940ae7f3d83847533afedd6ed961b1fa0ea1cec62dda88de1a6df SHA512 01bb964e1484e028c5965f1de74798422b448823047fcadf668dc76e98b3e214939a2f031d0182c717c4376f490e5969a4604ee66d1763e6b480032d7ae97468
 DIST gnome-chemistry-utils_0.14.17-5.debian.tar.xz 67836 BLAKE2B af9365a25740d11f798daaf38880e040c6d66b5ba0b27f52da9bc4f1391568f572eeefa6360089382a966c630b9e362276a535553faa0c0d1a498619fb500543 SHA512 15bb81b1a03c778807dd16d98bc8608fb4d0488ea33d277a048487b3b440abd0ba64edb907a57650e9b0be9dc1a6826a9baaf4a74fc140836f38baf790a767ec
-EBUILD gnome-chemistry-utils-0.14.17.ebuild 1376 BLAKE2B a8208b91a1126d43b638d60a7c8ae13bbc4f14dee21df8b114af5be271e9e1e1a9815cc220418eb185d58bc6d50e3153dc8470813089182dcc1d97535468f9e0 SHA512 56d2721c19ad1416b559cfe9c278b4034801ed3e59354a54e35a494cdc045264c83a2a357f0f756b8f9379f462bf9c28e58bfa0298725cb0489d7e7bbc44178b
-EBUILD gnome-chemistry-utils-0.14.17_p5.ebuild 1599 BLAKE2B 107bcdd12a72ef528fd73c0249be6b8c78ad06c31f72c070f11fced37f10463bf3377a1cec464aa8b3fcb70a9a95985e6efa7664987f1d11ec64eeebdb7109ad SHA512 3a549ba4917bf09982365b33aa175ecefdca4e9054f41ed406955664fbfb09ff336ae435f16a37f2652c118ea0635bec9cbd1d35d4840f344a45246a4855b02b
+EBUILD gnome-chemistry-utils-0.14.17_p5-r1.ebuild 1612 BLAKE2B 32e31d5ca9a8edc7e01cf4ddef92407e70ca1ade40c1e0b86c46423e47f90e2ffe3e7f8ce0e50fd1392ca77cdf4874e365ce02ef1abba440a368c97a9e0ffa6a SHA512 2434a21e0def1b3f23dc5792d49fc80c9ee997377caeb6f267b7592a956f51c3582dccf04fded015e10424bee97fb6bf117e4fc5062e4cbda4f53fe525b3c3a9
 MISC metadata.xml 336 BLAKE2B 3a1270d31b630b57fc2fc272992b191bba7106355dd176c8fc8ebfe2a92f3aae68284448df2dc43682c6663d8e087320c979d2539a3d10ae5706be2e5b8c35e7 SHA512 eddb0149bf60d2149ab99cd49486c9252815787cb6b1c41e1cd11ea2897df619d4186e6f84cda414f977f8877b7d23ce92b92fcee5918de8b3441fdebe834bb8
diff --git a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch b/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch
deleted file mode 100644
index 826d9b056df8..000000000000
--- a/sci-chemistry/gnome-chemistry-utils/files/gnome-chemistry-utils-0.14.17-gnumeric.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: gchemutils/configure.ac
-===================================================================
---- gchemutils/configure.ac	(revision 2072)
-+++ gchemutils/configure.ac	(revision 2073)
-@@ -352,7 +352,7 @@
-   libspreadsheet=libspreadsheet-1.12
- fi
- 
--PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.11.6], [build_gnumeric_plugin=yes],
-+PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.12.42], [build_gnumeric_plugin=yes],
- 		[build_gnumeric_plugin=no])
- dnl --without is not handled
- 
-Index: gchemutils/gnumeric/functions.cc
-===================================================================
---- gchemutils/gnumeric/functions.cc	(revision 2072)
-+++ gchemutils/gnumeric/functions.cc	(revision 2073)
-@@ -195,23 +195,23 @@
- const GnmFuncDescriptor Chemistry_functions[] = {
- 
-         { N_("molarmass"),       "s",
--			help_molarmass, gnumeric_molarmass, NULL, NULL, NULL,
-+			help_molarmass, gnumeric_molarmass, NULL,
- 			GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
-         { N_("monoisotopicmass"),       "s",
--			help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, NULL, NULL,
-+			help_monoisotopicmass, gnumeric_monoisotopicmass, NULL,
- 			GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
-         { N_("chemcomposition"),       "ss",
--			help_chemcomposition, gnumeric_chemcomposition, NULL, NULL, NULL,
-+			help_chemcomposition, gnumeric_chemcomposition, NULL,
- 			GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
-         { N_("elementnumber"),       "s",
--			help_elementnumber, gnumeric_elementnumber, NULL, NULL, NULL,
-+			help_elementnumber, gnumeric_elementnumber, NULL,
- 			GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
-         { N_("elementsymbol"),       "f",
--			help_elementsymbol, gnumeric_elementsymbol, NULL, NULL, NULL,
-+			help_elementsymbol, gnumeric_elementsymbol, NULL,
- 			GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
- 
- 
--        {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-+        {NULL, NULL, NULL, NULL, NULL,
- 			GNM_FUNC_IS_PLACEHOLDER,  GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}
- };
- 
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild
deleted file mode 100644
index 40a653132cd5..000000000000
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg
-
-DESCRIPTION="Programs and library containing GTK widgets and C++ classes related to chemistry"
-HOMEPAGE="http://gchemutils.nongnu.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/gchemutils/$(ver_cut 1-2)/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-IUSE="gnumeric"
-
-RDEPEND="
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/libxml2-2.4.16:2
-	>=gnome-extra/libgsf-1.14.9
-	>=sci-chemistry/bodr-5
-	>=sci-chemistry/chemical-mime-data-0.1.94
-	>=sci-chemistry/openbabel-2.3.0:0
-	>=x11-libs/cairo-1.6.0
-	>=x11-libs/gdk-pixbuf-2.22.0
-	>=x11-libs/goffice-0.10.12
-	x11-libs/gtk+:3
-	>=x11-libs/libX11-1.0.0
-	gnumeric? ( >=app-office/gnumeric-1.12.42 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-doc/doxygen
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-
-	# From Debian
-	eapply "${FILESDIR}/${P}-gnumeric.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# lasem is not in the tree
-	econf \
-		--without-lasem \
-		--disable-mozilla-plugin \
-		--disable-scrollkeeper \
-		--disable-update-databases
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
-	rm -rf "${ED}"/usr/share/mimelnk/ || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p5.ebuild b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p5-r1.ebuild
index a2d0737c7d30..39ccfb1ca63b 100644
--- a/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p5.ebuild
+++ b/sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17_p5-r1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	>=x11-libs/goffice-0.10.12
 	x11-libs/gtk+:3
 	>=x11-libs/libX11-1.0.0
+	virtual/glu
 	gnumeric? ( >=app-office/gnumeric-1.12.42:= )
 "
 DEPEND="${RDEPEND}"