diff options
Diffstat (limited to 'games-action/atanks')
| -rw-r--r-- | games-action/atanks/Manifest | 4 | ||||
| -rw-r--r-- | games-action/atanks/atanks-6.4-r1.ebuild | 18 | ||||
| -rw-r--r-- | games-action/atanks/atanks-6.4.ebuild | 47 | ||||
| -rw-r--r-- | games-action/atanks/files/atanks-6.4-fix-build-system.patch | 28 |
4 files changed, 44 insertions, 53 deletions
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest index 21f18308b1f6..15bfe42c532b 100644 --- a/games-action/atanks/Manifest +++ b/games-action/atanks/Manifest @@ -1,6 +1,6 @@ +AUX atanks-6.4-fix-build-system.patch 579 SHA256 25c3666380d708eb0af6a8d88dcad9c7d13e1d02f922c0ffb851947236feeb63 SHA512 86b046c37de4ff24f30dce799f32674d33930605c9da32a1c95e8438f6573e66f46455cbf371f66a1b4d8240c608dd338376be150bab59d4048bb46326f82daa WHIRLPOOL 479d96af4a856ea4753bdb9ece3fe3cfaf0ed92b92f75175b1c267317c5d5a02d8ffc2add264e263b81d78dc41c1ffe419d4ebd2c75aa1b2f0a536bb6a48cacb DIST atanks-6.4.tar.gz 6059315 SHA256 ea5b560fb15872f7329a1f70d749c93cf553eeaa02480108e95c1664b85f049f SHA512 e9410e5bf0e8ec0281718ad8ddca74b67000db96b09b6af8aa906bbf2cd815f07ff550087ecdee2e4c5bfabc42941f184173f35e50538e57bb008372a599e1e6 WHIRLPOOL 25b59cf4592f526cdfbac4cc26b386571e658c8d0493a49790ffbfffe15d16b2796bf7a6684cdb9fad6de9c46d9ed544991469c3cf88a4ec24e4ba2d27c7db3e -EBUILD atanks-6.4-r1.ebuild 823 SHA256 198d1c9e63dae77c37fe0848eaccf6291b825a21cfd3b3764f0675269c77a9e8 SHA512 bc63e49f283c261abbd395c1db469ee1fd317daad3918ab03fd313980a5e8477b03cf2849cb71c7f8d4fa600fb2ffebda50467fb6aa106296ac0f71815176965 WHIRLPOOL a30c1d3878f436e3fb1ca90ae7d8466189cc1dd1567cd87ffadcd40784b0f5c992516480201936f4460bb56c15c5d3fb0fbc35e6c41a27d25795ad4439a29eca -EBUILD atanks-6.4.ebuild 931 SHA256 3c0d879d00b4378dba7ccd9256054b9e85e5162e46fb66869a68973e5640c085 SHA512 8374a1caeda9c45c42a15343ae38bce6cf7e656aac1c090c7889890971009356b8974ea7d845ce0d3505221a24733775ca4226609ed7280a1b544ae7dcd0e5cf WHIRLPOOL d6a495aa0d8e854b78f39613a9031e513f9516714b41e5aec8eade416a6c9534681953c6ef7f889840baba4c7faaf7868da6c6b95ae18785a9b44f8290306882 +EBUILD atanks-6.4-r1.ebuild 971 SHA256 0b60c2cabef557e5975f1d48027787974e0f464dd1849bdb0fd99fffc97141cf SHA512 6b855aacfec1311d5c85bdbbf1607829c81183e15e3fbddcd2177492184eab1b94c1d250e3b269783602e4d0e37bdc8da1664a944ed8cb6bf586eea45950caba WHIRLPOOL 3ad58f2b234a3aabc19f3ddf13e5fb015a62f749c49ec4e02e0e1405709064973476d6750bdcbb8f09b07dd2a48d848bd52fe02998e692b6ed5ee6f457d10d5a MISC ChangeLog 3629 SHA256 17cbacf7c2743d010147ff98e977457a2447b741d67345a954ceeaeb10245920 SHA512 875d1002c57ba5b6f2c49969a8f3847c0ecbf6b35936483c7ea20fe084a379c30995e23c90cabf66fdc93bb164cdbafd4ffc20dd3499aa031b7b3392bcae3e4b WHIRLPOOL 0a4ced9853ff26da442be247829237e7c8b8232e1ced4f2ebca91f961616dcd3e2e6068f3e777bf308853143ecee0c94ec7b5c79fa3763479b5bb6f4f28ec4ce MISC ChangeLog-2015 12507 SHA256 70d3a059429b5533dd3c1eea274a1628ccf0674967c8673c679fe3cb9493e057 SHA512 35638f00cc8dea853c00173ffa03132dde6d9f68910535ca42379923f35c19b7f5bd16d082929987a212e0e20249763f2f33d78935b3e3bc86f63b09011f9474 WHIRLPOOL acf3ad3fca668b7fde848e29ca2b526964a906237884cac28961fb21c1e3e33761c8806cf7e5c3484e29817eedaaffbd3c367ebd9573ff4f3e25b8239d727609 MISC metadata.xml 329 SHA256 8029cb9e6ca02cf957a4ee5e12934c1a64fbc43d69a5ad91e698761e3c64f387 SHA512 1dc2914fc7dfe5c7f87ac565b6183b50d281fdf768e05cf211309699a264fde8a3e434ed07049b984e6f116256fec2124ed458ccfc70374ff35ff3189ec57917 WHIRLPOOL e459c4118514a09296003c000111e5ed69398413e9941c4bbdb2f38f1d53cf60ec6253ca0f7fe4a576fad6b8f095cdff0c8830eee5c845959e7a6c43521cd72e diff --git a/games-action/atanks/atanks-6.4-r1.ebuild b/games-action/atanks/atanks-6.4-r1.ebuild index d17df9c83dc6..ed2deed79042 100644 --- a/games-action/atanks/atanks-6.4-r1.ebuild +++ b/games-action/atanks/atanks-6.4-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils gnome2-utils + +inherit eutils gnome2-utils toolchain-funcs DESCRIPTION="Worms and Scorched Earth-like game" HOMEPAGE="http://atanks.sourceforge.net/" @@ -16,18 +17,27 @@ IUSE="" DEPEND="media-libs/allegro:0[X]" RDEPEND=${DEPEND} +PATCHES=( "${FILESDIR}"/${PN}-6.4-fix-build-system.patch ) + +src_configure() { + tc-export CXX +} + src_compile() { emake \ - INSTALLDIR="/usr/share/${PN}" + INSTALLDIR="${EPREFIX}/usr/share/${PN}" } src_install() { dobin ${PN} + local DOCS=( Changelog README TODO ) + einstalldocs + insinto /usr/share/${PN} doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt + doicon -s 48 ${PN}.png make_desktop_entry atanks "Atomic Tanks" - dodoc Changelog README TODO } pkg_preinst() { diff --git a/games-action/atanks/atanks-6.4.ebuild b/games-action/atanks/atanks-6.4.ebuild deleted file mode 100644 index 50382f26af2c..000000000000 --- a/games-action/atanks/atanks-6.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="Worms and Scorched Earth-like game" -HOMEPAGE="http://atanks.sourceforge.net/" -SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/allegro:0[X]" -RDEPEND=${DEPEND} - -src_compile() { - emake \ - BINDIR="${GAMES_BINDIR}" \ - INSTALLDIR="${GAMES_DATADIR}/${PN}" -} - -src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} - doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt - doicon -s 48 ${PN}.png - make_desktop_entry atanks "Atomic Tanks" - dodoc Changelog README TODO - 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/atanks/files/atanks-6.4-fix-build-system.patch b/games-action/atanks/files/atanks-6.4-fix-build-system.patch new file mode 100644 index 000000000000..e13ebb1d1421 --- /dev/null +++ b/games-action/atanks/files/atanks-6.4-fix-build-system.patch @@ -0,0 +1,28 @@ +* Don't try to find where $(CXX) is, just use it +* Don't muck with CXXFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -85,13 +85,9 @@ + # ------------------------------------ + INSTALL := $(shell which install) + RM := $(shell which rm) -f +-CXX ?= g++ + SED := $(shell which sed) + WINDRES := + +-ifeq (,$(findstring /,$(CXX))) +- CXX := $(shell which $(CXX)) +-endif + + + # if this is a Windows target, prefer mingw32-g++ over g++ +@@ -231,8 +227,6 @@ + CPPFLAGS := ${CPPFLAGS} -DATANKS_DEBUG_LOGTOFILE + endif + +-else +- CXXFLAGS := -march=native ${CXXFLAGS} -O2 + endif + + |