gentoo resync : 16.02.1018

5 files changed, 34 insertions, 49 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 43c5630be1ed..aad323b90429 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index e14f4d60b874..175ea28a48dd 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,4 +1,4 @@
 AUX tetzle-2.1.3-gentoo.patch 267 BLAKE2B 7432663ff3ae333e4dcef46193da107436a30395f236e2aebe11c5b3c0efe2264303f50c6eabc92167b5ba36a2e8d64d9cd27e78dc1a3aa3ddebbb29d8d567f3 SHA512 92e4a48b88df690f75890cb969863006b6b7cb1476970d87c0fa7ae59bc5aaa591004e6e962bdf7d84bb1e9668eeed0bc7131269247d79e613b7cb252bbf194c
 DIST tetzle-2.1.3-src.tar.bz2 1022680 BLAKE2B 197e2a221a779734d3cd76d5600460df42014a31a032fca2f5c181d54c004f56e6beb9803c60fd53edf5b0d4a614b3d0709fd8913d561e49a938a2f6f1943001 SHA512 6f4541ad2f67ac8a98bd0e1683d4cb6131a85a4e9d31a9dae0a97177a721038750f4276fb3a592b97804daceb1b99f0117e14c6221a6a6ce74b852b00ed5c607
-EBUILD tetzle-2.1.3.ebuild 861 BLAKE2B 34d273e9f48fd29d2c97a91e05c23231f6e794e1e1d19be2451e0ccb9997a1cf1b87027eb75c2f708dc7ef5bde027450518e8a52325f24d3507d784d52b79950 SHA512 9d3de221ff94c0f8f85920734f70b288b622d11977f890be57700805a417d85911e7b36d63b0d56f07e433046d24b64261189f1e30ed332b170ac1d6f94e8e37
+EBUILD tetzle-2.1.3.ebuild 639 BLAKE2B 58db71a09024987065f6b677246e383376a8f540d78ef21bf52519b0ad789a2a71ac2471120218e41f1f0ec21186f54c2e5fc79502f986ce4d268f38754a002d SHA512 dc98a49702a45e427291a132f19f2aa7767366d19b0be88a920e64f63b5a0540cd07b48b6390d1f25e25d8763a68a59a07fdf04bc771a6a34067391575dac570
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/tetzle/tetzle-2.1.3.ebuild b/games-board/tetzle/tetzle-2.1.3.ebuild
index bc3518d35a8f..dfd7e0638d68 100644
--- a/games-board/tetzle/tetzle-2.1.3.ebuild
+++ b/games-board/tetzle/tetzle-2.1.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils xdg-utils
+inherit qmake-utils xdg
 
-DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
+DESCRIPTION="Jigsaw puzzle game that uses tetrominoes for the pieces"
 HOMEPAGE="https://gottcode.org/tetzle/"
 SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
