gentoo resync : 31.05.2021

4 files changed, 2 insertions, 112 deletions

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}"