From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- games-action/armagetronad/Manifest | 7 +- .../armagetronad/armagetronad-0.2.8.3.3-r1.ebuild | 66 ------ .../armagetronad/armagetronad-0.2.9.1.0.ebuild | 47 ++--- .../files/armagetronad-0.2.8.3.3-gcc6.patch | 222 --------------------- games-action/armagetronad/metadata.xml | 1 + 5 files changed, 27 insertions(+), 316 deletions(-) delete mode 100644 games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild delete mode 100644 games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch (limited to 'games-action/armagetronad') diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest index 31978d89f80c..7d41bb11c2ab 100644 --- a/games-action/armagetronad/Manifest +++ b/games-action/armagetronad/Manifest @@ -1,7 +1,4 @@ -AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 BLAKE2B af8f6ec0ab77839ced171e6002279952a1aa680115bf2985c69df8b973c67f8c6516a45608737b4e473175b5682b0a03ec2c089a70b47b34ffeb8ce9318aad9c SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44 AUX armagetronad-0.2.9.1.0-AR.patch 242 BLAKE2B ac48c365a56cecfb148752949def751bb63d6bfab51e406da9c0ebcc495cd2ce5a3954f9eae7235bd4759d83b7a6eaf9d2c4038f649b321a777bbd113d790d0d SHA512 d1812fc8ca2292ad0536978cdba31f1e0806f729519767ff1a1c75b04ee49bf7fc0eed3b7c63a485600956455875dd5f270b0ecddcf021478b81a057f8746902 -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 -EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1322 BLAKE2B 17fac2f4eef2cf863f00dd5ef74fe97c7626eff8aa5891db4b6eebfcee6f2cf622f714eabbeece980b2d09214523ec5d0ef9239f1de3b7812e2c99b48b0b0b9c SHA512 1b3d8a2ae1ba78a13357358225d5a97de9ed9a725b347e72cc5cc5cb6c869eac1ce9a9015a450f762cf0c3cf1bc02327913ea0f1913456c6f956ffbd2b7766d1 -EBUILD armagetronad-0.2.9.1.0.ebuild 1211 BLAKE2B 073907830215a6629e8e3b991e762fe17f2c011676fcbb6669db2bf26187564bb6c6836f61e5404c8a88b40ea62d00d327f6fb2c51c17afc72b4178d579d29bd SHA512 e5d14cf2ec4899099e19415bb7510bf4e1df66307ca5a2e8639e9ac36ed140b0741641fe3681a1bd9e43edd451f0f79bc3167414ec0bfe0b800153437ffe0dde -MISC metadata.xml 333 BLAKE2B 9e7f4657f3f025fbe42e09e9b64d191a79a125ad3df9ff007e1f6cbdbe40b9311ef257adac0a5861750c21c067bfe6165e80451ac211e06dd0dce542f126ca3f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead +EBUILD armagetronad-0.2.9.1.0.ebuild 1363 BLAKE2B b00f8ed0b7aae8fda36b2141692ec0adb020afb9dd241628d621dc48b440f6fe72122ca0afe7c4274860d8d597dfaf65f27590302b78698644821243de07ed16 SHA512 bdeeabbed4ffb9cb3571410cf3c31694b30ec427da8fcc9ec7ee4454eae8a039dde746b9e1ae67eefbf542bb172ca88d21c03db2b7b488dea67fd139ae8a75bf +MISC metadata.xml 398 BLAKE2B 92cde982b135f9835bb34e7f54aca2ace13b15d19554affdba772400c736a11ba497cf71931d08877e6ee899309e3595f7c242d60c295a5a071e404bb9b77268 SHA512 7f1a0c4ad44c799ba2af8fa95c122b155c5741ad08a89224fc7de381b7eb13affa6fa61e055618a1b987fc94556a7839c8bc0a5fbc733cd186f7c8e1c0d65c55 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 8c28621c0f8d..000000000000 --- 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/armagetronad-0.2.9.1.0.ebuild b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild index 53ba592280d8..93180672cd3d 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 } 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 0cd6e5bc1d67..000000000000 --- 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 &pos,const eCoord &dir, - 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 &s, const eTeam & team) -+tString & operator << ( tString &s, const eTeam * team) - { -- if ( !(&team) ) -+ if ( !team ) - return s << tOutput("$player_spectator_message"); - else -- return s << team.GetColoredName(); -+ return s << team->GetColoredName(); - } --std::ostream & operator << ( std::ostream &s, const eTeam & team) -+std::ostream & operator << ( std::ostream &s, const eTeam * team) - { -- if ( !(&team) ) -+ 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 ---- a/src/engine/eTeam.h -+++ b/src/engine/eTeam.h -@@ -32,8 +32,8 @@ - #include "nNetObject.h" - #include "tList.h" - --tString & operator << ( tString&, const eTeam&); --std::ostream & operator << ( std::ostream&, const eTeam&); -+tString & operator << ( tString&, const eTeam*); -+std::ostream & operator << ( std::ostream&, const eTeam*); - - template class nConfItem; - ---- a/src/network/nNetObject.h -+++ b/src/network/nNetObject.h -@@ -128,7 +128,16 @@ - - virtual void Dump( tConsole& con ); // dumps object stats - -+ static unsigned short ID(nNetObject const *pThis) -+ { -+ if (pThis) -+ return pThis->id; -+ else -+ return 0; -+ } -+ - unsigned short ID() const{ -+ tASSERT(this); - if (this) - return id; - else -@@ -135,7 +144,16 @@ - return 0; - } - -+ static unsigned short Owner(nNetObject const *pThis) -+ { -+ if (pThis) -+ return pThis->owner; -+ else -+ return ::sn_myNetID; -+ } -+ - unsigned short Owner() const{ -+ tASSERT(this); - if (this) - return owner; - else ---- a/src/tools/tLocale.cpp -+++ b/src/tools/tLocale.cpp -@@ -731,6 +731,13 @@ - - // and a special implementation for the locales and strings: - tOutput& operator << (tOutput &o, const char *locale){ -+ return o.AddString(locale); -+} -+ -+tOutput & tOutput::AddString(char const * locale) -+{ -+ tOutput & o = *this; -+ - int len = strlen(locale); - if (len == 0) - return o; ---- a/src/tools/tLocale.h -+++ b/src/tools/tLocale.h -@@ -81,7 +81,7 @@ - - tOutputItemBase *anchor; - -- tOutput& operator << (const tOutput &o); -+ // tOutput& operator << (const tOutput &o); - public: - tOutput(); - ~tOutput(); -@@ -91,6 +91,7 @@ - void AddLiteral(const char *); // adds a language independent string - void AddLocale(const char *); // adds a language dependant string - void AddSpace(); // adds a simple space -+ tOutput & AddString(char const * pString); // checks the string, delegates to correct Add...()-Function - - // set a template parameter at this position of the output string - tOutput & SetTemplateParameter(int num, const char *parameter); -@@ -113,7 +114,7 @@ - - SetTemplateParameter(1, template1); - -- *this << identifier; -+ AddString(identifier); - } - - template< class T1, class T2 > -@@ -125,7 +126,7 @@ - SetTemplateParameter(1, template1); - SetTemplateParameter(2, template2); - -- *this << identifier; -+ AddString(identifier); - } - - template< class T1, class T2, class T3 > -@@ -138,7 +139,7 @@ - SetTemplateParameter(2, template2); - SetTemplateParameter(3, template3); - -- *this << identifier; -+ AddString(identifier); - } - - template< class T1, class T2, class T3, class T4 > -@@ -152,7 +153,7 @@ - SetTemplateParameter(3, template3); - SetTemplateParameter(4, template4); - -- *this << identifier; -+ AddString(identifier); - } - - tOutput(const tOutput &o); // copy constructor diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml index 0a249e335798..377cf9573b03 100644 --- a/games-action/armagetronad/metadata.xml +++ b/games-action/armagetronad/metadata.xml @@ -6,6 +6,7 @@ Gentoo Games Project + ArmagetronAd/armagetronad armagetronad -- cgit v1.2.3