| 1 |
commit: 12d12d57d10be5b483a048d12114cb3ad5c487d9 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
| 3 |
AuthorDate: Tue Sep 4 08:00:19 2018 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Tue Sep 4 08:00:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=12d12d57 |
| 7 |
|
| 8 |
some QA fixes. TODO: rewrite that ebuilds. |
| 9 |
|
| 10 |
eclass/d-games.eclass | 17 +++++------------ |
| 11 |
games-action/voxatron/voxatron-0.2.3.ebuild | 12 +++++------- |
| 12 |
games-action/zlock/zlock-0.20.ebuild | 7 +------ |
| 13 |
.../{qjoypad-4.3.0.ebuild => qjoypad-4.3.0-r1.ebuild} | 0 |
| 14 |
4 files changed, 11 insertions(+), 25 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/d-games.eclass b/eclass/d-games.eclass |
| 17 |
index 98f2706..5e9cbe3 100644 |
| 18 |
--- a/eclass/d-games.eclass |
| 19 |
+++ b/eclass/d-games.eclass |
| 20 |
@@ -11,27 +11,20 @@ |
| 21 |
# in D programming language. |
| 22 |
|
| 23 |
# base added for PATCHES=( ${FILESDIR}/patch ) support |
| 24 |
-inherit eutils base games |
| 25 |
- |
| 26 |
# @ECLASS-VARIABLE: EAPI |
| 27 |
# @DESCRIPTION: |
| 28 |
# By default we want EAPI 2 which might be redefinable to newer versions later. |
| 29 |
case ${EAPI:-0} in |
| 30 |
- 2) : ;; |
| 31 |
- *) DEPEND="EAPI-TOO-OLD" ;; |
| 32 |
+ [2-7]) : ;; |
| 33 |
+ *) die "d-games.eclass doesn't support your EAPI" ;; |
| 34 |
esac |
| 35 |
|
| 36 |
EXPORT_FUNCTIONS src_prepare |
| 37 |
|
| 38 |
d-games_src_prepare() { |
| 39 |
# not eapi-handled due to danger of change for sys package in future. |
| 40 |
- if ! built_with_use sys-devel/gcc d; then |
| 41 |
- ewarn "sys-devel/gcc must be built with d useflag" |
| 42 |
- die "recompile gcc with USE=\"d\"" |
| 43 |
+ if ! has_version sys-devel/gcc[d]; then |
| 44 |
+ ewarn "sys-devel/gcc must be built with d useflag (although, some new versions have no this flag anymore)" |
| 45 |
+ die "recompile gcc with USE=\"d\" (or install the version that have this flag at all, and select this version to be used for this package" |
| 46 |
fi |
| 47 |
- |
| 48 |
- # TODO: add check for correct gcc version selected in profile. |
| 49 |
- |
| 50 |
- base_src_prepare |
| 51 |
- games_src_prepare |
| 52 |
} |
| 53 |
|
| 54 |
diff --git a/games-action/voxatron/voxatron-0.2.3.ebuild b/games-action/voxatron/voxatron-0.2.3.ebuild |
| 55 |
index 7fba0d1..2d22e25 100644 |
| 56 |
--- a/games-action/voxatron/voxatron-0.2.3.ebuild |
| 57 |
+++ b/games-action/voxatron/voxatron-0.2.3.ebuild |
| 58 |
@@ -4,8 +4,6 @@ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
|
| 62 |
-inherit games |
| 63 |
- |
| 64 |
DESCRIPTION="A voxelicious action adventure" |
| 65 |
HOMEPAGE="http://www.lexaloffle.com/voxatron.php" |
| 66 |
SRC_URI="${PN}_${PV}_i386.tar.gz" |
| 67 |
@@ -17,9 +15,10 @@ KEYWORDS="~amd64 ~x86" |
| 68 |
IUSE="" |
| 69 |
|
| 70 |
DEPEND="" |
| 71 |
-RDEPEND="${DEPEND} |
| 72 |
- x86? ( media-libs/libsdl[opengl] ) |
| 73 |
- amd64? ( app-emulation/emul-linux-x86-sdl )" |
| 74 |
+RDEPEND=" |
| 75 |
+ ${DEPEND} |
| 76 |
+ media-libs/libsdl[abi_x86_32,opengl] |
| 77 |
+" |
| 78 |
|
| 79 |
pkg_nofetch() { |
| 80 |
ewarn |
| 81 |
@@ -37,7 +36,6 @@ src_install() { |
| 82 |
doexe vox |
| 83 |
newicon lexaloffle-vox.png ${PN}.png |
| 84 |
make_desktop_entry ${PN} Voxatron ${PN} |
| 85 |
- games_make_wrapper ${PN} ./vox ${dir} ${dir} |
| 86 |
+ make_wrapper ${PN} ./vox ${dir} ${dir} |
| 87 |
dodoc ${PN}.txt |
| 88 |
- prepgamesdirs |
| 89 |
} |
| 90 |
|
| 91 |
diff --git a/games-action/zlock/zlock-0.20.ebuild b/games-action/zlock/zlock-0.20.ebuild |
| 92 |
index 53c357d..00c9c7a 100644 |
| 93 |
--- a/games-action/zlock/zlock-0.20.ebuild |
| 94 |
+++ b/games-action/zlock/zlock-0.20.ebuild |
| 95 |
@@ -47,7 +47,7 @@ src_prepare(){ |
| 96 |
} |
| 97 |
|
| 98 |
src_install() { |
| 99 |
- dogamesbin ${PN} || die "dogamesbin failed" |
| 100 |
+ dobin ${PN} || die "dobin failed" |
| 101 |
|
| 102 |
local datadir="${GAMES_DATADIR}"/${PN} |
| 103 |
|
| 104 |
@@ -56,9 +56,4 @@ src_install() { |
| 105 |
doins -r *.xml *.bmp *.ogg *.wav || die |
| 106 |
make_desktop_entry ${PN} ${PN} |
| 107 |
dodoc readme* |
| 108 |
- prepgamesdirs |
| 109 |
-} |
| 110 |
- |
| 111 |
-pkg_postinst() { |
| 112 |
- games_pkg_postinst |
| 113 |
} |
| 114 |
|
| 115 |
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0-r1.ebuild |
| 116 |
similarity index 100% |
| 117 |
rename from games-util/qjoypad/qjoypad-4.3.0.ebuild |
| 118 |
rename to games-util/qjoypad/qjoypad-4.3.0-r1.ebuild |
Archives