[gentoo-commits] repo/gentoo:master commit in: games-board/atakks/

[gentoo-commits] repo/gentoo:master commit in: games-board/atakks/

[Ionen Wolkens]

commit:     0256617a98c445b4ce69f9ecd1207a93b2b364e0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 02:12:04 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 20:00:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0256617a

games-board/atakks: add missing EPREFIX, minor fixups

- remove homepage, no upstream
- license to GPL-2+ ("or later" is stated in French)
- add missing einstalldocs
- remove non-XDG compliant .bmp icon (typically not displayed)
- revbump given EPREFIX affects runtime and added minor [video] to SDL

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../{atakks-1.0-r1.ebuild => atakks-1.0-r2.ebuild} | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/games-board/atakks/atakks-1.0-r1.ebuild b/games-board/atakks/atakks-1.0-r2.ebuild
similarity index 52%
rename from games-board/atakks/atakks-1.0-r1.ebuild
rename to games-board/atakks/atakks-1.0-r2.ebuild
index c714c0d43dc..8da2077bfe0 100644
--- a/games-board/atakks/atakks-1.0-r1.ebuild
+++ b/games-board/atakks/atakks-1.0-r2.ebuild
@@ -5,21 +5,17 @@ EAPI=7
 
 inherit desktop toolchain-funcs
 
-MY_P="${P/-/_}"
 DESCRIPTION="Clone of Ataxx"
-HOMEPAGE="http://team.gcu-squad.org/~fab"
-# no version upstream
-#SRC_URI="http://team.gcu-squad.org/~fab/down/${PN}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}_${PV}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/libsdl:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
+RDEPEND="media-libs/libsdl[video]"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-warnings.patch
@@ -29,21 +25,22 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# Modify game data paths
-	sed -i \
-		-e "s:SDL_LoadBMP(\":SDL_LoadBMP(\"/usr/share/${PN}/:" \
-		main.c || die
+	sed -i "/LoadBMP/s|\"|\"${EPREFIX}/usr/share/${PN}/|" main.c || die
 }
 
 src_compile() {
 	tc-export CC
+
 	emake E_CFLAGS="${CFLAGS}"
 }
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
-	doins *bmp
-	newicon icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Atakks /usr/share/pixmaps/${PN}.bmp
+	doins *.bmp
+
+	make_desktop_entry ${PN} Atakks applications-games
+
+	einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: games-board/atakks/

[Ionen Wolkens]

commit:     d55af2849c4530548a758a344f60aed2d098238a
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun  9 17:11:17 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 20:00:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55af284

games-board/atakks: EAPI bump, minor improvements

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-board/atakks/atakks-1.0-r1.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/games-board/atakks/atakks-1.0-r1.ebuild b/games-board/atakks/atakks-1.0-r1.ebuild
index 052924ba8c8..c714c0d43dc 100644
--- a/games-board/atakks/atakks-1.0-r1.ebuild
+++ b/games-board/atakks/atakks-1.0-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
-MY_P=${P/-/_}
-DESCRIPTION="A clone of Ataxx"
+inherit desktop toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="Clone of Ataxx"
 HOMEPAGE="http://team.gcu-squad.org/~fab"
 # no version upstream
 #SRC_URI="http://team.gcu-squad.org/~fab/down/${PN}.tgz"
@@ -14,12 +15,11 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl:0"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-warnings.patch
@@ -36,6 +36,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export CC
 	emake E_CFLAGS="${CFLAGS}"
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-board/atakks/

[Ionen Wolkens]

commit:     faa00e26082637be7d27868a39a0f3f2bf58d2b9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 19:36:15 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 20:53:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa00e26

games-board/atakks: add .desktop icon, EAPI 7->8

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-board/atakks/Manifest             |  1 +
 games-board/atakks/atakks-1.0-r2.ebuild | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-board/atakks/Manifest b/games-board/atakks/Manifest
index 20c02bb7b62..b8d92d3d58b 100644
--- a/games-board/atakks/Manifest
+++ b/games-board/atakks/Manifest
@@ -1 +1,2 @@
 DIST atakks-1.0.tar.gz 62464 BLAKE2B 1419e4fff60121e0bd793322cd20515335ad82d9b1341ab9ae658aa5e2882af3457440485318b1d872f9f8f483c22b21d8dc55f5d4862694427d08fb52e93e85 SHA512 a4b31635ef74198c86002fc930922266f462926bffa5b1fd7fb8ba1186dbc1efd8ae8c84ac0a429737916d1350b5432967221a67505bfe73d47a6dadd7600e39
+DIST atakks.png 5084 BLAKE2B 52dcc313e7931fb0180f40803f3c276a0ee146a0e16af83f153d1d22800b0f780a2aa022cd198ad1ab70bb7ba252eeccfc1d34d6685b556a17ef1a96385fcd35 SHA512 c662fd1d0996317299a3085e7d5455c4eb24be22133cbaf9e720633c894bbd5ef69729b679326845c0702f8d7b72ba27b5825c3d1086b025520d11448f8706c4

diff --git a/games-board/atakks/atakks-1.0-r2.ebuild b/games-board/atakks/atakks-1.0-r2.ebuild
index 8da2077bfe0..4dd2ccb1094 100644
--- a/games-board/atakks/atakks-1.0-r2.ebuild
+++ b/games-board/atakks/atakks-1.0-r2.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of Ataxx"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 S="${WORKDIR}/${PN}_${PV}"
 
 LICENSE="GPL-2+"
@@ -40,7 +42,8 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins *.bmp
 
-	make_desktop_entry ${PN} Atakks applications-games
-
 	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Atakks
 }