gentoo resync : 24.12.2018

3 files changed, 25 insertions, 10 deletions

diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index f3f27b1b7766..07977ea3a523 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
 DIST gnome-sudoku-3.26.0.tar.xz 2821288 BLAKE2B bb0c3269a1557d22686414dc3dd4eee4141af60e1342e498f30c0f902e8d6471dab588eeb4b302000fd5f302867edb80e966fb89f40587aa5f797c6525b0949b SHA512 d40ca96556af2d1537845554a8ee9bf4c63aa4eefd38a000d6dcffd649cdd14ee0d1fb85d128e59605714da19e6a7a02b8ca3e8d70fe9eb897b18028457f7928
-EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
-EBUILD gnome-sudoku-3.26.0.ebuild 774 BLAKE2B 7a4ef8c6973cae899a2f4ada9ddb261c55c7c80ebf16345defce71bfdc0832fdc7c5629df7af7d2d19a5eac2f53361533f7dd20ed214e6a3a8ad0ae2f0509305 SHA512 e00c9c95c3653464b42eabf4bd0a9893b4091d1870dd1e1deef819f32728663e28d3b6ba0743df9fe9510b6a519e8c9a63cae8c4a73e905c118b7344e34bc616
+DIST gnome-sudoku-3.30.0.tar.xz 430480 BLAKE2B ddf5462ae9e37d1428ca96468dc8fc5f6a157c541f79cac2a96fbbcc082d4bda8adc3539add48f7cb248caa722c21bc14bdabce54a94ae6cfbfd62d2be18c500 SHA512 ca1b830279b89bb35c281eec275af758cae32c0caec7b09a02790efc272701fa03aafb61000dcabc0ac78c7b04d886290c75bd79d6a3d8a89565dc0b122862c4
+EBUILD gnome-sudoku-3.26.0.ebuild 769 BLAKE2B 33cd772d0b570924d5dd8287bbf445fb2bc538b7cdf6bd63beef21326ba96d02501846054e3b116ff6d45b4754fd82a06b210c1a1b218c2aabc8d9dd327901de SHA512 1992a4b8e895302d047b802d8dae758dff681013573c08ebd490151a463e53bc78a3d42b8365e97d2670d2d23563c273676483dc9054266eadccaa4fc700c57a
+EBUILD gnome-sudoku-3.30.0.ebuild 1087 BLAKE2B b9ecdaef1b5d39b43ecdb7a985c9e5ab43720fe378f76ecb8a3a8b7dfbb8961d36d61718d3536d457a80b5ace841a96940484958683c59cbfda2e591fd0932c1 SHA512 5950665e0087fa2afc70387111f851aa190e83865ae8cd3a4e9429023fa2e8a120d0c485682281bc0d99c60f74b89c5f0f9f9c9ecf35a61f566d133048cd64bd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild
index 1b9809f4996a..148ea63706ae 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
index 0da196bf2483..3912d3d90acf 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VALA_MIN_API_VERSION="0.36"
 
-inherit gnome2 vala
+inherit gnome.org gnome2-utils meson vala xdg
 
 DESCRIPTION="Test your logic skills in this number grid puzzle"
 HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -25,13 +25,28 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)
-	app-text/yelp-tools
 	dev-libs/appstream-glib
+	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	gnome2_src_prepare
+	xdg_src_prepare
 	vala_src_prepare
+
+	# Make build compatible with vala release <0.38
+	sed -e "s/\(--vapidir.*\)/\1, '--target-glib=2.38'/" -i meson.build || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
 }