public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2015-12-16 10:12 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2015-12-16 10:12 UTC (permalink / raw
  To: gentoo-commits

commit:     96a3a1b5e73df2043fb77821af8eb093f579ad00
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 10:12:05 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 10:12:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a3a1b5

games-strategy/scorched3d: amd64 stable wrt bug #568264

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-strategy/scorched3d/scorched3d-44-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index 4314d1f..cbbdb22 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="media-libs/libsdl[video]


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2015-12-21  5:39 Jeroen Roovers
  0 siblings, 0 replies; 11+ messages in thread
From: Jeroen Roovers @ 2015-12-21  5:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0fb28aaf22c0964b1235eab3c615bac7f6d637ef
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 05:39:12 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 05:39:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb28aaf

games-strategy/scorched3d: Stable for PPC64 (bug #568264).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 games-strategy/scorched3d/scorched3d-44-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index cbbdb22..d82dfe3 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="media-libs/libsdl[video]


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2015-12-26 10:36 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2015-12-26 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     9bb79dffd99b94cf9485e9b304b6d76a26687a57
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 10:34:04 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 10:34:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bb79dff

games-strategy/scorched3d: ppc stable wrt bug #568264

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 games-strategy/scorched3d/scorched3d-44-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index 3ef5226..058665d 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="dedicated mysql"
 
 RDEPEND="media-libs/libsdl[video]


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2015-12-29  7:41 Michael Sterrett
  0 siblings, 0 replies; 11+ messages in thread
From: Michael Sterrett @ 2015-12-29  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     73ddd1ad16f7561eacf579d4660996a879e6beb9
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 03:58:42 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 07:40:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ddd1ad

old

Package-Manager: portage-2.2.24

 games-strategy/scorched3d/scorched3d-44.ebuild | 78 --------------------------
 1 file changed, 78 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44.ebuild b/games-strategy/scorched3d/scorched3d-44.ebuild
deleted file mode 100644
index 19078cd..0000000
--- a/games-strategy/scorched3d/scorched3d-44.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER=2.8
-inherit autotools eutils wxwidgets games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="dedicated mysql"
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	dev-libs/expat
-	media-fonts/dejavu
-	!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/freealut
-		x11-libs/wxGTK:2.8[X]
-		media-libs/freetype:2
-		sci-libs/fftw:3.0
-	)
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	!dedicated? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/scorched
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fixups.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-odbc.patch \
-		"${FILESDIR}"/${P}-win32.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-jpeg9.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--with-fftw=/usr \
-		--with-ogg=/usr \
-		--with-vorbis=/usr \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		--with-docdir="/usr/share/doc/${PF}" \
-		--with-wx-config="${WX_CONFIG}" \
-		--without-pgsql \
-		$(use_with mysql) \
-		$(use_enable dedicated serveronly)
-}
-
-src_install() {
-	default
-	rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf"
-	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf"
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf"
-	if ! use dedicated ; then
-		newicon data/images/tank-old.bmp ${PN}.bmp || die
-		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-	fi
-	prepgamesdirs
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2017-10-15 12:53 Sergei Trofimovich
  0 siblings, 0 replies; 11+ messages in thread
From: Sergei Trofimovich @ 2017-10-15 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     57a4f290837bbaf5a64a8de8eabda61461781d53
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 12:52:52 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 12:52:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a4f290

games-strategy/scorched3d: stable 44-r2 for ppc64, bug #632517

Package-Manager: Portage-2.3.11, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 games-strategy/scorched3d/scorched3d-44-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index e156ff902fd..bc99fa9132b 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2017-10-27 12:54 Thomas Deutschmann
  0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2017-10-27 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e468d86ff347efe3c3f273cdabf3fdbfd046b7c8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 11:55:16 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 12:53:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e468d86f

games-strategy/scorched3d: x86 stable (bug #632517)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 games-strategy/scorched3d/scorched3d-44-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index bc99fa9132b..6561bfa9b2f 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 x86"
 IUSE="dedicated mysql"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2017-10-31 18:41 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2017-10-31 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     acbd1c45f2f06f71ec72cf5a007249bdeec30e5f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:40:30 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 18:40:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbd1c45

games-strategy/scorched3d: amd64 stable, bug 632517

Last arch, closing

Closes: https://bugs.gentoo.org/632517
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 games-strategy/scorched3d/scorched3d-44-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index 6561bfa9b2f..0d3eca269af 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="dedicated mysql"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2017-12-21  1:57 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2017-12-21  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     de62a4871bdd1c9b7c7643dce5cbcf50a02484a1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:30:32 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 01:55:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de62a487

games-strategy/scorched3d: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/scorched3d/scorched3d-44-r1.ebuild | 83 -----------------------
 1 file changed, 83 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
deleted file mode 100644
index 86fb388a544..00000000000
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-inherit autotools eutils wxwidgets games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="dedicated mysql"
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-net
-	media-libs/libpng:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	dev-libs/expat
-	media-fonts/dejavu
-	!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/freealut
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		media-libs/freetype:2
-		sci-libs/fftw:3.0
-	)
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	!dedicated? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/scorched
-
-src_prepare() {
-	edos2unix \
-		src/launcher/wxdialogs/SettingsDialog.cpp \
-		src/launcher/wxdialogs/DisplayDialog.cpp \
-		src/launcher/wxdialogs/Display.cpp \
-		src/launcher/wxdialogs/KeyDialog.cpp
-	epatch \
-		"${FILESDIR}"/${P}-fixups.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-odbc.patch \
-		"${FILESDIR}"/${P}-win32.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-jpeg9.patch \
-		"${FILESDIR}"/${P}-wxgtk.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--with-fftw=/usr \
-		--with-ogg=/usr \
-		--with-vorbis=/usr \
-		--datadir="${GAMES_DATADIR}/${PN}" \
-		--with-docdir="/usr/share/doc/${PF}" \
-		--with-wx-config="${WX_CONFIG}" \
-		--without-pgsql \
-		$(use_with mysql) \
-		$(use_enable dedicated serveronly)
-}
-
-src_install() {
-	default
-	rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf"
-	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf"
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf"
-	if ! use dedicated ; then
-		newicon data/images/tank-old.bmp ${PN}.bmp || die
-		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-	fi
-	prepgamesdirs
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2021-04-04 22:29 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2021-04-04 22:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6cba898d0f8b83f27d255855eaa85a0a2d040704
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 22:28:29 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 22:28:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cba898d

games-strategy/scorched3d: Port to EAPI 7

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-strategy/scorched3d/scorched3d-44-r2.ebuild | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index 384864e070c..2916571b3d9 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER=3.0
-
-inherit autotools eutils wxwidgets
+WX_GTK_VER="3.0"
+inherit autotools desktop edos2unix wxwidgets
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
 SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
+S="${WORKDIR}/scorched"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,10 +37,8 @@ RDEPEND="
 		sci-libs/fftw:3.0=
 	)
 	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	!dedicated? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/scorched
+DEPEND="${RDEPEND}"
+BDEPEND="!dedicated? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fixups.patch
@@ -53,10 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-c++14.patch
 )
 
