gentoo resync : 14.05.2020

7 files changed, 10 insertions, 187 deletions

diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
index ed8170f6400e..5f208c77f299 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1,10 +1,3 @@
-AUX gelemental-1.2.0-doxygen.patch 1281 BLAKE2B 5be47d1041d1d5d8c9a0857fabc94ca981dea984e6aad0f074b0faebb3de1e92b06d3e7b49fef00478b6742e09f5b869633d9d6a7cd0f051ddca5a4fcf2cb569 SHA512 f5d7c49ef6a0a7d8570dcb20d9651af31eb07fbf8f75685c83c8d5e9f44cc07ea0945af6d04cf45694aeb9a2471382c348532717700059dbdd562d1838b4f52f
-AUX gelemental-1.2.0-fix-c++14.patch 399 BLAKE2B 4368bf6462a1302eb61654e877e1153f566e84b354b5f95a52dd16df19b28d4f9f914d86b564030716310dc49211ec9852901b47d86cc6f6d01af1586778f62e SHA512 9d134a3fe3dfb5a0238cc2f88803eb449cc596b5e4cd7c565c63dcc6cc11f7ed9ea605a075d75585d205fd4b502301dce9ed91725d81dffaca5cdbec95ce9d0c
-AUX gelemental-1.2.0-gcc4.3.patch 387 BLAKE2B 6421e171408a7d8cbf3de07ad513804ffea94b4fc57cf3e23adaae65b25b381a49bfcc28991675db74df91d58170380a6a2ccf4024f96d4724e1dabfa2d6e3a2 SHA512 d7b103a533dd3edda30d349b0205b241cd5e23c97a562912cc28bd7fb210c3e6f5c33ce2a3321817fe3748812f655b1295d23058aefd35ae2b2746bee99c35e3
-AUX gelemental-1.2.0-glib-2.32.patch 1235 BLAKE2B 723469d6e300579db349294cc7252aadafd910cd10ede2f325cd20dfc8620c8dd335eb15f62c3e1a2c0908f4d9557c537ee89b4c9c3df5fbe8caa3de3fd60782 SHA512 2e414b8d4f57a6edcdb4322b0bf39b6d89c7be0c67086f2bd2d468aaff36f9f98339f14cb2fe11444113b5395b8b4742ea82461df84094c8c1e4ca7f21ebb1c9
-DIST gelemental-1.2.0.tar.bz2 460757 BLAKE2B 53fd40cdc37909495cd9051c83418ace482fdf17930df2a94d8cb7f44a8eff2a5e7c37e54dac4e72810b1420d0bf2722eca47eb8c375fc05ecf26b753beb4e9d SHA512 2e6ef2c22b389cff69728b01e1eb397578974362356f5132098f29a9e01a64be228a24686738bd84ea575cee5aef068d9ab3d6c20233f995ccc5f1a1cb5d5673
 DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
