gentoo resync : 24.12.2018

25 files changed, 116 insertions, 150 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index f977faa0ee50..07abf4576384 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 963dfa696db7..db39d15f6d1b 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,5 +1,3 @@
-DIST five-or-more-3.22.2.tar.xz 3297904 BLAKE2B d727f18946b9ce26351db1b98c9396b9b4d79db0c412ca48c8a08266f162c47639af1612a27bb2ba0b513719a88574126c54da856df35c9e80bb01fbbb763cf0 SHA512 a809e227f7ec59912915f4808676c25777a0264268a06dcc7524d121b943e32fc95cfb815f2153aa0960aa0cdd0b3fed054c15d9d0c12d89ed155f0352fcb6f3
 DIST five-or-more-3.28.0.tar.xz 1507188 BLAKE2B 992bc75847b7e51cb5b5a23c3d3aad89a6daee00546711cf1d273663d2ebf8c2801c7a42f2aae1154114715d56ab1395def074beb30944762e9c560311880377 SHA512 33bf396426401dde2b326af8e7d137c23679589568e78f8b7e0020c074169318ba7925ecbd23bc18a2cfe0abecfca05c3090b78f1f86801c84e6fa385ca23f8b
-EBUILD five-or-more-3.22.2.ebuild 605 BLAKE2B 18af18d9d82bcd7062e3868d16f916850bdf7f4eb3da62181d402ca433228286b9c1cb068f1ffe2f11d81b59d89525e18ef085c36c5f716f6d11449f46118cca SHA512 7c470d8de623350a26af84eee5c0bdc755d361defbec0a5b18187871ff8e037cee18b08b64b39c1bd2867cc903f25b55815484e82d77ab504f5bf6c2a6ec29ff
-EBUILD five-or-more-3.28.0.ebuild 607 BLAKE2B b0bc4f528ff0e6dd8e4c09572b18449ef728ed32a8c45d1f8ef8c704c78b956aa80689dfd4de030dc1b04a5674a4d0b819645df0a01a36c423972f29b76640cb SHA512 62f3ea2d90f695b0288f0ab4ac0f3eec9b9b98779b3d3a36ce317570c37f244ed3ea2f9aff4e4bad2ecc29ce0a4751ad7d48be36e046fb79e1bf11c34a33bd73
+EBUILD five-or-more-3.28.0.ebuild 602 BLAKE2B 6e5eb0d9326692db4d1ad8508a7f6b0c0e41dce848c27a60e3962567f8adef752cb14b971bc25512b957e4d0adca0860585f4e182aa1e398d1a543c49d692da9 SHA512 6c6e1cb840b97e334ad5007bcf9aaecf1ca359d22d3083a9bd9a274a8af694430bb2808013033065d0c4eb1ecfd9d4195bcfd03643a02b0ad7e627ef95293720
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
deleted file mode 100644
index 074be2bc1d11..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Five or More Game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild
index c10bdf876e00..3b5403e6893c 100644
--- a/games-puzzle/five-or-more/five-or-more-3.28.0.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.28.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
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
 }
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index 608825e04e73..db1022cd814e 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-taquin-3.22.0.tar.xz 5030156 BLAKE2B e2757fe196a985c19de5b902d866fb1e9c6f97234dc25af59db10b3c066d1095a7280a5a0054b0c15c913fa93c541f4c0626f481257ab3bfefe5db9fdf308493 SHA512 9fbfa651b2546af16ca215ce0edb4466dd3663c90bf1c130c983422a0c5860f6146db97f7d9095b727d99ee98496e3bdb02afe46c9ced66672435638ba49788a
 DIST gnome-taquin-3.28.0.tar.xz 4550056 BLAKE2B f5fd5a984bf9ae47c5cea19cc9708e00256023b16cc05dcf2d38d70dc8ae975e0386e8d9d2ff9c4f03f36f0176d67f2d275444eeb2df1b7c3e8dcafbcd97fe70 SHA512 66939b13f2e22980702dfcde9e7c93ffaf3a3d9278d9b87ded295eb9fcc7702d9e325b3a70313a8a34e12834fbe887e4e65a6b429938ad332c5958935a6b80dc