-pkg_setup() {
-	setup-wxwidgets
-}
-
 src_prepare() {
 	edos2unix \
 		src/launcher/wxdialogs/SettingsDialog.cpp \
@@ -68,6 +62,7 @@ src_prepare() {
 }
 
 src_configure() {
+	setup-wxwidgets
 	econf \
 		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--with-fftw="${EPREFIX}"/usr \
@@ -84,7 +79,7 @@ src_install() {
 	default
 
 	# remove bundled fonts
-	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
+	rm "${ED}"/usr/share/${PN}/data/fonts/* || die
 	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
 	dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
 	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2024-03-06  3:37 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-06  3:37 UTC (permalink / raw
  To: gentoo-commits

commit:     71cd74c50f6b6fa79e36577642e9d681ebaa31bc
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 23:55:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 03:36:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd74c5

games-strategy/scorched3d: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/859265
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/scorched3d/scorched3d-44-r3.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r3.ebuild b/games-strategy/scorched3d/scorched3d-44-r3.ebuild
index 526a838be935..a9bcf92633c9 100644
--- a/games-strategy/scorched3d/scorched3d-44-r3.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
-inherit autotools desktop edos2unix wxwidgets
+inherit autotools desktop edos2unix flag-o-matic wxwidgets
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
@@ -69,6 +69,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859265
+	# Upstream is inactive, latest activity from 9 years ago, sourceforge
+	# project. Not filing a bug.
+	filter-lto
+
 	setup-wxwidgets
 	econf \
 		--datadir="${EPREFIX}"/usr/share/${PN} \


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/
@ 2024-07-05 17:49 Pacho Ramos
  0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos @ 2024-07-05 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f44533fa9141a16ef0f507f0159627c31ce2a738
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 17:24:08 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 17:48:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44533fa

games-strategy/scorched3d: drop 44-r2

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-strategy/scorched3d/scorched3d-44-r2.ebuild | 91 -----------------------
 1 file changed, 91 deletions(-)

diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
deleted file mode 100644
index c6cea36cfce0..000000000000
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit autotools desktop edos2unix wxwidgets
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="https://downloads.sourceforge.net/scorched3d/Scorched3D-${PV}-src.tar.gz"
-S="${WORKDIR}/scorched"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="dedicated mysql"
-
-RDEPEND="
-	dev-libs/expat
-	media-fonts/dejavu
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-net
-	sys-libs/zlib
-	virtual/jpeg:0
-	!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew:0=
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/freealut
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		media-libs/freetype:2
-		sci-libs/fftw:3.0=
-	)
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}"
-BDEPEND="!dedicated? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fixups.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-odbc.patch
-	"${FILESDIR}"/${P}-win32.patch
-	"${FILESDIR}"/${P}-freetype.patch
-	"${FILESDIR}"/${P}-jpeg9.patch
-	"${FILESDIR}"/${P}-wxgtk.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-src_prepare() {
-	edos2unix \
-		src/launcher/wxdialogs/SettingsDialog.cpp \
-		src/launcher/wxdialogs/DisplayDialog.cpp \
-		src/launcher/wxdialogs/Display.cpp \
-		src/launcher/wxdialogs/KeyDialog.cpp
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-	econf \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--with-fftw="${EPREFIX}"/usr \
-		--with-ogg="${EPREFIX}"/usr \
-		--with-vorbis="${EPREFIX}"/usr \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-wx-config="${WX_CONFIG}" \
-		--without-pgsql \
-		$(use_with mysql) \
-		$(use_enable dedicated serveronly)
-}
-
-src_install() {
-	default
-
-	# remove bundled fonts
-	rm "${ED}"/usr/share/${PN}/data/fonts/* || die
-	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
-
-	if ! use dedicated; then
-		newicon data/images/tank-old.bmp ${PN}.bmp
-		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-	fi
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-07-05 17:49 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-27 12:54 [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2024-07-05 17:49 Pacho Ramos
2024-03-06  3:37 Sam James
2021-04-04 22:29 David Seifert
2017-12-21  1:57 David Seifert
2017-10-31 18:41 Andreas Hüttel
2017-10-15 12:53 Sergei Trofimovich
2015-12-29  7:41 Michael Sterrett
2015-12-26 10:36 Agostino Sarubbo
2015-12-21  5:39 Jeroen Roovers
2015-12-16 10:12 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox