From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4C581382C5 for ; Fri, 16 Apr 2021 18:57:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A86AE0788; Fri, 16 Apr 2021 18:57:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB739E0788 for ; Fri, 16 Apr 2021 18:57:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A922340BB9 for ; Fri, 16 Apr 2021 18:57:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2544C5D2 for ; Fri, 16 Apr 2021 18:57:56 +0000 (UTC) From: "Lino Bigatti" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lino Bigatti" Message-ID: <1618599468.2826ce8e9836fc7fe7ce34c2a7a00e0c5488c5d3.linobigatti@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/np2kai/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/np2kai/Manifest games-emulation/np2kai/np2kai-22_p20210211.ebuild games-emulation/np2kai/np2kai-23.ebuild X-VCS-Directories: games-emulation/np2kai/ X-VCS-Committer: linobigatti X-VCS-Committer-Name: Lino Bigatti X-VCS-Revision: 2826ce8e9836fc7fe7ce34c2a7a00e0c5488c5d3 X-VCS-Branch: dev Date: Fri, 16 Apr 2021 18:57:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 120599e0-1fd8-4453-aa80-af8b0fa08d91 X-Archives-Hash: ace907fb0ad79a6ad53bc6462f4a888c commit: 2826ce8e9836fc7fe7ce34c2a7a00e0c5488c5d3 Author: Lino Bigatti protonmail com> AuthorDate: Fri Apr 16 18:57:33 2021 +0000 Commit: Lino Bigatti protonmail com> CommitDate: Fri Apr 16 18:57:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2826ce8e games-emulation/np2kai: Test the ebuild and move to ~amd64 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Lino Bigatti protonmail.com> games-emulation/np2kai/Manifest | 2 +- ...np2kai-22_p20210211.ebuild => np2kai-23.ebuild} | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/games-emulation/np2kai/Manifest b/games-emulation/np2kai/Manifest index 48529de63..5d4a2c696 100644 --- a/games-emulation/np2kai/Manifest +++ b/games-emulation/np2kai/Manifest @@ -1,3 +1,3 @@ DIST np2kai-22.tar.gz 3189290 BLAKE2B 74856a40ae57a71b1958f5c546ee3c907b1b1f5975715b21ce5a6c3a044a4c9ebf425e6ed1819e2d688e48be3853bb5f161e3e0c5031cd316359f7ebce0d5418 SHA512 47cd75b251dc0382537769225297dd155bb7b95a1fba7417a9c06b56f4fc89b0c38de101a68da8e8d776d456574aa6bf7f4e1490b3666f20469d4bf18e72b6dd -DIST np2kai-22_p20210211.tar.gz 3121849 BLAKE2B 21679e1d2a6bc9877ffeb256ddb19ca613e6f1abaf643087bdcff8b92e77aee9099d6dc7c574fe25407f092e6401f3d974463bedd6898e09d56d6e3a1465f93e SHA512 a9e9413a9257496498e5b289d4346072bc9582437691a4e2aa68d93fb1a1a5b12a0ff526cd436a6492629f77724e87564635dc83b53c4c1fe9341ea36597c251 +DIST np2kai-23.tar.gz 3121849 BLAKE2B 21679e1d2a6bc9877ffeb256ddb19ca613e6f1abaf643087bdcff8b92e77aee9099d6dc7c574fe25407f092e6401f3d974463bedd6898e09d56d6e3a1465f93e SHA512 a9e9413a9257496498e5b289d4346072bc9582437691a4e2aa68d93fb1a1a5b12a0ff526cd436a6492629f77724e87564635dc83b53c4c1fe9341ea36597c251 DIST sdl2-cmake-modules-ad006a3daae65a612ed87415037e32188b81071e.tar.gz 11996 BLAKE2B 751cde3370594b20520fdedef35fc6aa1806932f3fbe01c6068b0dbe696d113df1afbfe6e84eb7c5166afb4cb12a619282855e7f050374bc49d7cd948e5cb808 SHA512 72b20cce9073d554df67c6efa23e77da07fadce064535d03d943aab05a0bfab2b0253fa4fc04e98f9e9aa169429f0597f825867cebf71c4048032fe85cf61de3 diff --git a/games-emulation/np2kai/np2kai-22_p20210211.ebuild b/games-emulation/np2kai/np2kai-23.ebuild similarity index 84% rename from games-emulation/np2kai/np2kai-22_p20210211.ebuild rename to games-emulation/np2kai/np2kai-23.ebuild index 92756c159..dae583a43 100644 --- a/games-emulation/np2kai/np2kai-22_p20210211.ebuild +++ b/games-emulation/np2kai/np2kai-23.ebuild @@ -18,9 +18,9 @@ SRC_URI=" LICENSE="MIT BSD" SLOT="0" -KEYWORDS="" # Unkeyworded for testing -IUSE="haxm +i286 +sdl2 +X" -REQUIRED_USE="|| ( sdl2 X )" +KEYWORDS="~amd64" +IUSE="+i286 ia32 haxm +sdl2 +X" +REQUIRED_USE="|| ( X sdl2 ) ^^ ( i286 ia32 )" # TODO: migrate from gtk2 to gtk3 DEPEND=" @@ -49,7 +49,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/NP2kai-${MY_REV}" src_prepare() { - sed -i 's/CONFIGURATIONS Release/CONFIGURATIONS Gentoo/g' CMakeLists.txt || die + sed -i '+s/CONFIGURATIONS Release/CONFIGURATIONS Gentoo/g' CMakeLists.txt || die mv "${WORKDIR}"/sdl2-cmake-modules-${MY_SDL2_CMAKE_MODULES_REV}/* \ "${S}"/cmake/sdl2-cmake-modules/ || die @@ -58,13 +58,11 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_I286=$(usex i286) - -DBUILD_HAXM=$(usex haxm) - -DBUILD_SDL=ON - -DBUILD_X=$(usex X) - -DNP2kai_temp=NO - -DUSE_HAXM=$(usex haxm) - -DUSE_SDL2=$(usex sdl2) + -D BUILD_I286=$(usex i286 ON OFF) + -D BUILD_HAXM=$(usex haxm ON OFF) + -D BUILD_SDL=ON + -D BUILD_X=$(usex X ON OFF) + -D NP2kai_temp=OFF ) NP2KAI_VERSION=${PV} NP2KAI_HASH=${MY_REV} cmake_src_configure @@ -75,7 +73,7 @@ pkg_postinst() { if [[ -z ${REPLACING_VERSIONS} ]]; then if use i286 && use haxm; then local cfgname="{xnp2kai,xnp21kai}" - elif ! use haxm; then + elif use i286 && ! use haxm; then local cfgname="xnp2kai" else local cfgname="xnp21kai"