-EBUILD gnome-taquin-3.22.0.ebuild 681 BLAKE2B 548d984c52259163ab17e583ca5779f094511661e9e221e29dff65e38ffcbcf33b18747fd76283d758961abe396f2815478031ed9a4227f031ddc55a3b9bf97c SHA512 0ae6e60c94c1973c9cbe4fb842349925e15e279ddddb17f6d8fb1d9eff6da09ef501d7ed5d2e997ecd9760af0a368f25ae21738bd9b072ef59bd976dec9eb18e
-EBUILD gnome-taquin-3.28.0.ebuild 783 BLAKE2B c2acdd5f1445521dead769815f79d7c90a13ea08f3505ae3499070468dba7dcc1da38cccb44be6b7a4f6558c1023ee4ccacc578938ececa6e33f77db6d57ccd0 SHA512 e7cb35fee941bcd93f2da4414738d5b81da0176ada7cb0d69859a65ebbf72802e5b2b64de1b9acfdfdf26c75b0483ebb7a08344733f3877594b4f7bb433c8b7b
+EBUILD gnome-taquin-3.28.0.ebuild 778 BLAKE2B 1d606b5269087c20413bbc05e68aac48efddd046f126ac018cf91e215d026ea1707a5ecd96a2c4bf53f07489683d656adcafa5c29fb6ca84bbf2ad6a4a8fb08f SHA512 ce2ed9d689a7317e1496e48e309ac2b1c6c2049dc7f38cfbb4803434e8fc2c8ff5b5e9d521fc9b0321e3f1af34daa571474f44e0d4e2e7e3eab773284bc4e114
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
deleted file mode 100644
index 6cba03479009..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Move tiles so that they reach their places"
-HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild
index 527566355020..76dfa0d119bd 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.28.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/Taquin"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 18ce55bd5d2e..5d859c40e9d8 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,3 @@
-DIST lightsoff-3.24.0.tar.xz 1943672 BLAKE2B fc6c8643e791a7b6e3e1183ea9678138d53aab5ba7234c4c6417b576dda571a741c3eeb8fab36ae5a00b25420fcc1269e412800a4a5c56efc16943905d6002f5 SHA512 ef036512b3c4e60b4419005864c3f6f4f9447af2e4d12fac1df7603f5837adf2cbe0f41f6089d3e683c3606d021d35e0cc41589938054988506aef3881936e6a
 DIST lightsoff-3.28.0.tar.xz 863120 BLAKE2B 8882af4829251c7af0fac9d259958c62f7e3a063ad312c25296020a19beeb7e8d578ce4eef548a6e2aeb8914d2fcb120aea3e37c125f235599de5344a554db10 SHA512 f4efb3d8209b6e75985ad04f0cd8ec984d564c4bc35b5dcbbae9b85fd2a49dcfca530fb63a5581f08cb55dfa9fc31284e177d04a518f3daec66414eb58007f67
