[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[Michael Sterrett]

commit:     c830cb46af4ddf23b6fccf163d1286aaed90b393
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 07:30:32 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 07:31:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c830cb46

games-engines/gargoyle: build with gcc5 (bug #573378)

Package-Manager: portage-2.2.26

 games-engines/gargoyle/gargoyle-2011.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
index 428fc30..0494b53 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@
 # don't apply. (Fonts are installed through dependencies instead.)
 
 EAPI=5
-inherit eutils multiprocessing toolchain-funcs gnome2-utils games
+inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games
 
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@@ -57,6 +57,7 @@ src_prepare() {
 	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die
 
 	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[Tony Vroon]

commit:     052aafb60214cbf224df6ae71dd16eec51f7dffc
Author:     Nikos Chantziaras <realnc <AT> gmail <DOT> com>
AuthorDate: Wed Jul  4 17:03:20 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 10:49:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052aafb6

games-engines/gargoyle: fix build on recent GCC, ebuild improvements

Bumped EAPI, removed the use of games.eclass, fixed a runtime error due
to a no longer needed sed, create relative instead of absolute symlinks.
Revbump due to a file location change.

Closes: https://bugs.gentoo.org/642996
Package-Manager: Portage-2.3.42, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9052
Closes: https://bugs.gentoo.org/642996

 ...yle-2011.1.ebuild => gargoyle-2011.1-r1.ebuild} | 35 ++++++++++------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
similarity index 78%
rename from games-engines/gargoyle/gargoyle-2011.1.ebuild
rename to games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
index 640adac5fa7..82e11b23782 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1-r1.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
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
@@ -8,8 +8,8 @@
 # Since we don't compile or install any of the bundled fonts, their licenses
 # don't apply. (Fonts are installed through dependencies instead.)
 
-EAPI=5
-inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=media-fonts/libertine-5
+	media-fonts/libertine
 	media-fonts/liberation-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
@@ -52,11 +52,10 @@ src_prepare() {
 	# Convert garglk.ini to UNIX format.
 	edos2unix garglk/garglk.ini
 
-	# The font name of Linux Libertine changed in version 5.
-	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die
-
 	epatch "${FILESDIR}"/${P}-desktopfile.patch
 	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
+	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
+	default
 }
 
 src_compile() {
@@ -69,7 +68,7 @@ src_compile() {
 		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
 		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
 		-sC++FLAGS="" \
-		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
+		-sGARGLKINI="/etc/garglk.ini" \
 		-sUSESDL=yes \
 		-sBUNDLEFONTS=no \
 		-dx \
@@ -78,15 +77,15 @@ src_compile() {
 
 src_install() {
 	DESTDIR="${D}" \
-	_BINDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_APPDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_LIBDIR="$(games_get_libdir)" \
+	_BINDIR="/usr/libexec/${PN}" \
+	_APPDIR="/usr/libexec/${PN}" \
+	_LIBDIR="/usr/$(get_libdir)" \
 	EXEMODE=755 \
 	FILEMODE=755 \
 	jam install || die
 
 	# Install config file.
-	insinto "${GAMES_SYSCONFDIR}"
+	insinto "/etc"
 	newins garglk/garglk.ini garglk.ini
 
 	# Install application entry and icon.
@@ -97,24 +96,20 @@ src_install() {
 	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
 		level9 magnetic nitfol scare tadsr
 	do
-		dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \
-			"${GAMES_BINDIR}/${PN}-${terp}"
+		dosym "../libexec/${PN}/${terp}" \
+			"/usr/bin/${PN}-${terp}"
 	done
 
 	# Also symlink the main binary since it resides in libexec.
-	dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \
-		"${GAMES_BINDIR}/${PN}"
-
-	prepgamesdirs
+	dosym "../libexec/${PN}/${PN}" \
+		"/usr/bin/${PN}"
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[Sam James]

commit:     36ec19e265070eb6abe011f47117899c521cb064
Author:     Mikk Margus Möll <mikk.margus.moll <AT> eesti <DOT> ee>
AuthorDate: Sat Feb 27 19:06:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 19:11:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ec19e2

games-engines/gargoyle: Fix typo in BDEPEND

Bug: https://bugs.gentoo.org/739206
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Mikk Margus Möll <mikk.margus.moll <AT> eesti.ee>
Closes: https://github.com/gentoo/gentoo/pull/19694
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-engines/gargoyle/gargoyle-2019.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
index cfd146901b6..167f2840781 100644
--- a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	virtual/jpeg:0
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
-BDEPEBD="
+BDEPEND="
 	app-arch/unzip
 	dev-util/ftjam
 	virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[Sam James]

commit:     c8f56e7d9f586ac079f8433998676827f4781e3c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 03:28:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 05:21:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f56e7d

games-engines/gargoyle: filter LTO, no-SA

Aliasing violations in bundled library. I get the impression upstream isn't
interested in fixing these.

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

 games-engines/gargoyle/gargoyle-2019.1.1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
index 167f28407813..e37df39de5b6 100644
--- a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
@@ -64,6 +64,10 @@ src_prepare() {
 }
 
 src_compile() {
+	# Aliasing violations in bundled glulxe library (bug #858716)
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	# build system messes up flags and toolchain completely
 	# append flags to compiler commands to have consistent behavior
 	jam \

[gentoo-commits] repo/gentoo:master commit in: games-engines/gargoyle/

[Sam James]

commit:     f2695798e5f3ef8b273cdbfe323e7e24c82208ad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 03:29:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 05:21:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2695798

games-engines/gargoyle: fix VariableOrderWrong

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-engines/gargoyle/gargoyle-2019.1.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
index e37df39de5b6..b056e2f28b60 100644
--- a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
@@ -15,6 +15,7 @@ inherit desktop edos2unix flag-o-matic multiprocessing toolchain-funcs xdg
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
 SRC_URI="https://github.com/garglk/garglk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/garglk-${PV}"
 
 LICENSE="BSD GPL-2 MIT Hugo Glulxe"
 SLOT="0"
@@ -36,8 +37,6 @@ BDEPEND="
 	dev-util/ftjam
 	virtual/pkgconfig"
 
-S="${WORKDIR}/garglk-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-QA-desktop.patch