[gentoo-commits] repo/gentoo:master commit in: games-fps/rott/

2024-03-05 Thread Sam James
commit: 214dbaa6ba17af414093d38e2310b48a0e01967e
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Mar  5 23:05:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  6 03:36:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214dbaa6

games-fps/rott: mark as LTO-unsafe

The upstream website is being clever and suggesting that distros are the
real upstreams, and that releases happen by, every couple of years,
collecting all the patches distros have applied and turning that into a
release.

Hopeless. No bug reporting mechanism.

Closes: https://bugs.gentoo.org/858758
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-fps/rott/rott-1.1.2-r1.ebuild | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild 
b/games-fps/rott/rott-1.1.2-r1.ebuild
index a11a0d2074c1..7b80302df3e4 100644
--- a/games-fps/rott/rott-1.1.2-r1.ebuild
+++ b/games-fps/rott/rott-1.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Rise of the Triad for Linux!"
 HOMEPAGE="https://www.icculus.org/rott/;
@@ -33,6 +33,18 @@ src_prepare() {
 }
 
 src_compile() {
+   # -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/858758
+   #
+   # The upstream homepage notes that you should send bug reports and 
feature
+   # requests to your distro. Rationale: "1.1.2 contains all the debian
+   # patches from the previous 2.5 years" and "1.1.1. contains all the 
debian
+   # and fedora patches that accumulated during the past year."
+   #
+   # This is an interesting collaborative model that unfortunately means 
there
+   # will be NO bug report.
+   filter-lto
+
tc-export CC
emake -j1 \
EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"/usr/share/${PN}/\\\"" \



[gentoo-commits] repo/gentoo:master commit in: games-fps/rott/

2022-04-02 Thread James Le Cuirot
commit: a9e4b52409935d31b8fa5d8275eb33124c98aa5d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Apr  1 19:10:31 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Apr  2 09:02:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e4b524

games-fps/rott: EAPI8 bump, use HTTPS, fix calling cc directly

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24855
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/rott/rott-1.1.2-r1.ebuild | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild 
b/games-fps/rott/rott-1.1.2-r1.ebuild
index 915ad6efa315..a11a0d2074c1 100644
--- a/games-fps/rott/rott-1.1.2-r1.ebuild
+++ b/games-fps/rott/rott-1.1.2-r1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Rise of the Triad for Linux!"
-HOMEPAGE="http://www.icculus.org/rott/;
-SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
+HOMEPAGE="https://www.icculus.org/rott/;
+SRC_URI="https://www.icculus.org/rott/releases/${P}.tar.gz
demo? ( http://filesingularity.timedoctor.org/swdata.zip )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="demo"
 
-RDEPEND="media-libs/libsdl[sound,joystick,video]
+RDEPEND="
+   media-libs/libsdl[sound,joystick,video]
media-libs/sdl-mixer"
 DEPEND="${RDEPEND}
app-arch/unzip"
 
-S=${WORKDIR}/${P}/rott
+S="${WORKDIR}/${P}/rott"
 
 src_prepare() {
default
@@ -30,6 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
+   tc-export CC
emake -j1 \
EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"/usr/share/${PN}/\\\"" \
SHAREWARE=$(usex demo "1" "0")



[gentoo-commits] repo/gentoo:master commit in: games-fps/rott/

2017-02-14 Thread Austin English
commit: 452c7c70d4969cd3e80e4aa609047a3ef8147ddc
Author: Austin English  gentoo  org>
AuthorDate: Thu Feb  9 23:09:31 2017 +
Commit: Austin English  gentoo  org>
CommitDate: Tue Feb 14 23:41:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452c7c70

games-fps/rott: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 games-fps/rott/rott-1.1.2-r1.ebuild | 56 +
 1 file changed, 56 insertions(+)

diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild 
b/games-fps/rott/rott-1.1.2-r1.ebuild
new file mode 100644
index 00..d14d5f9918
--- /dev/null
+++ b/games-fps/rott/rott-1.1.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Rise of the Triad for Linux!"
+HOMEPAGE="http://www.icculus.org/rott/;
+SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
+   demo? ( http://filesingularity.timedoctor.org/swdata.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="demo"
+
+RDEPEND="media-libs/libsdl[sound,joystick,video]
+   media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+   app-arch/unzip"
+
+S=${WORKDIR}/${P}/rott
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/^CC =/d' \
+   Makefile || die "sed failed"
+   emake clean
+}
+
+src_compile() {
+   emake -j1 \
+   EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"/usr/share/${PN}/\\\"" \
+   SHAREWARE=$(usex demo "1" "0")
+}
+
+src_install() {
+   dobin rott
+   dodoc ../doc/*.txt ../README
+   doman ../doc/rott.6
+   if use demo ; then
+   cd "${WORKDIR}" || die
+   insinto /usr/share/${PN}
+   doins *.dmo huntbgin.* remote1.rts
+   fi
+}
+
+pkg_postinst() {
+   if ! use demo ; then
+   elog "To play the full version, just copy the"
+   elog "data files to /usr/share/${PN}/"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/rott/files/, games-fps/rott/

2015-12-28 Thread Michael Sterrett
commit: 706909c05d32c53b96e07afa24de97a4135fad55
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 05:19:30 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706909c0

old

Package-Manager: portage-2.2.24

 games-fps/rott/Manifest  |  1 -
 games-fps/rott/files/1.0-custom-datapath.patch   | 49 -
 games-fps/rott/files/rott-1.0-full-version.patch | 11 -
 games-fps/rott/files/rott-1.0-gcc41.patch| 22 --
 games-fps/rott/rott-1.0.ebuild   | 56 
 5 files changed, 139 deletions(-)

diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
index 6bf03ef..f44f459 100644
--- a/games-fps/rott/Manifest
+++ b/games-fps/rott/Manifest
@@ -1,3 +1,2 @@
-DIST rott-1.0.tar.gz 777281 SHA256 
11f9cc331d0be87f0f172840e2bb6e03e27c3b8e9ecbb3eb8cffdc5b73afbd95 SHA512 
f13183ed2b926e9352f9a1fe43ca87d949f642d77286e20c23c832de8c1c688c30ccab14aa09cb7589423b9c41ab16f41ae4b1d2526ae1bc75defc1395a0b899
 WHIRLPOOL 
67af2827f884a4057f223cd1f861be5929cdab9d4ab5b3b8f28c835ca0634696328b4b5c464da915efacdc805ad72dd05466be87037318f3a2cff111da948cda
 DIST rott-1.1.2.tar.gz 749079 SHA256 
102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff SHA512 
809a9064fe31c63afccb9a6397ac2c9d4172cdd802b055697cf3b0090ee6a78c9e40b52a4a8df25196489d9a0259304c91e2f84f95413a293bc66192502cf200
 WHIRLPOOL 
dc7808f0da85cfd1e240cbae20ddbbc1f564b5f294e42176a9c38795d3d34d2168476c5d415cce819afe67c3fa1da15812106969d463fc505bfc503c27b76580
 DIST swdata.zip 2889672 SHA256 
e226d4958ce1294886b32faf782d9db3d3e66f875d9addd62982e2c8d104fd6b SHA512 
99373097356afa583021367b2e0ec6ec745941890e4f17f4e07206c66dd370dfa9e928bc0bd6ab9809d8c72646dcc609e3c19f688d2b89a886f215a153b6dd0d
 WHIRLPOOL 
571d2a5c5f9c45def28f8950d6eaadf5110dbfb0b027951a6a56c1acefe799a7356bc2b436dbe7c9f47d868bdf6b03196fbc69591a66d11c2fb36ab1695125cd

diff --git a/games-fps/rott/files/1.0-custom-datapath.patch 
b/games-fps/rott/files/1.0-custom-datapath.patch
deleted file mode 100644
index 102801d..000
--- a/games-fps/rott/files/1.0-custom-datapath.patch
+++ /dev/null
@@ -1,49 +0,0 @@
 rt_main.c.orig 2003-06-19 23:03:34.0 -0400
-+++ rt_main.c  2003-06-19 23:04:49.0 -0400
-@@ -763,9 +763,9 @@
-// Normal ROTT wads
- 
- #if (SHAREWARE)
--   newargs [argnum++] = "huntbgin.wad";
-+   newargs [argnum++] = DATADIR "huntbgin.wad";
- #else
--   newargs [argnum++] = "darkwar.wad";
-+   newargs [argnum++] = DATADIR "darkwar.wad";
- #endif
- 
- //   newargs [argnum++] = "credits.wad";
-@@ -785,7 +785,7 @@
-   }
-else
-   {
--  newargs [argnum++] = "remote1.rts";
-+  newargs [argnum++] = DATADIR "remote1.rts";
-   }
- 
-newargs [argnum++] = NULL;
 _rt_ted.h.orig 2003-06-19 23:15:26.0 -0400
-+++ _rt_ted.h  2003-06-19 23:15:54.0 -0400
-@@ -84,17 +84,17 @@
- #define  MAXSILLYSTRINGS 32
- 
- #if (SHAREWARE==0)
--   #define  STANDARDGAMELEVELS   ("DARKWAR.RTL")
-+   #define  STANDARDGAMELEVELS   (DATADIR "DARKWAR.RTL")
-#if (SUPERROTT==1)
--   #define  STANDARDBATTLELEVELS ("ROTTCD.RTC")
-+   #define  STANDARDBATTLELEVELS (DATADIR "ROTTCD.RTC")
-#elif (SITELICENSE==1)
--   #define  STANDARDBATTLELEVELS ("ROTTSITE.RTC")
-+   #define  STANDARDBATTLELEVELS (DATADIR "ROTTSITE.RTC")
-#else
--   #define  STANDARDBATTLELEVELS ("DARKWAR.RTC")
-+   #define  STANDARDBATTLELEVELS (DATADIR "DARKWAR.RTC")
-#endif
- #else
--   #define  STANDARDGAMELEVELS   ("HUNTBGIN.RTL")
--   #define  STANDARDBATTLELEVELS ("HUNTBGIN.RTC")
-+   #define  STANDARDGAMELEVELS   (DATADIR "HUNTBGIN.RTL")
-+   #define  STANDARDBATTLELEVELS (DATADIR "HUNTBGIN.RTC")
- #endif
- 
- 

diff --git a/games-fps/rott/files/rott-1.0-full-version.patch 
b/games-fps/rott/files/rott-1.0-full-version.patch
deleted file mode 100644
index e1615e7..000
--- a/games-fps/rott/files/rott-1.0-full-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 develop.h.orig 2007-05-13 22:42:39.0 +0200
-+++ develop.h  2007-05-13 22:42:44.0 +0200
-@@ -40,7 +40,7 @@
- #define LOWCOST  0
- 
- // Make sure only one of the following are on at one time
--#define SHAREWARE   1
-+#define SHAREWARE   0
- #define SUPERROTT   0
- #define SITELICENSE 0
- 

diff --git a/games-fps/rott/files/rott-1.0-gcc41.patch 
b/games-fps/rott/files/rott-1.0-gcc41.patch
deleted file mode 100644
index c2f67b5..000
--- a/games-fps/rott/files/rott-1.0-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 rt_actor.h.old 2006-05-07 00:54:12.0 +0200
-+++ rt_actor.h 2006-05-07 00:54:23.0 +0200
-@@ -315,7 +315,6 @@
- extern  void *actorat[MAPSIZE][MAPSIZE];
- extern  int  angletodir[ANGLES];
- extern _2Dpoint  SNAKEPATH[512];
--extern  int  STOPSPEED;
- extern  int  FRICTION;

[gentoo-commits] repo/gentoo:master commit in: games-fps/rott/

2015-12-07 Thread Agostino Sarubbo
commit: 159ab1819ccb68bdd2d65fadff8e2d1b4a5a732d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  7 10:02:03 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  7 10:02:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159ab181

games-fps/rott: amd64 stable wrt bug #567500

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

 games-fps/rott/rott-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index dbf5011..8dba97c 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="demo"
 
 RDEPEND="media-libs/libsdl[sound,joystick,video]