[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/files/, games-action/armagetronad/
commit: 82cb210e542c7705ad58e62b4d0d3dece70fc783
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jun 14 14:30:43 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jun 14 15:47:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82cb210e
games-action/armagetronad: drop 0.2.8.3.3-r1
Signed-off-by: Ionen Wolkens gentoo.org>
games-action/armagetronad/Manifest | 1 -
.../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 66 --
.../files/armagetronad-0.2.8.3.3-gcc6.patch| 222 -
3 files changed, 289 deletions(-)
diff --git a/games-action/armagetronad/Manifest
b/games-action/armagetronad/Manifest
index f5e1a88d326..7555c86c96e 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,2 +1 @@
-DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 BLAKE2B
60a8fffe61903cb1fa4b188ae6c72ad842e5395b8a37276a6b84018e5393e1294e6ef5438fc7e029d02bfd7172eb81973781e7fbb670c3c7fbacae46d19de409
SHA512
05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
DIST armagetronad-0.2.9.1.0.tbz 1943758 BLAKE2B
ed4ecef19125d69faf402829b88288124dd364eafc836be3848727c2bfbd87ca29e18b48448dc868fb995947b2daae150c3b9f5dcf048d0d90d442f5bcf425f0
SHA512
8c2b9cba7d480dec6d7d60984327a5d45c8c87b968fb81a1e192973e6826ddb66c8d41ca82bb04d80da5c6fa2152d19dd890957dabc6cc5ce2d4dffbc45d1f65
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
deleted file mode 100644
index 8c28621c0f8..000
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/;
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated sound"
-
-RDEPEND="
- dev-libs/libxml2
- !dedicated? (
- media-libs/libpng:0=
- media-libs/libsdl[X,opengl,video,sound?]
- media-libs/sdl-image[jpeg,png]
- virtual/glu
- virtual/opengl
- sound? ( media-libs/sdl-mixer )
- )"
-DEPEND=${RDEPEND}
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
- default
- sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
-}
-
-src_configure() {
- # --enable-games just messes up paths
- econf \
- $(use_enable dedicated) \
- $(use_enable sound music) \
- --disable-sysinstall \
- --disable-useradd \
- --disable-uninstall \
- --disable-games
-}
-
-src_install() {
- default
-
- # misplaced desktop-file/icons
- rm -r "${ED%/}"/usr/share/${PN}/desktop || die
- doicon -s 48 desktop/icons/large/armagetronad.png
- make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
deleted file mode 100644
index 0cd6e5bc1d6..000
--- a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768
-Commit: https://sourceforge.net/p/armagetronad/code/10845/
-
a/src/engine/eNetGameObject.cpp
-+++ b/src/engine/eNetGameObject.cpp
-@@ -85,7 +85,7 @@
- eNetGameObject::eNetGameObject(eGrid *grid, const eCoord ,const eCoord
,
-ePlayerNetID* p,bool autodelete)
- :eGameObject(grid, pos,dir,NULL,autodelete),
--nNetObject(p->Owner()),player(p){
-+ nNetObject(Owner(p)),player(p){
- lastClientsideAction=0;
- if (sn_GetNetState()!=nCLIENT)
- RequestSync();
-@@ -205,7 +205,7 @@
-
- void eNetGameObject::SetPlayer(ePlayerNetID* a_player)
- {
--tASSERT( !a_player || Owner() == player->Owner() );
-+tASSERT( !a_player || Owner() == Owner(player) );
- player = a_player;
- if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT )
- laggometerSmooth = laggometer = se_GetPing( player );
a/src/engine/ePlayer.cpp
-+++ b/src/engine/ePlayer.cpp
-@@ -56,6 +56,7 @@
- #include "nConfig.h"
- #include "nNetwork.h"
- #include
-+#include
-
- int se_lastSaidMaxEntries = 8;
-
-@@ -1689,9 +1690,9 @@
- // foo (Red Team) --> Blue Team: some message here
- eTeam *senderTeam = sender->CurrentTeam();
- console <<
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: 0cce357854ced1f93139ae1fbbccfbf5afe7b1ab Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jun 14 14:30:14 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jun 14 15:46:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cce3578 games-action/armagetronad: add github remote-id Signed-off-by: Ionen Wolkens gentoo.org> games-action/armagetronad/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml index 0a249e33579..377cf9573b0 100644 --- a/games-action/armagetronad/metadata.xml +++ b/games-action/armagetronad/metadata.xml @@ -6,6 +6,7 @@ Gentoo Games Project + ArmagetronAd/armagetronad armagetronad
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: ad66a3fe06a3fc02c8f76bcdd63f38400f602b0f
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jun 14 15:28:49 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jun 14 15:47:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad66a3fe
games-action/armagetronad: restore -j1, fix dedicated, tidy
j1 was removed for bug #588104, but turns out still needed for
install until proper fix (bug #698020).
No longer attempt to remove desktop/ when USE=dedicated (bug #716442).
Bug: https://bugs.gentoo.org/588104
Closes: https://bugs.gentoo.org/698020
Closes: https://bugs.gentoo.org/716442
Signed-off-by: Ionen Wolkens gentoo.org>
.../armagetronad/armagetronad-0.2.9.1.0.ebuild | 47 +++---
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
index 53ba592280d..93180672cd3 100644
--- a/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools desktop xdg-utils
+inherit autotools desktop
DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
HOMEPAGE="http://armagetronad.org/;
@@ -24,9 +24,11 @@ RDEPEND="
virtual/opengl
sound? ( media-libs/sdl-mixer )
)"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
-PATCHES=("${FILESDIR}"/${P}-AR.patch)
+PATCHES=(
+ "${FILESDIR}"/${P}-AR.patch
+)
src_prepare() {
default
@@ -35,29 +37,28 @@ src_prepare() {
}
src_configure() {
- # --enable-games just messes up paths
- econf \
- $(use_enable dedicated) \
- $(use_enable sound music) \
- --disable-sysinstall \
- --disable-useradd \
- --disable-uninstall \
+ local econfargs=(
+ $(use_enable dedicated)
+ $(use_enable sound music)
+ # following options only mess with paths and users
--disable-games
+ --disable-sysinstall
+ --disable-uninstall
+ --disable-useradd
+ )
+ econf ${econfargs[@]}
}
src_install() {
- default
-
- # misplaced desktop-file/icons
- rm -r "${ED}"/usr/share/${PN}/desktop || die
- doicon -s 48 desktop/icons/48x48/armagetronad.png
- make_desktop_entry ${PN}
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
+ # long history of being broken without -j1 (bug #330705,698020)
+ # do not remove (again) without a proper fix or extensive tests
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
-pkg_postrm() {
- xdg_icon_cache_update
+ # handle misplaced .desktop / icons
+ if ! use dedicated; then
+ rm -r "${ED}"/usr/share/${PN}/desktop || die
+ doicon desktop/icons/48x48/armagetronad.png
+ make_desktop_entry ${PN}
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/files/, games-action/armagetronad/
commit: df09de6882ee27954b1ec0da8291f8e2972afce6
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun May 2 19:32:18 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun May 2 19:32:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df09de68
games-action/armagetronad: bump up to 0.2.9.1.0
Fix-by: Alan Swanson
Closes: https://bugs.gentoo.org/764983
Closes: https://bugs.gentoo.org/739070
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich gentoo.org>
games-action/armagetronad/Manifest | 1 +
.../armagetronad/armagetronad-0.2.9.1.0.ebuild | 63 ++
.../files/armagetronad-0.2.9.1.0-AR.patch | 10
3 files changed, 74 insertions(+)
diff --git a/games-action/armagetronad/Manifest
b/games-action/armagetronad/Manifest
index d162f158f53..f5e1a88d326 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1 +1,2 @@
DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 BLAKE2B
60a8fffe61903cb1fa4b188ae6c72ad842e5395b8a37276a6b84018e5393e1294e6ef5438fc7e029d02bfd7172eb81973781e7fbb670c3c7fbacae46d19de409
SHA512
05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
+DIST armagetronad-0.2.9.1.0.tbz 1943758 BLAKE2B
ed4ecef19125d69faf402829b88288124dd364eafc836be3848727c2bfbd87ca29e18b48448dc868fb995947b2daae150c3b9f5dcf048d0d90d442f5bcf425f0
SHA512
8c2b9cba7d480dec6d7d60984327a5d45c8c87b968fb81a1e192973e6826ddb66c8d41ca82bb04d80da5c6fa2152d19dd890957dabc6cc5ce2d4dffbc45d1f65
diff --git a/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
new file mode 100644
index 000..53ba592280d
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
+HOMEPAGE="http://armagetronad.org/;
+SRC_URI="https://launchpad.net/armagetronad/$(ver_cut
1-3)/${PV}/+download/armagetronad-${PV}.tbz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated sound"
+
+RDEPEND="
+ dev-libs/libxml2
+ !dedicated? (
+ media-libs/libpng:0=
+ media-libs/libsdl[X,opengl,video,sound?]
+ media-libs/sdl-image[jpeg,png]
+ virtual/glu
+ virtual/opengl
+ sound? ( media-libs/sdl-mixer )
+ )"
+DEPEND=${RDEPEND}
+
+PATCHES=("${FILESDIR}"/${P}-AR.patch)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # --enable-games just messes up paths
+ econf \
+ $(use_enable dedicated) \
+ $(use_enable sound music) \
+ --disable-sysinstall \
+ --disable-useradd \
+ --disable-uninstall \
+ --disable-games
+}
+
+src_install() {
+ default
+
+ # misplaced desktop-file/icons
+ rm -r "${ED}"/usr/share/${PN}/desktop || die
+ doicon -s 48 desktop/icons/48x48/armagetronad.png
+ make_desktop_entry ${PN}
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/games-action/armagetronad/files/armagetronad-0.2.9.1.0-AR.patch
b/games-action/armagetronad/files/armagetronad-0.2.9.1.0-AR.patch
new file mode 100644
index 000..5f48ded3f7d
--- /dev/null
+++ b/games-action/armagetronad/files/armagetronad-0.2.9.1.0-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
b/configure.ac
+@@ -28,6 +28,7 @@ dnl those two are apparently included in AC_CANONICAL_TARGET
+ dnl AC_CANONICAL_BUILD
+ dnl AC_CANONICAL_HOST
+
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AM_INIT_AUTOMAKE([subdir-objects tar-ustar])
+
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: c23c7ac9592dc6e225c669dcaa9cb0d3eaafbc78
Author: David Seifert gentoo org>
AuthorDate: Sun Nov 19 13:31:58 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 19 13:34:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23c7ac9
games-action/armagetronad: Minor touchups
Closes: https://bugs.gentoo.org/588104
Package-Manager: Portage-2.3.14, Repoman-2.3.6
.../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
index 7aa64769890..9147b211160 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit eutils gnome2-utils
DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
@@ -16,15 +17,12 @@ IUSE="dedicated sound"
RDEPEND="
dev-libs/libxml2
!dedicated? (
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
+ media-libs/libpng:0=
+ media-libs/libsdl[X,opengl,video,sound?]
media-libs/sdl-image[jpeg,png]
virtual/glu
virtual/opengl
- sound? (
- media-libs/libsdl[sound]
- media-libs/sdl-mixer
- )
+ sound? ( media-libs/sdl-mixer )
)"
DEPEND=${RDEPEND}
@@ -38,7 +36,6 @@ src_prepare() {
src_configure() {
# --enable-games just messes up paths
econf \
- --docdir=/usr/share/doc/${PF} \
$(use_enable dedicated) \
$(use_enable sound music) \
--disable-sysinstall \
@@ -48,12 +45,10 @@ src_configure() {
}
src_install() {
- # FIXME: is the -j1 needed? https://bugs.gentoo.org/588104
- emake -j1 DESTDIR="${D}" install
- einstalldocs
+ default
# misplaced desktop-file/icons
- rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
+ rm -r "${ED%/}"/usr/share/${PN}/desktop || die
doicon -s 48 desktop/icons/large/armagetronad.png
make_desktop_entry ${PN}
}
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: f12952f6684d87e4017ac4cbe2a06fc00d7ab74e
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Oct 1 12:33:47 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Oct 1 12:34:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12952f6
games-action/armagetronad: stabilise 0.2.8.3.3-r1 for amd64/x86
Closes: https://bugs.gentoo.org/632544
Package-Manager: Portage-2.3.8, Repoman-2.3.3
games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
index 7aa64769890..ae1515f218f 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/arma
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="dedicated sound"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: f5af4251ae07dc4a0921739827db1074e723704e
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Oct 1 12:34:12 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Oct 1 12:34:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5af4251
games-action/armagetronad: remove 0.2.8.3.2/0.2.8.3.3
Package-Manager: Portage-2.3.8, Repoman-2.3.3
games-action/armagetronad/Manifest | 1 -
.../armagetronad/armagetronad-0.2.8.3.2.ebuild | 75 --
.../armagetronad/armagetronad-0.2.8.3.3.ebuild | 71
3 files changed, 147 deletions(-)
diff --git a/games-action/armagetronad/Manifest
b/games-action/armagetronad/Manifest
index 39565fbf330..2a6d4fa205e 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,2 +1 @@
-DIST armagetronad-0.2.8.3.2.src.tar.bz2 1841407 SHA256
f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5 SHA512
ffe16d55d4ea3c9e3f4f8828a9ffb09274b20a33c6d5c91cccbe846fa93f7d1d78e565db3c9403debf9f7bfde76322477a84349d85b475ed20c184da281107a4
WHIRLPOOL
f04902c7bf3b13ec35497202a658ef96846b59d4245c72a17793b186d06a8f2d2dc1960b563b785cfb46aa9e2252a8ba22436df44e4ccfa2e8c872b4eb51eb4a
DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256
ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512
05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
WHIRLPOOL
731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
deleted file mode 100644
index 67ec0560d56..000
--- a/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/;
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV}/+download/armagetronad-${PV}.src.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated sound"
-
-RDEPEND="
- dev-libs/libxml2
- !dedicated? (
- media-libs/libpng:0
- media-libs/sdl-image[jpeg,png]
- virtual/glu
- virtual/opengl
- sound? (
- media-libs/libsdl[X,sound,opengl,video]
- media-libs/sdl-mixer
- )
- !sound? ( media-libs/libsdl[X,opengl,video] )
- )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- sed -i \
- -e 's/"png_check_sig"/"png_sig_cmp"/' \
- -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' \
- configure || die
-}
-
-src_configure() {
- # --enable-games just messes up paths
- egamesconf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable dedicated) \
- $(use_enable sound music) \
- --disable-sysinstall \
- --disable-useradd \
- --disable-uninstall \
- --disable-games
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-
- # misplaced desktop-file/icons
- rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
- doicon -s 48 desktop/icons/large/armagetronad.png
- make_desktop_entry ${PN}
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
deleted file mode 100644
index 343fef44d03..000
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/;
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated sound"
-
-RDEPEND="
- dev-libs/libxml2
- !dedicated? (
- media-libs/libpng:0
- media-libs/sdl-image[jpeg,png]
- virtual/glu
- virtual/opengl
- media-libs/libsdl[X,opengl,video]
- sound? (
- media-libs/libsdl[sound]
- media-libs/sdl-mixer
-
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/, games-action/armagetronad/files/
commit: 85673de37c260f353160cc32452383eea2406a13
Author: Peter Levine gmail com>
AuthorDate: Wed Jul 19 08:14:31 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jul 30 09:08:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85673de3
games-action/armagetronad: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5133
.../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 4 +-
.../files/armagetronad-0.2.8.3.3-gcc6.patch| 222 +
2 files changed, 225 insertions(+), 1 deletion(-)
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
index a6fc79e3a85..7aa64769890 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.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
@@ -28,6 +28,8 @@ RDEPEND="
)"
DEPEND=${RDEPEND}
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
src_prepare() {
default
sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
diff --git a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
new file mode 100644
index 000..0cd6e5bc1d6
--- /dev/null
+++ b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
@@ -0,0 +1,222 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768
+Commit: https://sourceforge.net/p/armagetronad/code/10845/
+
+--- a/src/engine/eNetGameObject.cpp
b/src/engine/eNetGameObject.cpp
+@@ -85,7 +85,7 @@
+ eNetGameObject::eNetGameObject(eGrid *grid, const eCoord ,const eCoord
,
+ePlayerNetID* p,bool autodelete)
+ :eGameObject(grid, pos,dir,NULL,autodelete),
+-nNetObject(p->Owner()),player(p){
++ nNetObject(Owner(p)),player(p){
+ lastClientsideAction=0;
+ if (sn_GetNetState()!=nCLIENT)
+ RequestSync();
+@@ -205,7 +205,7 @@
+
+ void eNetGameObject::SetPlayer(ePlayerNetID* a_player)
+ {
+-tASSERT( !a_player || Owner() == player->Owner() );
++tASSERT( !a_player || Owner() == Owner(player) );
+ player = a_player;
+ if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT )
+ laggometerSmooth = laggometer = se_GetPing( player );
+--- a/src/engine/ePlayer.cpp
b/src/engine/ePlayer.cpp
+@@ -56,6 +56,7 @@
+ #include "nConfig.h"
+ #include "nNetwork.h"
+ #include
++#include
+
+ int se_lastSaidMaxEntries = 8;
+
+@@ -1689,9 +1690,9 @@
+ // foo (Red Team) --> Blue Team: some message here
+ eTeam *senderTeam = sender->CurrentTeam();
+ console << tColoredString::ColorString(1,1,.5) << " (";
+-console << *senderTeam;
++console << senderTeam;
+ console << tColoredString::ColorString(1,1,.5) << ") --> ";
+-console << *team;
++console << team;
+ }
+
+ console << tColoredString::ColorString(1,1,.5) << ": ";
+@@ -1923,7 +1924,7 @@
+ else {
+ eTeam *senderTeam = sender->CurrentTeam();
+ say << tColoredString::ColorString(1,1,.5) << " (";
+-say << *team;
++say << team;
+ say << tColoredString::ColorString(1,1,.5) << " ) --> ";
+ say << senderTeam;
+ }
+@@ -3941,7 +3942,7 @@
+ sg_ClampPingCharity( ::pingCharity );
+ }
+
+-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
++static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
+
+ static nSpamProtectionSettings se_chatSpamSettings( 1.0f,
"SPAM_PROTECTION_CHAT", tOutput("$spam_protection") );
+
+--- a/src/engine/eTeam.cpp
b/src/engine/eTeam.cpp
+@@ -31,20 +31,21 @@
+ #include "nConfig.h"
+
+ #include
++#include
+
+-tString & operator << ( tString , const eTeam & team)
++tString & operator << ( tString , const eTeam * team)
+ {
+-if ( !() )
++if ( !team )
+ return s << tOutput("$player_spectator_message");
+ else
+-return s << team.GetColoredName();
++return s << team->GetColoredName();
+ }
+-std::ostream & operator << ( std::ostream , const eTeam & team)
++std::ostream & operator << ( std::ostream , const eTeam * team)
+ {
+-if ( !() )
++if ( !team )
+ return s << tOutput("$player_spectator_message");
+ else
+-return s << team.GetColoredName();
++return s << team->GetColoredName();
+ }
+
+ #define TEAMCOLORS 8
+@@ -75,7 +76,7 @@
+ // static tList se_ColoredTeams;
+ static eTeam * se_ColoredTeams[TEAMCOLORS]={0,0,0,0,0,0,0,0};
+
+-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
++static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
+
+ // class that creates config items for one team
+ // TEAM_(NAME|RED|GREEN|BLUE)_X
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: 8f20d34724292c6f0dac17bb4b6fb5cea350f359
Author: Austin English gentoo org>
AuthorDate: Tue Jul 5 21:18:01 2016 +
Commit: Austin English gentoo org>
CommitDate: Tue Jul 5 21:18:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f20d347
games-action/armagetronad: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.2.28
.../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 70 ++
1 file changed, 70 insertions(+)
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
new file mode 100644
index 000..c976a01
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
+HOMEPAGE="http://armagetronad.org/;
+SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated sound"
+
+RDEPEND="
+ dev-libs/libxml2
+ !dedicated? (
+ media-libs/libpng:0
+ media-libs/libsdl[X,opengl,video]
+ media-libs/sdl-image[jpeg,png]
+ virtual/glu
+ virtual/opengl
+ sound? (
+ media-libs/libsdl[sound]
+ media-libs/sdl-mixer
+ )
+ )"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+ default
+ sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
+}
+
+src_configure() {
+ # --enable-games just messes up paths
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable dedicated) \
+ $(use_enable sound music) \
+ --disable-sysinstall \
+ --disable-useradd \
+ --disable-uninstall \
+ --disable-games
+}
+
+src_install() {
+ # FIXME: is the -j1 needed? https://bugs.gentoo.org/588104
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+
+ # misplaced desktop-file/icons
+ rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
+ doicon -s 48 desktop/icons/large/armagetronad.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: da3661068092ec560dbb3762794461ffac598529
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jun 6 14:30:21 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jun 6 14:30:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da366106
games-action/armagetronad: amd64 stable wrt bug #583050
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
index c292cc1..1dfa5ff 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/arma
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="dedicated sound"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: games-action/armagetronad/
commit: 89ec8e0f28db5db908d1e53075f161c7ced08d7e
Author: Michael Sterrett gentoo org>
AuthorDate: Wed Apr 13 04:18:34 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed Apr 13 04:18:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ec8e0f
games-action/armagetronad: version bump
Package-Manager: portage-2.2.26
games-action/armagetronad/Manifest | 1 +
.../armagetronad/armagetronad-0.2.8.3.3.ebuild | 72 ++
2 files changed, 73 insertions(+)
diff --git a/games-action/armagetronad/Manifest
b/games-action/armagetronad/Manifest
index 30678d8..39565fb 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1 +1,2 @@
DIST armagetronad-0.2.8.3.2.src.tar.bz2 1841407 SHA256
f444e481de94e6c0e3933c709d46effd2adfe823f5ef44768adcc8003b8ba7c5 SHA512
ffe16d55d4ea3c9e3f4f8828a9ffb09274b20a33c6d5c91cccbe846fa93f7d1d78e565db3c9403debf9f7bfde76322477a84349d85b475ed20c184da281107a4
WHIRLPOOL
f04902c7bf3b13ec35497202a658ef96846b59d4245c72a17793b186d06a8f2d2dc1960b563b785cfb46aa9e2252a8ba22436df44e4ccfa2e8c872b4eb51eb4a
+DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 SHA256
ddf2d781b134392e9667f17e0319ae2117c20e6eb7738e3cacd701f3608ea5e8 SHA512
05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
WHIRLPOOL
731b3e8d8647948e016e4dbfa3733f666838d0b4e47f997e149b947741d3b566d9aa1492dc570064e0005c92b0c04f4c74ad4a0278ff7018b028d9c431af135d
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
new file mode 100644
index 000..c292cc1
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
+HOMEPAGE="http://armagetronad.org/;
+SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated sound"
+
+RDEPEND="
+ dev-libs/libxml2
+ !dedicated? (
+ media-libs/libpng:0
+ media-libs/sdl-image[jpeg,png]
+ virtual/glu
+ virtual/opengl
+ media-libs/libsdl[X,opengl,video]
+ sound? (
+ media-libs/libsdl[sound]
+ media-libs/sdl-mixer
+ )
+ )"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+ sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
+}
+
+src_configure() {
+ # --enable-games just messes up paths
+ egamesconf \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable dedicated) \
+ $(use_enable sound music) \
+ --disable-sysinstall \
+ --disable-useradd \
+ --disable-uninstall \
+ --disable-games
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+
+ # misplaced desktop-file/icons
+ rm -rf "${ED%/}${GAMES_DATADIR}"/armagetronad/desktop
+ doicon -s 48 desktop/icons/large/armagetronad.png
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