@@ -14,14 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
@@ -33,15 +34,3 @@ src_install(){
 	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
 	einstalldocs
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index d66f55c7de38..ee1d24083109 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,5 +1,5 @@
 AUX xboard-4.8.0-gettext.patch 502 BLAKE2B 9c763076afb8ef182e715cbe82a7935ca495d9485326807146fcbe8406c56cfaacb9ebc0221b18628ca36379cf8d8d14f5fe0c4d0577487e39abf8305e9fa6da SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9
 AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152d99de3a88c1f75db33d0f4ecc1b2105cfdb444599af8905955b3a5a91527bac770fc67e0ee480d46a9c81b73fc1c11bf3ec68 SHA512 3ba68ce96dbdca3f0f8027d54c8cf7d8b7f278a2eb8bf549e3f9a2979bfb19aa0232d391430e6725bfdc73befdcc2da221663ff974774ab81bfe052286205956
 DIST xboard-4.9.1.tar.gz 4015017 BLAKE2B c886cb06d9b4ed394220f133915a55e1dbe29d317891d00d880c597abe0ad43a8377c926d844318b0092120aee7e40fe8c6c62fff41890c35bd768575ccef731 SHA512 7c6f17450edc3f56d5987f6363da01633850b87b0d6664524a4697216dc66aa58f84314ba57ee68aebfbb01ef96995e34be4e98fb4a5124e3f5090690f91ae08
-EBUILD xboard-4.9.1.ebuild 1972 BLAKE2B 12c3b0b5dd1970a7007793cb923ec25a2afddecf6ac164b8038a362a280d6d64220f1416dc4f0653d90f716796c8c82da86d4a3d83c46f0229d118a16ac7f762 SHA512 e97fb6801ff96add531264e240cd4bc2da64c712a71dc73b7515cd9e1c42fc52882f35989d31348ab4f1a788a45f8949283b48235a238ae59b20b6b8ddc35341
+EBUILD xboard-4.9.1.ebuild 1818 BLAKE2B d6a5f9edd420adbb49339427e0f71bb1374eb281e004de795ec7d44d9d2f3ebcf3f418d41d2cf61eba2cfb0ff73568e47a9e1956ed710e86407aebb027877e1f SHA512 f45fc03a95c1cb75cfe4ab7ecf11997506a1ad182e1280286c49a8c4bccbbe33b4d3d05b12510c4d42818e88f06c52be0b63907e82fd9083013eb8c9b476a884
 MISC metadata.xml 418 BLAKE2B 0fb5a3b7607b0c609e7bf50224e1a53abc1e9dd90a811e964bbc5038f96966d32d4cfca6b8eaefc7e64be3fb2302a0231162554cd436043471c578830f74e1ec SHA512 ff385f8c46788e3c76fcdd891f4a4be50b100ff47298eece8a2f1ac3dd166ab384961f3fde0967dc3b3afcc3978cefb5025e4eb0dc69177395c75affa2416d1f
diff --git a/games-board/xboard/xboard-4.9.1.ebuild b/games-board/xboard/xboard-4.9.1.ebuild
index 71e1a4bd8429..a2e47ab04728 100644
--- a/games-board/xboard/xboard-4.9.1.ebuild
+++ b/games-board/xboard/xboard-4.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools gnome2-utils xdg-utils
+inherit autotools xdg
 
 DESCRIPTION="GUI for gnuchess and for internet chess servers"
 HOMEPAGE="https://www.gnu.org/software/xboard/"
@@ -15,7 +15,12 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-font gtk nls Xaw3d zippy"
 RESTRICT="test" #124112
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	virtual/libintl
@@ -33,10 +38,7 @@ RDEPEND="
 		!Xaw3d? ( x11-libs/libXaw )
 	)
 	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.0-gettext.patch
@@ -51,16 +53,18 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-update-mimedb \
-		--datadir="${EPREFIX}"/usr/share \
-		$(use_enable nls) \
-		$(use_enable zippy) \
-		--disable-update-mimedb \
-		$(use_with gtk) \
-		$(use_with Xaw3d) \
-		$(usex gtk "--without-Xaw" "$(use_with !Xaw3d Xaw)") \
-		--with-gamedatadir="${EPREFIX}/usr/share/games/${PN}"
+	local myeconfargs=(
+		--disable-update-mimedb
+		--datadir="${EPREFIX}"/usr/share
+		$(use_enable nls)
+		$(use_enable zippy)
+		--disable-update-mimedb
+		$(use_with gtk)
+		$(use_with Xaw3d)
+		$(usex gtk "--without-Xaw" $(use_with !Xaw3d Xaw))
+		--with-gamedatadir="${EPREFIX}"/usr/share/games/${PN}
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -69,9 +73,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 	elog "No chess engines are emerged by default! If you want a chess engine"
 	elog "to play with, you can emerge gnuchess or crafty."
 	elog "Read xboard FAQ for information."
@@ -79,9 +81,3 @@ pkg_postinst() {
 		ewarn "Read the xboard(6) man page for specifying the font for xboard to use."
 	fi
 }
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}