[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Ulrich Müller]

commit:     2fe46c7f80e71005a765856b42d755d9d5a3ad52
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 08:16:18 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 08:16:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe46c7f

games-board/xscrabble: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0

 games-board/xscrabble/xscrabble-2.10-r1.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index e1c779a..6c5f4df 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,13 +8,13 @@ inherit eutils multilib games
 DESCRIPTION="An X11 clone of the well-known Scrabble"
 HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80"
 SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
-	linguas_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
+	l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
 	ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="linguas_fr"
+IUSE="l10n_fr"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXp"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${P}.tgz
 	cp "${DISTDIR}"/xscrabble_en.tgz .
-	use linguas_fr && cp "${DISTDIR}"/xscrabble_fr.tgz .
+	use l10n_fr && cp "${DISTDIR}"/xscrabble_fr.tgz .
 }
 
 src_prepare() {
@@ -42,7 +42,7 @@ src_install() {
 	local f
 	export DESTDIR="${D}" LIBDIR="$(get_libdir)"
 	./build install || die "install failed"
-	if use linguas_fr ; then
+	if use l10n_fr ; then
 		./build lang fr || die "fr failed"
 	fi
 	./build lang en || die "en failed"

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Ulrich Müller]

commit:     58196c0a86ff2e632a8ff4c9ce77f3ee1a5afb2e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 08:16:58 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 08:16:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58196c0a

games-board/xscrabble: Specify LICENSE more precisely.

Package-Manager: portage-2.3.0

 games-board/xscrabble/xscrabble-2.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index 6c5f4df..ce373e5 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
 	l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
 	ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="l10n_fr"

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Matt Turner]

commit:     dd56a04df4c196732bae083100fd631f86105530
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  1 19:06:25 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 19:06:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd56a04d

games-board/xscrabble: Drop unnecessary dependency on x11-libs/libXp

Closes: https://bugs.gentoo.org/649138

 .../xscrabble/{xscrabble-2.10-r1.ebuild => xscrabble-2.10-r2.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r2.ebuild
similarity index 94%
rename from games-board/xscrabble/xscrabble-2.10-r1.ebuild
rename to games-board/xscrabble/xscrabble-2.10-r2.ebuild
index 96d6d50b6b7..2ea0730cfc7 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="l10n_fr"
 
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXp"
+RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
 	x11-misc/imake"

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Sam James]

commit:     553481e83cc750fa0af9ff1a2f15ecfd9090491a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 07:34:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 08:10:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553481e8

games-board/xscrabble: fix Prefix install, respect AR and RANLIB

Not yet figured out LD, though.

Bug: https://bugs.gentoo.org/779973
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-board/xscrabble/xscrabble-2.10-r3.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r3.ebuild b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
index 26dd3487df3..fd0c07b9bb0 100644
--- a/games-board/xscrabble/xscrabble-2.10-r3.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
@@ -43,11 +43,15 @@ src_unpack() {
 
 src_prepare() {
 	default
-	sed -i '/install/s/-s //' build || die "sed failed"
+
+	# Don't strip binaries
+	sed -i '/install/s/-s //' build || die
+	# Respect AR, RANLIB
+	sed -i 's/CC="${CC}"/& AR="${AR} clq" RANLIB="${RANLIB}"/' build || die
 }
 
 src_configure() {
-	tc-export CC
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
@@ -55,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	export DESTDIR="${D}" LIBDIR="$(get_libdir)"
+	export DESTDIR="${ED}" LIBDIR="$(get_libdir)"
 
 	./build install || die "install failed"
 
@@ -66,7 +70,7 @@ src_install() {
 	./build lang en || die "en failed"
 
 	local f
-	for f in "${ED}/usr/${LIBDIR}"/X11/app-defaults/* ; do
+	for f in "${ED}/usr/$(get_libdir)"/X11/app-defaults/* ; do
 		[[ -L ${f} ]] && continue
 		sed -i \
 			-e "s:/usr/games/lib/scrabble/:/usr/share/${PN}/:" \

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Sam James]

commit:     63cd2d885978894630ec33c29abf6b124a654834
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 23:50:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:46:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63cd2d88

games-board/xscrabble: revbump for x11-terms/kterm collision blocker

Bug: https://bugs.gentoo.org/706322
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xscrabble/{xscrabble-2.10-r3.ebuild => xscrabble-2.10-r4.ebuild}     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-board/xscrabble/xscrabble-2.10-r3.ebuild b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
similarity index 98%
rename from games-board/xscrabble/xscrabble-2.10-r3.ebuild
rename to games-board/xscrabble/xscrabble-2.10-r4.ebuild
index 90d352cb971..f60f7b5ce43 100644
--- a/games-board/xscrabble/xscrabble-2.10-r3.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
@@ -20,6 +20,7 @@ DEPEND="x11-libs/libXaw"
 RDEPEND="
 	${DEPEND}
 	acct-group/gamestat
+	!<x11-terms/kterm-6.2.0-r7
 "
 BDEPEND="
 	x11-misc/gccmakedep

[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Sam James]

commit:     662e26354462659902688a72aa6eab60a165353b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 18:08:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 18:08:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662e2635

games-board/xscrabble: filter LTO (type mismatch)

Closes: https://bugs.gentoo.org/858623
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-board/xscrabble/xscrabble-2.10-r4.ebuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r4.ebuild b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
index f60f7b5ce43f..89303a0e6ce2 100644
--- a/games-board/xscrabble/xscrabble-2.10-r4.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="An X11 clone of the well-known Scrabble"
 HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80"
@@ -52,6 +52,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #858623
+	filter-lto
+
 	tc-export AR CC LD RANLIB
 	export IMAKECPP=${IMAKECPP:-$(tc-getCPP)}
 }