-EBUILD lightsoff-3.24.0.ebuild 660 BLAKE2B 4dbace47d031bc653108e807136c5541794358b6140a92ba5b5f9a8d2925599020fe1401828a2e1175d03311ee030a149c80ff8583457803ea7ce2a10e431886 SHA512 f7631fa627778f32c69cb79091b20f4fdf11e6fdfb771a81b0fdea79de7345ad3e5c48234f8532290b06729e9558eefb8c98ff08d187eda8446fc9e0a3ec95cd
-EBUILD lightsoff-3.28.0.ebuild 730 BLAKE2B 26d13063c6f1ff4b27843b7a47b3c26bac8d6b3d1bc0b24a80035d2020b32fd0741a4c651e71d7ac0d9c3bc0161b38a7d05ca1be7bef91c566153f226e01ee23 SHA512 a47d529d2a647ea6faef47d0ec1191e7981fd490fb0134366788f8dfed6c327e6c20287e23499187a09a38751476aa8d692a5801903815f1e8d284cbf9278f0d
+EBUILD lightsoff-3.28.0.ebuild 725 BLAKE2B cd94b502b2fb019f70d5c362cc579ca3fa3fe7688982a33c418fa30a4daabf827683ce79e4d47ee04a5875bbb7881640b51c433c022249ff9b34e6f1ac5c26ff SHA512 c3d35d4e815aa33baad990807f85d33bd2ef33e8375f02e3062d2b910be15a4f4a4c87f429e9b0b992a83aeccfe644eba4d000d5d486b7426f8b679281e3f6dc
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
deleted file mode 100644
index 065214d72703..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/lightsoff/lightsoff-3.28.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.28.0.ebuild
index 0d581544bbf1..9c0fb1be526d 100644
--- a/games-puzzle/lightsoff/lightsoff-3.28.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.28.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
index 6ce1ead47d89..a1d02e7f1a24 100644
--- a/games-puzzle/nightsky/Manifest
+++ b/games-puzzle/nightsky/Manifest
@@ -1,4 +1,4 @@
 AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
 DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