-DIST gelemental_1.2.0-8.debian.tar.gz 29877 BLAKE2B a19c853cd426e1abdf73b48a21d1d7c830a613dc5802b1478d699d21b3211060b150c25bd525414147d02972dd9ac0940468a2f873aad03f9b7c522e862f29a7 SHA512 83c236e3b91af304c96f28c0f12577821ee2f47c9e01fb1f3664228afb002dc19b1a71e6dcd6040d09ea991d131b147ea5b36283d8ead290d50014c15e69878c
-EBUILD gelemental-1.2.0-r1.ebuild 1836 BLAKE2B 1906739810fa9aac25abc1610ce00d5e60e628b492d54d26e44f3266d97e622279f293017ad1ce7f92901f4a807f3090e25b105ef260d39ea08a4a7883bfa917 SHA512 850d7a1d37b4fcc0b7a65b9aae431e302d86b453c95a0a0cbe4d3380f6ba3b8477c7a18b729b088bba2c9e4428b8a415f8d4240cc38f94e58453e4af55a689ff
-EBUILD gelemental-2.0.0.ebuild 1022 BLAKE2B 4f87649dee59d080728deba62ffca7edbac581a17df4806063ae918b173b3864cffda3427805a277e85538fb8e93c017eaf0264c2b10e4cf376f326ee6555294 SHA512 4ceb393e3cedca8268dbeee698187a5a8a854f992a51831157785be5c96228d55ab5d961cde3c62363736b275f7d3b72b3b4bc5290fc51a359cc0b29921a4c97
+EBUILD gelemental-2.0.0-r1.ebuild 951 BLAKE2B efa247655c31b23277e45949e48228aa17c3f57904a1467afbfbe01baad056613e87943c31b10e8e885c1a2e113cf05bb65740777a815e2a0a57e1f87d1d7a27 SHA512 3780ff5c3b1efa1e3ea34c0a38313e24fc5cba8b1abb40e628f6ba8b0554fe9cc218a1b9d97979ed97c558d0939b2b05ae5de64b88a9dac195f5deae35fd1350
 MISC metadata.xml 455 BLAKE2B 7db9d6b4a8896df6385ae2c8c2b8c771c1a6ae82a1072f6d3f9b27fbd7c4d0f3546a03ced3350331d25f48e5631855fc9653a808d49631803f2d526db75b3ac7 SHA512 815bcad86f574f7cb2dfef3205e2a6398f5fd2512395c0c016733d4cb001f70c0003f494a69bc9bc66d675a9eaa89c203ace13f17f4a9f2c6805a34fcf5125d8
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
deleted file mode 100644
index 8c904e844586..000000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-doxygen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Joachim Reichel <reichel@debian.org>
-Description: Skip installing (no longer generated) .dot and .gif files
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590382#15
-Bug-Debian: http://bugs.debian.org/590382
-Reviewed-By: Michael Banck <mbanck@debian.org>
-Forwarded: no
-Last-Update: 2010-09-22
-
---- a/docs/api/Makefile.am
-+++ b/docs/api/Makefile.am
-@@ -12,7 +12,7 @@
- install-api: $(srcdir)/html/index.html
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)/$(apidir)
--	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
-+	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
- 		f="`echo $$p | sed -e 's|^.*/||'`"; \
- 		echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
- 		$(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
---- a/docs/api/Makefile.in
-+++ b/docs/api/Makefile.in
-@@ -393,7 +393,7 @@
- install-api: $(srcdir)/html/index.html
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)/$(apidir)
--	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot ; do \
-+	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png ; do \
- 		f="`echo $$p | sed -e 's|^.*/||'`"; \
- 		echo " $(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f"; \
- 		$(INSTALL_DATA) $$p $(DESTDIR)$(apidir)/$$f; \
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
deleted file mode 100644
index 0965fe15b43e..000000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix building with C++14, which errors out due to bool -> T* conversions
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593994
-
---- a/src/dialogs.cc
-+++ b/src/dialogs.cc
-@@ -255,7 +255,7 @@
- 	const Gtk::TreePath& tpath, bool)
- {
- 	Gtk::TreeIter iter = store->get_iter (tpath);
--	return iter ? iter->get_value (cols.property) : false;
-+	return iter ? iter->get_value (cols.property) : NULL;
- }
- 
- 
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
deleted file mode 100644
index 8e69e98a5437..000000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-gcc4.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru gelemental-1.2.0/libelemental/value.tcc gelemental-1.2.0.new/libelemental/value.tcc
---- gelemental-1.2.0/libelemental/value.tcc	2007-09-25 01:10:16.000000000 -0400
-+++ gelemental-1.2.0.new/libelemental/value.tcc	2008-10-19 10:08:35.000000000 -0400
-@@ -26,6 +26,8 @@
- #error "value.tcc must be included from value.hh."
- #endif
- 
-+#include <limits>
-+
- namespace Elemental {
- 
- 
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
deleted file mode 100644
index eab2ad1f194e..000000000000
--- a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- libelemental/misc/extras.cc  |    2 +-
- libelemental/misc/widgets.cc |    2 +-
- src/main.cc                  |    4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libelemental/misc/extras.cc b/libelemental/misc/extras.cc
-index a8e5720..c042604 100644
---- a/libelemental/misc/extras.cc
-+++ b/libelemental/misc/extras.cc
-@@ -21,7 +21,7 @@
- 
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
- 
- namespace misc {
-diff --git a/libelemental/misc/widgets.cc b/libelemental/misc/widgets.cc
-index 002310c..941d881 100644
---- a/libelemental/misc/widgets.cc
-+++ b/libelemental/misc/widgets.cc
-@@ -20,7 +20,7 @@
- #include "macros.hh"
- #include "widgets.hh"
- 
--#include <glib/gmessages.h>
-+#include <glib.h>
- #include <gtkmm/alignment.h>
- #include <gtkmm/image.h>
- #include <gtkmm/label.h>
-diff --git a/src/main.cc b/src/main.cc
-index 41cfe03..68bbb4c 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -26,8 +26,8 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
deleted file mode 100644
index 27588692bfbf..000000000000
--- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils eutils
-
-DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
-HOMEPAGE="https://github.com/ginggs/gelemental/"
-SRC_URI="
-	http://www.kdau.com/files/${P}.tar.bz2
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV}-8.debian.tar.gz"
-
-LICENSE="GPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-cpp/gtkmm:2.4
-	dev-cpp/glibmm:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-gcc4.3.patch
-		"${FILESDIR}"/${P}-glib-2.32.patch
-		"${FILESDIR}"/${P}-doxygen.patch
-		"${WORKDIR}"/debian/patches/579183_adjust_size_middle_button.patch
-		"${WORKDIR}"/debian/patches/604612_fix_menu_category.patch
-		"${WORKDIR}"/debian/patches/604618_scrollable_properties_dialog.patch
-		"${WORKDIR}"/debian/patches/656372_element_renames.patch
-		"${WORKDIR}"/debian/patches/add_new_wave_theme.patch
-		"${WORKDIR}"/debian/patches/czech_translation_559028.patch
-		"${WORKDIR}"/debian/patches/fix_gtkmm_2.18.patch
-		"${WORKDIR}"/debian/patches/fix_zinc_german_translation.patch
-		"${WORKDIR}"/debian/patches/ftbfs_missing_limits.patch
-		"${WORKDIR}"/debian/patches/lp673285_link_in_about.patch
-		"${FILESDIR}"/${PN}-1.2.0-fix-c++14.patch
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	append-cxxflags -std=c++11 #566450
-	local myeconfargs=( $(use_enable doc api-docs) )
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-chemistry/gelemental/gelemental-2.0.0.ebuild b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
index 7a482363201c..4affe1b9171e 100644
--- a/sci-chemistry/gelemental/gelemental-2.0.0.ebuild
+++ b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools fdo-mime flag-o-matic gnome2-utils eutils
+inherit autotools eutils flag-o-matic xdg-utils
 
 DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
 HOMEPAGE="https://github.com/ginggs/gelemental/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ginggs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
@@ -35,17 +35,14 @@ src_configure() {
 	default
 }
 
-# src_install() {
-#     de
-#     autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
-# }
-
 pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }