gentoo resync : 11.07.2019

5 files changed, 56 insertions, 3 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index d4f16e15826c..6d3afa85af95 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 9724e174675c..2d3419d1d931 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,9 +1,12 @@
 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
+AUX qalculate-gtk-3.2.0-entry.patch 388 BLAKE2B 42c903e1e9abbf42b37b35fa31d1a306c5c8c150dc5536a7227f5bdd9240e1394cb617668d792a8492d173f72c67704bb6fdd9cd114d6fa2ea75fd70f07a02b3 SHA512 7b0d0556561d3e6578792d8b623c0c5add585a54d8bf0a68d9f1877aca54dacefa37f23dc528537ff069f60bdb37d97b537f2ae71c7c447bc3db7825d4737199
 DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a38690def54816ecfde227a5f1bac847973ff67df62d5c174c00f6f9490a3ad8dce0d418cb2317b0c9c461126d54c5695 SHA512 944fad21d96de4a9d6b01fe259efb72f4872dd555357577fff18dca5bc4022c77d894b5cf8a0b470fbb02331de21210a6f034627346e08dc57be2f7c08e9faef
 DIST qalculate-gtk-2.2.0.tar.gz 2339951 BLAKE2B 87a2a9328314b994a780f2f616b6f43b53848131db3e5940863432360da44f1e50084076b63c2fac01fe339d5845a55133f5d453bf3d6eec432ce8e43a524921 SHA512 a761383021448f2d8542fad2c51a57e9d98a09264a1467e8e4555ab1930151651f0a40cd9869bb88e18b716fdbe4c664ce69ec02b6623698f42f34e708f55dea
 DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
+DIST qalculate-gtk-3.2.0.tar.gz 2987908 BLAKE2B 038203fab563bb0b74c2c23fd2f4077f7b4c8dc5ebb40c8246dd55c5ce311e19906f664040ccdff8a993fbc0bf8e2e89745bd99c66cb86874097462ec799e5ad SHA512 c9c00bec9ef9fc9526c1ed1d81df06e2fa5c947962cfd981fc3f4036612336ac2dc8027855d505101e78379840d9499f4dda492b98219f9073d91d9237f37528
 EBUILD qalculate-gtk-0.9.9.ebuild 748 BLAKE2B 7a45edcfd1d53992a71aa84975acab3a3266c2014a356fc226b39fe22d39aa9f6cf2cb436c2adc850af3fe1e8afab9361cdcc1add2cf645a3ed022b58a3cc388 SHA512 1494e76576edd8d62a6fbce67c3bc9282354a71836f0eb0255424271255fe90a62fabb43145ff515917e8f00ab403eeb757c1433e13688d786406c147ebe693e
 EBUILD qalculate-gtk-2.2.0.ebuild 754 BLAKE2B a7b2fef7909b3d5a72a43938d0c235eaca8a1c635b3a6c05b613c60d1d00f0eab3a62a3a8146a083fd50eae999bdf6f585477effea023686985291c53812612b SHA512 d4361e3e16d2ac608295aa8844bd6e9b76c37aba2a88a9a8541705e2190f100ffba95ef103993e4f36a41e39198244cb5379779ba63c9a7fdc6afc55777173eb
-EBUILD qalculate-gtk-2.8.1.ebuild 876 BLAKE2B b4225419aeed0eb047eb7d1387685e0d5583671be6d47ba12275c0bdb577d7c716f175c485b399ea4ace5179aba53e0c92f9ba31e2b540cd4c694c2175e4e024 SHA512 7ec70ff54f964040d77a441999b42df368043924a63ae9879b179bc496b8163b026889160cb65c447b4f32d7c98aa0bd65ea84d0cba969f39c8c6557aafdc311
+EBUILD qalculate-gtk-2.8.1.ebuild 872 BLAKE2B 48e28851251ff4b3f621d148fc2d7921b59493760053b2da2ca2c685db218bb1b5deceab52efa7b156000a15561abaa35868ce52c172fcfac359d48085c691c1 SHA512 d3f222821c3a5da7a5764d3d2c982603b7c4f3bc0f54aba7f8064f0d9eebdacac78591ab3f5028313d18c49b378834cf4ad17b6f1c337437127d09c756816e5c
+EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B 055d2aab09e6cb21af7159d387bc12dfdced8f8be151739fdf7d4eb71f3e23686d1f919bcd61e401a4b9f488ec194648ba1006a9c8a4ca0cfb6de7125b3ff832 SHA512 b40afcc848fa3cafee39dadec38b8eacc416d367ba312836dd0d630f2e872466cbd7fd7e2766862597a467e6c29a1fe49cb8ebbbaeb53eda8f305cf3202d7252
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch
new file mode 100644
index 000000000000..d9e1d3a72176
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-3.2.0-entry.patch
@@ -0,0 +1,11 @@
+diff --git a/data/qalculate-gtk.desktop.in b/data/qalculate-gtk.desktop.in
+index fdefbf9..68b32b4 100644
+--- a/data/qalculate-gtk.desktop.in
++++ b/data/qalculate-gtk.desktop.in
+@@ -9,5 +9,5 @@ Terminal=false
+ Type=Application
+ StartupNotify=true
+ StartupWMClass=qalculate-gtk
+-Categories=GTK;Application;Utility;Calculator;Science;Math;
++Categories=GTK;Utility;Calculator;Science;Math;
+ 
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
index d1a312b7b58d..7c4ede518588 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..773b746ab3d2
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 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=""
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libqalculate-2.8.1:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.0-entry.patch"
+)
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	echo data/calendarconversion.ui > po/POTFILES.skip || die
+	echo data/periodictable.ui >> po/POTFILES.skip || die
+
+	gnome2_src_prepare
+}