-EBUILD nightsky-20111222.ebuild 1878 BLAKE2B 229d53081e7e45e14a0b2ca812fc65ff4bf0cf72fb6be4643c22d85faf428e4bdeb092cbc2ff9641a35480b318622dba40ae1348298a83952ca923f9402e7676 SHA512 47f922164e5b28a0f344153c6835cf07442221383d0735dba964f0d47812816f590695bb596f757d4ab2d2f0ea276eeadcf787759ad1b47b981fee2441847337
+EBUILD nightsky-20111222.ebuild 1888 BLAKE2B 5a3cc9f150e92859e8b354bc1e0574fa348afc397bbae3406258773e067c9e06b8e353625e9edc7a65411e20e4efd2759a6c0e2618480a7fd6ddd8404b259a46 SHA512 b5d1f627b1dd34e2e5d014d23b30e31d20df1959a1bbd6c46eee69105ff7f1f8401e24b50573d0b85dac1bec74fac02ceac74508c2a0d88267ef8412654c2612
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
index aebfa6393e06..d4876d52ef43 100644
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,7 +41,7 @@ S=${WORKDIR}/NightSky
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
+	einfo "and move it to your DISTDIR directory."
 }
 
 src_prepare() {
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
index 6d55a3efcde1..20f6ee0142a1 100644
--- a/games-puzzle/splice/Manifest
+++ b/games-puzzle/splice/Manifest
@@ -1,3 +1,3 @@
 DIST splice-linux-1353389454.tar.gz 305838859 BLAKE2B ef8c6ae70b48f6c1860e3d6591876063abea77fe0f9a7597f91e32295bee8e517fed1bf6fa3fa5e491ea11e8da7faffa26ad9d9329d960269e29dda7adf8a14d SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44
-EBUILD splice-20121120.ebuild 1295 BLAKE2B f5b9bd1310df8d856d22d902c731e973aa7270463628f421dfceb590d7d89ace1f6abe5fd63e7753226c69fb576f295d28c36632572fb26731a0b86d7cc5fbf9 SHA512 4b3e62b2bfed9a7c5a33df7594a7dcb8558c1b255fe03b33bae9175e896281539e414d13747965569eb48298f42a4c1fbe9b06b7ff4e79b69e0698790690f0cc
+EBUILD splice-20121120.ebuild 1305 BLAKE2B 06964a2d0e4bd19bf8d929338bb2c1872abe7c26b697fbfd70780130a43579cd2c7a2713fd12f905d79aefcbb823aa34337b25b687ad2f731a6f61977853314d SHA512 39d586c843086d28e382d5baa65056b6b1b49bf90f1f9af1e39443c05f721a1aaf89e3d8caab7e37bc2c6fc6c08461df6543024e1dd99d69ce76eaf21b76aac3
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
index cd9f3346db97..d9b15617e47f 100644
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: unbundle mono? (seems hardcoded)
@@ -34,7 +34,7 @@ S=${WORKDIR}/Linux
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
+	einfo "and move it to your DISTDIR directory."
 }
 
 src_prepare() {
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index c21fe0245630..2654a6b6bb8e 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,7 @@
-DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
 DIST swell-foop-3.26.0.tar.xz 2295368 BLAKE2B 6e85f2f3a931ddb3351d8cea25dc9f03252be8bb793385a3d2dc011528590b20aa9d2261d4810b2425ce995d82df49b6e07fb471b052e79c00cd16af31f375f2 SHA512 586e41c775b7fae55c9688b4e6152efebbd02efe71c7264baa1a914b343b2779d31229a3f97cff22e1d57fe223d401e3ac3b8ae72dc1f975959fef609ac6645c
-EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
-EBUILD swell-foop-3.26.0.ebuild 668 BLAKE2B 1ff6a9ed8d3ea1503eeb8fc68478469b0a19ed840a9837a644c78888a79409f6af8ad94103a27b6ab94221eca44c1f560cc1fd5255bd6d4b95cae8106dd7740c SHA512 a83a1c54c93165216ec7ca4db846c3f860ffc7169e8a4e572350e1c5bf9fa9242f0a16aa75a93155ab56690c393cff8c3e25fafd920268ff84d7b7d80b819205
+DIST swell-foop-3.28.0.tar.xz 1302920 BLAKE2B 3acd88db4b08f8c29c899c796e7e30cded7bf9670e679fe29e30d8512981a4970166b74a2b0e651b77d27cc090e5d463f26ccae0168305f699919317d3080cc0 SHA512 4f231cf7d12c7757a8e95bc08c2b6b664c61bf59af87347bdaa96adced0a1c17faa28f76f1a0c71ed13cb9c9a198ac24c30ffee50e94d471b9843b7d92837192
+DIST swell-foop-3.30.0.tar.xz 1117832 BLAKE2B 4cbf829140bd3ff14c09c83b8ebf8a82a00e97d8f73f82ad3fe11220d9ef89a1bdd116ec28235e5ae02bf258021ff6fceb968f1e39598ea606a4c613e0a43f8f SHA512 233ffd2acec9590e97d410a4084e2fa6f9e1b9dc80aec643c8a20de008410930a3cbda901dee63180c6ea469c91db489d513d9bc34edc4e3448cc53a3c76e029
+EBUILD swell-foop-3.26.0.ebuild 663 BLAKE2B e178c5f5932d3f937d6bbccc53f74be696ac16ccb9caf326e58d699d3e12d9e5c48504416275cac7e988dfea8ecd0d9651480e24b0ac5fb1371bd58bedc2d67a SHA512 1334f5402aef248014fc89470568137ead2322532e324ea0e0982e320acc35bfed8f3ac0259c03b5f4f78745384d9524a0a65725fa5f1fefb77a463be0b37125
+EBUILD swell-foop-3.28.0.ebuild 822 BLAKE2B 2f34a5651769b69206392cd42da63f58be61172cbc2319218a163ef42f2789108328c0b254cf7120b61a22c7bd0c089d52cb0c763c0273186470e202a0dabe46 SHA512 9ddccb3fdd5b4f923d27d486efd5584b6544d1b812f1f2dfd0946cd2959a45443db7c1cc94544632341f4e953ff11e5de52f4eeff5e2585d81a029fdc4ea02a2
+EBUILD swell-foop-3.30.0.ebuild 822 BLAKE2B 2f34a5651769b69206392cd42da63f58be61172cbc2319218a163ef42f2789108328c0b254cf7120b61a22c7bd0c089d52cb0c763c0273186470e202a0dabe46 SHA512 9ddccb3fdd5b4f923d27d486efd5584b6544d1b812f1f2dfd0946cd2959a45443db7c1cc94544632341f4e953ff11e5de52f4eeff5e2585d81a029fdc4ea02a2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild
index a56bce3d0246..c9f6ae4a342f 100644
--- a/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.28.0.ebuild
index d0c5883d967d..c01e8f8b956e 100644
--- a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.28.0.ebuild
@@ -1,33 +1,43 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2 vala
+inherit gnome.org gnome2-utils meson vala xdg
 
 DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
 HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
+	>=x11-libs/gtk+-3.12:3
 	>=media-libs/clutter-1.14:1.0
 	>=media-libs/clutter-gtk-1.5:1.0
-	>=x11-libs/gtk+-3.12:3
 "
 DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
 	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	gnome2_src_prepare
+	xdg_src_prepare
 	vala_src_prepare
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
new file mode 100644
index 000000000000..c01e8f8b956e
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/gtk+-3.12:3
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5:1.0
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
index 3f7c8466e7dd..0559bb517747 100644
--- a/games-puzzle/tiny-and-big/Manifest
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -1,3 +1,3 @@
 DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 BLAKE2B 2c1845165408cca68fd791b2d6f91c49e1131c25c29a49ab8512e82cf0664d52fcb8526741693e045e3ea1560ace47ed3d8a8e51a4851d6ce57adce6f2bcd445 SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e
-EBUILD tiny-and-big-1.4.1.ebuild 1389 BLAKE2B 8264701b9f84f4f20228be060cd557d843bcb970fde1b256b3a016bc77c7e424744a908f2129c8e8267725842c10c24f883b6cd32630aee370b81c71ed4a43df SHA512 3f18ac776c1e8ee9bb34dd6da4d9122b1e433e104430105de5c301d6a90fb5406e6111969e76d7a656c8e17079892bf6724e93d68ef358c3a24ae51f8339695f
+EBUILD tiny-and-big-1.4.1.ebuild 1399 BLAKE2B b52e47b8cc5d60da40f31741b123a869cc0fdbff9cf784e7aa95fc78e167c973102362b1d53518b1cf06d2e4decb2a19219215171e1bd65ef89dc401c8a40904 SHA512 9bf6f8281672618581cb4f404f4d25a653e0236a5754ee3c550f16a9d9cdf841892f06a1332ad8f2ea27d937e409de6661b91e2dde331132554cfe197f7e56ad
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
index aea1846bd3c1..d8b650922b2f 100644
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: unbundle media-libs/cal3d, lib hacked or old version
@@ -35,7 +35,7 @@ S=${WORKDIR}/tinyandbig
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
+	einfo "and move it to your DISTDIR directory."
 	einfo
 }
 
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
index 881e359439be..1923bd1520e2 100644
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -1,3 +1,3 @@
 DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
