gentoo resync : 29.01.2021

7 files changed, 13 insertions, 87 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 36fdd9ce797c..81dc5f102c68 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 2a2c3e74308f..9d61391738ec 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,9 +1,5 @@
-AUX qalculate-gtk-0.9.9-entry.patch 481 BLAKE2B 10323362dcdcd4ce27f96f7599c3b93060bf6a7bb0b521579dbb70583ab629079c45aea64c5a425ddc23768b8021580667c562e96bcb761f229a93bf3fc93787 SHA512 79fb9ed95c59fb5513d0d4129e83fd685894638881dbe2ab30a10ad2d4d07e37c800ca5fa0a55119a147757edb79b03ffbdd92f659368abcace807895ea18942
-AUX qalculate-gtk-2.8.1-entry.patch 387 BLAKE2B c767853416e99e79557f3e43086831e0b6573a68d5edde084ff6f5e93c8456bc42e3238898d1c800e1126d8f6ab3bcc566d4f492c0406ca5a916430cd3526367 SHA512 7f0eca65cbc66737a7a9d9e4cc14f81b86d6ff706eb63694821803ed77a108438edabea10699a21f3776cfafdbba07c72ca5bb672ffbf34afdd84f7c39b6c7b7
-DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a38690def54816ecfde227a5f1bac847973ff67df62d5c174c00f6f9490a3ad8dce0d418cb2317b0c9c461126d54c5695 SHA512 944fad21d96de4a9d6b01fe259efb72f4872dd555357577fff18dca5bc4022c77d894b5cf8a0b470fbb02331de21210a6f034627346e08dc57be2f7c08e9faef
-DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
 DIST qalculate-gtk-3.15.0.tar.gz 2715732 BLAKE2B 7047befbf3a56e53c06d78dc33a515e4a8e59a665202f7a203b61e8f6b5e03b7d52d4a9a1514a92901249f65586552e14b8fd8a24e2d10a15875168d54467e74 SHA512 c5dfe308b13e04644452cfd3a4ce48f170d2599b6b3fb94a64dd78763f3546e44c0f940881d70a4727898feeb7b99a15104442d462f76382eec10cfbc0ed6393
-EBUILD qalculate-gtk-0.9.9.ebuild 747 BLAKE2B 04175d6536ee0b5ba2bc729676f6f8d1924c61ddbc17897a56527f85efb4b25e2816649d63b568046c6cdfcc90f6b60f64882c7621e637bf23fcdcca6ad85707 SHA512 f77e07a90a217ec22500050043d3d14f254465014eab50a4394630f51c180c1fa438c84ebdc4e2513bd50f66950608822e5236484b1b23ac6d84dbaefd48a746
-EBUILD qalculate-gtk-2.8.1.ebuild 873 BLAKE2B e7404c64aa6c0085780e58c2b117aa70992561322434158f9d9662a72bac797d0351aa9b50961377b5f28e41ca2648220af7cd51855842c93977caf3b7440ec7 SHA512 5b184da0445241ba308e5210e416139148f81f078d03656db2f61ab208095be77d8fdf5ffc6eb7b70adc956b261778e1cbb6951e1eee53efec86c0f8d5d6e9bb
-EBUILD qalculate-gtk-3.15.0.ebuild 836 BLAKE2B 38a28f4a11ba0dd8a62bc3499cd79c494159cae342d2cd16c12a919d26ff09ea4cd0ef91c2e66c0a9d9ba8c1c1a1f1159aa47854d96f1248977995d11b1ce998 SHA512 cc780bf4ef039ab08f029ab602f818c982c4df0656819a865660ffc72a810577244b5b86d88a7e25a2250534f73ccfef548a789a3f95e4c12d9d76303b1570c1
+DIST qalculate-gtk-3.16.0.tar.gz 2338500 BLAKE2B f252f6e19eeb7ae1e35e865111b72dd65837aba246719018e241aebd4f7b1358c342fc5d659b1d9ccf777130e2c443143e578156da5445dba5656c04ed8d18ef SHA512 42e6bd86df451e9a9dc92fd930f675195f7539feb7f2db2a8e04ebee96482d3bcda45530feafb71be00489d81d27027a9758a3e79a1ea912887bf082d034fe74
+EBUILD qalculate-gtk-3.15.0.ebuild 832 BLAKE2B ffc06d6244e250c65768a3b0a043b967cbadf0722efb21274f4f361400bb523cf675c902048c14995e3704dd4ed1261b13070a4b22409029d8dd0b8fd6047911 SHA512 3d83ad288d1a0ee431d4b5f286ebd774990bc7be24381dafa85d0a2cb25fca1014407e54a0f3b840b3107da743b3fb133c5ceee651fe7e741db784e383046965
+EBUILD qalculate-gtk-3.16.0.ebuild 837 BLAKE2B 45b200d5c537a2e3a21164745453f4e5a695d34d35fd904625fb81ff12b1610b3476b2cd4dfa440529add8152c6548ca3c49c57daede82308ca8170b2c7fa897 SHA512 da59de0085ad2fe6886b9cb9df44d7b0a7f500daf43ed9ff370bc2880898cb00327bc9c1e089eb2792363404d85d98efe58b9b2f6aa9e8e92613d77afe64c84d
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch
deleted file mode 100644
index 0163e8efcc1a..000000000000
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.9-entry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Update to latest freedesktop spec.
-
---- qalculate-gtk-0.9.9/data/qalculate-gtk.desktop.in
-+++ qalculate-gtk-0.9.9/data/qalculate-gtk.desktop.in
-@@ -1,11 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Qalculate!
- _Comment=Powerful and easy to use calculator
- Exec=qalculate-gtk
--Icon=qalculate.png
-+Icon=qalculate
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GTK;Application;Utility;Calculator;Science;Math;
-+Categories=GTK;Utility;Calculator;Science;Math;
- 
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch
deleted file mode 100644
index 02819fdd5c57..000000000000
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-2.8.1-entry.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/data/qalculate-gtk.desktop.in
-+++ b/data/qalculate-gtk.desktop.in
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Qalculate!
- _Comment=Powerful and easy to use calculator
- Exec=qalculate-gtk
-@@ -7,5 +6,5 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GTK;Application;Utility;Calculator;Science;Math;
-+Categories=GTK;Utility;Calculator;Science;Math;
- 
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
deleted file mode 100644
index 610e170750aa..000000000000
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Modern multi-purpose calculator"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnome"
-
-RDEPEND=">=sci-libs/libqalculate-0.9.9:=
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.9-entry.patch"
-)
-
-src_prepare() {
-	# Required by src_test() and `make check`
-	echo data/periodictable.ui > po/POTFILES.skip || die
-
-	gnome2_src_prepare
-}
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
index 0088a35397ac..1234757d9b28 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.15.0.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/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
index 1b7aeeca19db..a6d0a39d19b6 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.16.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2
 
@@ -11,25 +11,22 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-libs/glib:2
-	>=sci-libs/libqalculate-2.8.1:=
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-3.16.0:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/pango"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rarian
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.1-entry.patch"
-)
-
 src_prepare() {
 	# Required by src_test() and `make check`
 	echo data/calendarconversion.ui > po/POTFILES.skip || die