gentoo resync : 16.02.1018

2 files changed, 24 insertions, 28 deletions

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
-}