| 1 |
commit: 2826ce8e9836fc7fe7ce34c2a7a00e0c5488c5d3 |
| 2 |
Author: Lino Bigatti <linobigatti <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Fri Apr 16 18:57:33 2021 +0000 |
| 4 |
Commit: Lino Bigatti <linobigatti <AT> protonmail <DOT> com> |
| 5 |
CommitDate: Fri Apr 16 18:57:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2826ce8e |
| 7 |
|
| 8 |
games-emulation/np2kai: Test the ebuild and move to ~amd64 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
| 11 |
Signed-off-by: Lino Bigatti <linobigatti <AT> protonmail.com> |
| 12 |
|
| 13 |
games-emulation/np2kai/Manifest | 2 +- |
| 14 |
...np2kai-22_p20210211.ebuild => np2kai-23.ebuild} | 22 ++++++++++------------ |
| 15 |
2 files changed, 11 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-emulation/np2kai/Manifest b/games-emulation/np2kai/Manifest |
| 18 |
index 48529de63..5d4a2c696 100644 |
| 19 |
--- a/games-emulation/np2kai/Manifest |
| 20 |
+++ b/games-emulation/np2kai/Manifest |
| 21 |
@@ -1,3 +1,3 @@ |
| 22 |
DIST np2kai-22.tar.gz 3189290 BLAKE2B 74856a40ae57a71b1958f5c546ee3c907b1b1f5975715b21ce5a6c3a044a4c9ebf425e6ed1819e2d688e48be3853bb5f161e3e0c5031cd316359f7ebce0d5418 SHA512 47cd75b251dc0382537769225297dd155bb7b95a1fba7417a9c06b56f4fc89b0c38de101a68da8e8d776d456574aa6bf7f4e1490b3666f20469d4bf18e72b6dd |
| 23 |
-DIST np2kai-22_p20210211.tar.gz 3121849 BLAKE2B 21679e1d2a6bc9877ffeb256ddb19ca613e6f1abaf643087bdcff8b92e77aee9099d6dc7c574fe25407f092e6401f3d974463bedd6898e09d56d6e3a1465f93e SHA512 a9e9413a9257496498e5b289d4346072bc9582437691a4e2aa68d93fb1a1a5b12a0ff526cd436a6492629f77724e87564635dc83b53c4c1fe9341ea36597c251 |
| 24 |
+DIST np2kai-23.tar.gz 3121849 BLAKE2B 21679e1d2a6bc9877ffeb256ddb19ca613e6f1abaf643087bdcff8b92e77aee9099d6dc7c574fe25407f092e6401f3d974463bedd6898e09d56d6e3a1465f93e SHA512 a9e9413a9257496498e5b289d4346072bc9582437691a4e2aa68d93fb1a1a5b12a0ff526cd436a6492629f77724e87564635dc83b53c4c1fe9341ea36597c251 |
| 25 |
DIST sdl2-cmake-modules-ad006a3daae65a612ed87415037e32188b81071e.tar.gz 11996 BLAKE2B 751cde3370594b20520fdedef35fc6aa1806932f3fbe01c6068b0dbe696d113df1afbfe6e84eb7c5166afb4cb12a619282855e7f050374bc49d7cd948e5cb808 SHA512 72b20cce9073d554df67c6efa23e77da07fadce064535d03d943aab05a0bfab2b0253fa4fc04e98f9e9aa169429f0597f825867cebf71c4048032fe85cf61de3 |
| 26 |
|
| 27 |
diff --git a/games-emulation/np2kai/np2kai-22_p20210211.ebuild b/games-emulation/np2kai/np2kai-23.ebuild |
| 28 |
similarity index 84% |
| 29 |
rename from games-emulation/np2kai/np2kai-22_p20210211.ebuild |
| 30 |
rename to games-emulation/np2kai/np2kai-23.ebuild |
| 31 |
index 92756c159..dae583a43 100644 |
| 32 |
--- a/games-emulation/np2kai/np2kai-22_p20210211.ebuild |
| 33 |
+++ b/games-emulation/np2kai/np2kai-23.ebuild |
| 34 |
@@ -18,9 +18,9 @@ SRC_URI=" |
| 35 |
|
| 36 |
LICENSE="MIT BSD" |
| 37 |
SLOT="0" |
| 38 |
-KEYWORDS="" # Unkeyworded for testing |
| 39 |
-IUSE="haxm +i286 +sdl2 +X" |
| 40 |
-REQUIRED_USE="|| ( sdl2 X )" |
| 41 |
+KEYWORDS="~amd64" |
| 42 |
+IUSE="+i286 ia32 haxm +sdl2 +X" |
| 43 |
+REQUIRED_USE="|| ( X sdl2 ) ^^ ( i286 ia32 )" |
| 44 |
|
| 45 |
# TODO: migrate from gtk2 to gtk3 |
| 46 |
DEPEND=" |
| 47 |
@@ -49,7 +49,7 @@ RDEPEND="${DEPEND}" |
| 48 |
S="${WORKDIR}/NP2kai-${MY_REV}" |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
- sed -i 's/CONFIGURATIONS Release/CONFIGURATIONS Gentoo/g' CMakeLists.txt || die |
| 52 |
+ sed -i '+s/CONFIGURATIONS Release/CONFIGURATIONS Gentoo/g' CMakeLists.txt || die |
| 53 |
mv "${WORKDIR}"/sdl2-cmake-modules-${MY_SDL2_CMAKE_MODULES_REV}/* \ |
| 54 |
"${S}"/cmake/sdl2-cmake-modules/ || die |
| 55 |
|
| 56 |
@@ -58,13 +58,11 @@ src_prepare() { |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
local mycmakeargs=( |
| 60 |
- -DBUILD_I286=$(usex i286) |
| 61 |
- -DBUILD_HAXM=$(usex haxm) |
| 62 |
- -DBUILD_SDL=ON |
| 63 |
- -DBUILD_X=$(usex X) |
| 64 |
- -DNP2kai_temp=NO |
| 65 |
- -DUSE_HAXM=$(usex haxm) |
| 66 |
- -DUSE_SDL2=$(usex sdl2) |
| 67 |
+ -D BUILD_I286=$(usex i286 ON OFF) |
| 68 |
+ -D BUILD_HAXM=$(usex haxm ON OFF) |
| 69 |
+ -D BUILD_SDL=ON |
| 70 |
+ -D BUILD_X=$(usex X ON OFF) |
| 71 |
+ -D NP2kai_temp=OFF |
| 72 |
) |
| 73 |
|
| 74 |
NP2KAI_VERSION=${PV} NP2KAI_HASH=${MY_REV} cmake_src_configure |
| 75 |
@@ -75,7 +73,7 @@ pkg_postinst() { |
| 76 |
if [[ -z ${REPLACING_VERSIONS} ]]; then |
| 77 |
if use i286 && use haxm; then |
| 78 |
local cfgname="{xnp2kai,xnp21kai}" |
| 79 |
- elif ! use haxm; then |
| 80 |
+ elif use i286 && ! use haxm; then |
| 81 |
local cfgname="xnp2kai" |
| 82 |
else |
| 83 |
local cfgname="xnp21kai" |
Archives