[gentoo-commits] repo/gentoo:master commit in: games-action/solar2/
commit: 21fb4b0761c36f7f768f3619e6b22f24e6d77b74
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jun 20 12:04:04 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jun 20 12:40:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fb4b07
games-action/solar2: EAPI-8 bump, fix install
EAPI-8 used for fetch+ and dosym -r
Dropped support for bundled-libs USE, works well and more versatile
for sound (bundled sdl-mixer also has unnecessary deps). But keeping
mono given using system's does not seem to work at all currently.
No revbump given current -r1 always failed in install phase due to
missing / in $MYGAMEDIR (non-absolute path fperms error).
Fixes: 754f86637206db9e292e125877865b7d4d96aca8
Signed-off-by: Ionen Wolkens gentoo.org>
games-action/solar2/metadata.xml | 5 --
games-action/solar2/solar2-1.10-r1.ebuild | 107 +-
2 files changed, 31 insertions(+), 81 deletions(-)
diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
index b878aaa1812..26079e608be 100644
--- a/games-action/solar2/metadata.xml
+++ b/games-action/solar2/metadata.xml
@@ -5,9 +5,4 @@
ga...@gentoo.org
Gentoo Games Project
-
-
- Use the upstream provided bundled libraries.
-
-
diff --git a/games-action/solar2/solar2-1.10-r1.ebuild
b/games-action/solar2/solar2-1.10-r1.ebuild
index 1d32c61c8bb..a201117007e 100644
--- a/games-action/solar2/solar2-1.10-r1.ebuild
+++ b/games-action/solar2/solar2-1.10-r1.ebuild
@@ -1,105 +1,60 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit desktop gnome2-utils wrapper
+inherit desktop wrapper
-GAMEBALL="${PN}-linux-${PV}.tar.gz"
-ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png;
-DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
+DESCRIPTION="Open-world sandbox game set in an infinite abstract universe"
HOMEPAGE="http://murudai.com/solar/;
-SRC_URI="${GAMEBALL} ${ICONFILE}"
-S="${WORKDIR}"/Solar2
+SRC_URI="
+ ${PN}-linux-${PV}.tar.gz
+ fetch+https://dev.gentoo.org/~chewi/distfiles/${PN}.png;
+S="${WORKDIR}/Solar2"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
+RESTRICT="bindist fetch"
-RESTRICT="bindist fetch splitdebug"
+# game outputs audio using openal and libsdl backends simultaneously
+RDEPEND="
+ media-libs/libsdl[X,joystick,opengl,sound,video,abi_x86_32(-)]
+ media-libs/openal[abi_x86_32(-)]
+ media-libs/sdl-mixer[mad,mp3,abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]"
-MYGAMEDIR=opt/${PN}
QA_PREBUILT="
- ${MYGAMEDIR#/}/lib/*
- ${MYGAMEDIR#/}/Solar2.bin.x86
-"
-
-# TODO: - unbundle libmono for 64bit
-# - unbundling libSDL_mixer breaks the game
-# - provide icon
-# - test useflags for libsdl on x86
-RDEPEND="
- virtual/opengl
- amd64? (
- >=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-
>=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)]
- >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
- >=virtual/opengl-7.0-r1[abi_x86_32(-)]
- !bundled-libs? (
- >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
- >=media-libs/openal-1.15.1[abi_x86_32(-)]
-
>=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)]
- >=media-libs/libmikmod-3.2.0[abi_x86_32(-)]
- )
- )
- x86? (
- media-libs/flac
- media-libs/libsdl[X,sound,video,joystick]
- media-libs/libvorbis
- !bundled-libs? (
- dev-lang/mono
- media-libs/libmad
- media-libs/libmikmod
- media-libs/openal
- media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis]
- )
- )"
+ opt/${PN}/Solar2.bin.x86
+ opt/${PN}/lib/libmono-2.0.so.1"
pkg_nofetch() {
- einfo "Please buy and download ${GAMEBALL} from:"
+ einfo "Please buy and download '${A%% *}' from:"
einfo " ${HOMEPAGE}"
- einfo "Also download ${ICONFILE}"
- einfo "and move both to your distfiles directory. The Humble Bundle
download"
- einfo "may have a timestamp appended to the filename."
+ einfo "and place it in your distfiles directory. The Humble Bundle"
+ einfo "download may have a timestamp appended to the filename."
}
src_prepare() {
default
- # remove unused files
- rm solar2.sh || die
+ # remove duplicate libmono and unused wrapper
+ rm lib/libmono-2.0.so solar2.sh || die
- if ! use bundled-libs ; then
- einfo
[gentoo-commits] repo/gentoo:master commit in: games-action/solar2/
commit: 1bdcb2e5caf129b7842085d35ecd0f2ff86c1503
Author: Sam James gentoo org>
AuthorDate: Sat Apr 10 06:24:12 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 10 06:31:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bdcb2e5
games-action/solar2: fix src_prepare
Don't shout! I don't own this game, so testing only got as
far as pkg_nofetch, unfortunately. Luckily, changes were
only to do with EAPI + games.eclass, so *should* be okay.
Signed-off-by: Sam James gentoo.org>
games-action/solar2/solar2-1.10-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/games-action/solar2/solar2-1.10-r1.ebuild
b/games-action/solar2/solar2-1.10-r1.ebuild
index 3a6de3fa920..1d32c61c8bb 100644
--- a/games-action/solar2/solar2-1.10-r1.ebuild
+++ b/games-action/solar2/solar2-1.10-r1.ebuild
@@ -65,6 +65,8 @@ pkg_nofetch() {
}
src_prepare() {
+ default
+
# remove unused files
rm solar2.sh || die
[gentoo-commits] repo/gentoo:master commit in: games-action/solar2/
commit: 754f86637206db9e292e125877865b7d4d96aca8
Author: Sam James gentoo org>
AuthorDate: Tue Apr 6 01:48:25 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 6 18:18:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754f8663
games-action/solar2: port to EAPI 7, games.eclass--
Signed-off-by: Sam James gentoo.org>
.../{solar2-1.10.ebuild => solar2-1.10-r1.ebuild} | 40 ++
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/games-action/solar2/solar2-1.10.ebuild
b/games-action/solar2/solar2-1.10-r1.ebuild
similarity index 85%
rename from games-action/solar2/solar2-1.10.ebuild
rename to games-action/solar2/solar2-1.10-r1.ebuild
index 2a092f697e3..3a6de3fa920 100644
--- a/games-action/solar2/solar2-1.10.ebuild
+++ b/games-action/solar2/solar2-1.10-r1.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# TODO: - unbundle libmono for 64bit
-# - unbundling libSDL_mixer breaks the game
-# - provide icon
-# - test useflags for libsdl on x86
+EAPI=7
-EAPI=5
+inherit desktop gnome2-utils wrapper
-inherit eutils gnome2-utils games
-
-DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
-HOMEPAGE="http://murudai.com/solar/;
GAMEBALL="${PN}-linux-${PV}.tar.gz"
ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png;
+DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
+HOMEPAGE="http://murudai.com/solar/;
SRC_URI="${GAMEBALL} ${ICONFILE}"
+S="${WORKDIR}"/Solar2
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="bundled-libs"
+
RESTRICT="bindist fetch splitdebug"
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/lib/*
- ${MYGAMEDIR#/}/Solar2.bin.x86"
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+ ${MYGAMEDIR#/}/lib/*
+ ${MYGAMEDIR#/}/Solar2.bin.x86
+"
+# TODO: - unbundle libmono for 64bit
+# - unbundling libSDL_mixer breaks the game
+# - provide icon
+# - test useflags for libsdl on x86
RDEPEND="
virtual/opengl
amd64? (
@@ -53,8 +56,6 @@ RDEPEND="
)
)"
-S=${WORKDIR}/Solar2
-
pkg_nofetch() {
einfo "Please buy and download ${GAMEBALL} from:"
einfo " ${HOMEPAGE}"
@@ -79,24 +80,21 @@ src_prepare() {
}
src_install() {
- insinto "${MYGAMEDIR}"
+ insinto ${MYGAMEDIR}
doins -r *
- games_make_wrapper ${PN} "./Solar2.bin.x86" "${MYGAMEDIR}"
+ make_wrapper ${PN} "./Solar2.bin.x86" "${MYGAMEDIR}"
make_desktop_entry ${PN}
doicon -s 64 "${DISTDIR}"/${PN}.png
- fperms +x "${MYGAMEDIR}"/Solar2.bin.x86
- prepgamesdirs
+ fperms +x ${MYGAMEDIR}/Solar2.bin.x86
}
pkg_preinst() {
- games_pkg_preinst
gnome2_icon_savelist
}
pkg_postinst() {
- games_pkg_postinst
gnome2_icon_cache_update
}
[gentoo-commits] repo/gentoo:master commit in: games-action/solar2/
commit: af159b5dd18a733cc3032c9193a4e45c2630554d
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Mar 13 22:50:29 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Mar 13 22:51:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af159b5d
games-action/solar2: Update Manifest hashes
I could not source the old solar2.png icon so I uploaded a new one.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
games-action/solar2/Manifest | 4 ++--
games-action/solar2/solar2-1.10.ebuild | 10 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/games-action/solar2/Manifest b/games-action/solar2/Manifest
index 00928ef4296..6b8e113e740 100644
--- a/games-action/solar2/Manifest
+++ b/games-action/solar2/Manifest
@@ -1,2 +1,2 @@
-DIST solar2-linux-1.10.tar.gz 106202569 SHA256
33211605946741db730082478c4a408547a89facfc2e3535b124c6706809d8b2 SHA512
68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d
WHIRLPOOL
86d0ed2c7a28e498323949e871f7ba8f1714f39f98ab625f6dddb0249af7c1e653264ebc4b76cc9be5579f99395e2c578363effcd2c97bb27690b05ec4e73a4e
-DIST solar2.png 6478 SHA256
ab62168651de322dc68a9094baf1ba92524d2d9e76b1650eef60527cd7e3f611 SHA512
b1110d19d62274ac90391f9611fc8efaa1c2ca70cf62f146969768ed2dd76e013054b1a9dfdb123b56536f5ba7788971747219485811eeb6652f22e0867348d9
WHIRLPOOL
358a3fb56c13710abf4ac3115c968579c787ed67f4c8672e0236ce379a56d6540f8c5ad6f8ca16370c0b080ae2763ec2256cbcd1ff2bb0765a7dc5164fc39972
+DIST solar2-linux-1.10.tar.gz 106202569 BLAKE2B
4dc1f0c273aa8363178c581a516969a22707a5345eb11a373f96dd8136af3b390451cd72e7b06bc661ef3e8926f0339d3dad70e9b950210e7820efe9913fe9af
SHA512
68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d
+DIST solar2.png 8260 BLAKE2B
cf154377ee73b6d0f3c86e0377b29ca7208ef030183db7bae88b352d5684f3c513d0ad57119121a79906287e72d0a863891285224b631fa44d2ccee12a1eacef
SHA512
a85e875e3a159670ea2a3f32687e7e52cf369f29add86f19e6431f05e7835c1a30303ddd4ff406a525c1086298807c2f94773dd987d4d99b89bc7c63150c9c85
diff --git a/games-action/solar2/solar2-1.10.ebuild
b/games-action/solar2/solar2-1.10.ebuild
index b39d133c355..2a092f697e3 100644
--- a/games-action/solar2/solar2-1.10.ebuild
+++ b/games-action/solar2/solar2-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# TODO: - unbundle libmono for 64bit
@@ -13,7 +13,7 @@ inherit eutils gnome2-utils games
DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
HOMEPAGE="http://murudai.com/solar/;
GAMEBALL="${PN}-linux-${PV}.tar.gz"
-ICONFILE="https://dev.gentoo.org/~hasufell/distfiles/${PN}.png;
+ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png;
SRC_URI="${GAMEBALL} ${ICONFILE}"
LICENSE="all-rights-reserved"
@@ -56,11 +56,11 @@ RDEPEND="
S=${WORKDIR}/Solar2
pkg_nofetch() {
- einfo "Please buy & download ${GAMEBALL} from:"
+ einfo "Please buy and download ${GAMEBALL} from:"
einfo " ${HOMEPAGE}"
einfo "Also download ${ICONFILE}"
- einfo "and move both to ${DISTDIR}"
- einfo
+ einfo "and move both to your distfiles directory. The Humble Bundle
download"
+ einfo "may have a timestamp appended to the filename."
}
src_prepare() {
