From 7932d472a02d4c016ff7dff4b7a5479ab9d1883d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 17 Jun 2021 17:57:35 +0100
Subject: gentoo resync : 17.06.2021

---
 games-board/pasang-emas/Manifest                   |  2 +-
 .../pasang-emas/pasang-emas-3.1.0-r1.ebuild        | 60 ++++++++++++----------
 2 files changed, 35 insertions(+), 27 deletions(-)

(limited to 'games-board/pasang-emas')

diff --git a/games-board/pasang-emas/Manifest b/games-board/pasang-emas/Manifest
index 4fea99f2c7d7..4819c3fa8e1d 100644
--- a/games-board/pasang-emas/Manifest
+++ b/games-board/pasang-emas/Manifest
@@ -3,5 +3,5 @@ DIST pasang-emas-3.1.0.tar.bz2 3030528 BLAKE2B c61caf905f17fb51fd58609c8f0ec9fc6
 DIST pasang-emas-themes-1.0.tar.bz2 1190560 BLAKE2B a2218920dc601a12c86da15600f8cd09ae434265695d872d706086ab02b9b02e557e8c786789b8089d142b86114adbabfe392f1af290138a95a1d805845582a9 SHA512 8b82ce6ba588b83ed4a0d70d8aab256e2dae16143e64ca8a1fc25ffe61f001cdbc71d62d8eb42d9af4aeb63d6584f47b513b0ce1840d9b9f49d9b1b635eb4043
 DIST pet-fragrance.tar.bz2 1019437 BLAKE2B a4408d60c4ea14efab84f10bbce4da0382253f19cd60a82b278ac55c6b9f897a0e2eeef924930b7c8159a02460e3a269dea4254126e2389c84fe0f02cf61c62e SHA512 2af8908848cc20962c70ef573156b208dbc33032529035ae6f0b5760f5eb1b718582dc823340587e29b7e66a2d3c89ba113dedbf299c0bef639f28329ff278f2
 DIST pet-marble.tar.bz2 631999 BLAKE2B aee419bfe7355f6c90822deed14d44174d5862f08a6bcb81cabd3c2b05f7ee99ae836574af21e3a2a9c9bf203c1c39d8c4f435466cbbf274cdd162e2c6cc3805 SHA512 3ecaeaddb12e23fbd90e4d158a47dffb73b756bf9f5263d93c5f6aa21d290be3d91885de7200cdd3a45718b49ac19cd7073ed8bf83697af6bff64759f810122e
-EBUILD pasang-emas-3.1.0-r1.ebuild 1417 BLAKE2B 4aaf2fa8344a0f7d8807002c6eaecdfbf82acc0a92362766dccfca9bf2b018a0f0ae199015ef17cb495f4e31df00e73d950a20f62646c20a1a112da9aac8bd6c SHA512 dd36d7d6a5867b4eb1c73ade3d4651d60cce6ce5a169bd617a8355aad9c6bd284d806b2c6908a23aab4f98833cfc9000bc2225bf3884bf59820206c38fbba619
+EBUILD pasang-emas-3.1.0-r1.ebuild 1471 BLAKE2B 60d07e08e15aff2a3afc21beff4110a980bdee1d7a608b83a9a8773c299e026bbf5949b6e3815fe4cd3b6db957e7c2d5754f46893276b61bda95c823ed4ac6ca SHA512 aafd0dc5d8e3b8f279368ca6124c22e08a72600249341b2cbe670760c066f30bad08b2e3a6696e00ac2a2ae497cb11b6bc10511f84fcdca86252af85809292df
 MISC metadata.xml 418 BLAKE2B 6b928c147371451147002cd57f68630e399e64539f8de21411c9d3d0aa79313f306b1f273c24f980b6240f102c828c86c6246f23bcd2898466f0d9538682b09b SHA512 32f5fe7a93d534ffe61023137d21e0d5cfe9328ecbf16c3b0e117a3d131319fa3e284b23c244669cde0c1c0cf45ceffb291dd53198bd4961536ff223e71a3465
diff --git a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild b/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
index b028b2871b2d..5bf6199b8d6d 100644
--- a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
+++ b/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils
+EAPI=7
 
-DESCRIPTION="A traditional game of Brunei"
+inherit gnome2-utils toolchain-funcs
+
+DESCRIPTION="Traditional game of Brunei"
 HOMEPAGE="http://pasang-emas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	extras? ( mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
-	          mirror://sourceforge/${PN}/pet-marble.tar.bz2
-	          mirror://sourceforge/${PN}/pet-fragrance.tar.bz2 )"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	extras? (
+		mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
+		mirror://sourceforge/${PN}/pet-marble.tar.bz2
+		mirror://sourceforge/${PN}/pet-fragrance.tar.bz2
+	)"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="extras nls"
+RESTRICT="test" # only used to validate .xml help files and fetches .dtd for it
 
-RDEPEND="app-text/gnome-doc-utils
-	>=x11-libs/gtk+-2.18.2:2
-	virtual/libintl"
-DEPEND="${RDEPEND}
+RDEPEND="
+	app-text/gnome-doc-utils
+	x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rarian
 	nls? ( sys-devel/gettext )"
 
@@ -29,31 +36,32 @@ PATCHES=(
 
 src_prepare() {
 	default
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Icon/s:\.png::' \
-		data/pasang-emas.desktop.in || die
+
+	sed -i '/Encoding/d;/Icon/s:\.png::' data/pasang-emas.desktop.in || die
+
 	gnome2_omf_fix
 }
 
 src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		--with-omf-dir=/usr/share/omf \
-		--with-help-dir=/usr/share/gnome/help \
+	local econfargs=(
 		$(use_enable nls)
+		--with-help-dir="${EPREFIX}"/usr/share/gnome/help
+		--with-omf-dir="${EPREFIX}"/usr/share/omf
+	)
+	econf "${econfargs[@]}"
+}
+
+src_compile(){
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
 	default
+
 	if use extras; then
 		insinto /usr/share/${PN}/themes
-		doins -r \
-			"${WORKDIR}"/marble \
-			"${WORKDIR}"/pasang-emas-themes-1.0/{conteng,kaca} \
-			"${WORKDIR}"/fragrance
+		doins -r "${WORKDIR}"/{fragrance,marble,pasang-emas-themes-1.0/{conteng,kaca}}
 	fi
-	use nls || rm -rf "${D}"usr/share/locale
 }
 
 pkg_preinst() {
-- 
cgit v1.2.3