-EBUILD world-of-goo-demo-1.41-r2.ebuild 1387 BLAKE2B 19d73315026e60bf1f64a926d3c27cc11e588f9f351ce0e5660e6f4790ca32ddf33bb4abbcdbb86cd808343172be204e8f34ca60d4319175699c92c48ed97b50 SHA512 1a46f38c0ca78ccb05df9468c75bb9bab3b81ec51de3b72efda63da1220e4d4b17de069ed13065a0822d3891ab2da13c9d91788be3ad759c3ffc085f1d8392b6
+EBUILD world-of-goo-demo-1.41-r2.ebuild 1414 BLAKE2B c1e01bdde1df8e5abadc6033ffd5d2579e1e78352c14acdbce1a8b3949664d51135b21c681469f71b58898d762d44ae9bfc8e913379d9353b71ca20416954f91 SHA512 a39ae96df4212320d986f32b4d12c2b7c3060d2dee34be6f43f818fa5c5004891e1f6cab2c484dc18e8a657aad33e59587da0d6e02fc1344543882356be096ee
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
index 6e16ab61c1cd..f9a6dd857701 100644
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.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
@@ -42,9 +42,9 @@ QA_PREBUILT="
 pkg_nofetch() {
 	if [[ ${PN} == *-demo ]] ; then
 		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
-		elog "and download ${A} and place it in ${DISTDIR}"
+		elog "and download ${A} and place it into your DISTDIR directory."
 	else
-		elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}"
+		elog "Download ${A} from ${HOMEPAGE} and place it into your DISTDIR directory."
 	fi
 }