[gentoo-commits] repo/proj/guru:dev commit in: dev-util/xmake/

["Zhang Zheng" <zhangzheng.dylan@foxmail.com>]

commit:     d89a8254dcf65a1b948e39ed5ee36b35db37ba48
Author:     Big Pineapple <zhangzheng.dylan <AT> foxmail <DOT> com>
AuthorDate: Sat Apr  1 12:17:02 2023 +0000
Commit:     Zhang Zheng <zhangzheng.dylan <AT> foxmail <DOT> com>
CommitDate: Sat Apr  1 12:17:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d89a8254

dev-util/xmake: add 2.7.7, drop 2.7.1; fix src_configure

Signed-off-by: Big Pineapple <zhangzheng.dylan <AT> foxmail.com>

 dev-util/xmake/Manifest                                 |  2 +-
 .../xmake/{xmake-2.7.1.ebuild => xmake-2.7.7.ebuild}    | 17 ++++++-----------
 dev-util/xmake/xmake-9999.ebuild                        | 17 ++++++-----------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/dev-util/xmake/Manifest b/dev-util/xmake/Manifest
index 1aba9b603..0248d8c13 100644
--- a/dev-util/xmake/Manifest
+++ b/dev-util/xmake/Manifest
@@ -1 +1 @@
-DIST xmake-v2.7.1.tar.gz 4344324 BLAKE2B 6baec6724f4489f0abe25a5925f87fd952fd59645696014ffe23d33df98e838c7ef53fc948ca4d17feed6063da532fa2a59c691dd76305840f476e5e8f3407bb SHA512 499d1d4ac53b8189d8f68706b45981dd9a3c62018000291616a281b944fedb9d5802502dd9edfb7bc0ee5f0456b839f9f2605d536543994bdfb72d178024742e
+DIST xmake-v2.7.7.tar.gz 2719137 BLAKE2B c3aca5c538292d2ee002785c5a4bb82ff4ea6d67d07d00f055f35c46caeec8ecd3134e05f9bba6d4e7db5cda725b474fcf70d3b91a4be03b2859c542fa0c0f83 SHA512 449c6ce318076a9473084ae197b0d333e0b4b0f2d7bffe9e3c725ddf7aef3c7d888e9d063e033a7a7d9f690e0e49925e45bc7910f5076b790344f8bdbde0fb15

diff --git a/dev-util/xmake/xmake-2.7.1.ebuild b/dev-util/xmake/xmake-2.7.7.ebuild
similarity index 80%
rename from dev-util/xmake/xmake-2.7.1.ebuild
rename to dev-util/xmake/xmake-2.7.7.ebuild
index 9ecfbcf50..e02d4fa7a 100644
--- a/dev-util/xmake/xmake-2.7.1.ebuild
+++ b/dev-util/xmake/xmake-2.7.7.ebuild
@@ -14,12 +14,10 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/xmake-io/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
 	KEYWORDS="~amd64 ~riscv ~x86"
-	# extraction path may change in future
-	S="${WORKDIR}"
 fi
 
 # tarball doesn't provide tests
-RESTRICT="test"
+RESTRICT="test strip"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -40,14 +38,11 @@ DOCS=(
 	NOTICE.md README.md README_zh.md
 )
 
-src_compile() {
-	emake build
-}
-
-src_install() {
-	einstalldocs
-
-	emake PREFIX="/usr" DESTDIR="${D}" install
+src_configure(){
+	econf --prefix="${EPREFIX}"/usr \
+		--plat=linux
+		# --plat=linux is necessary, which enables correct directory:
+		# build/linux/ARCH other than build/ARCH/ARCH
 }
 
 pkg_postinst() {

diff --git a/dev-util/xmake/xmake-9999.ebuild b/dev-util/xmake/xmake-9999.ebuild
index 9ecfbcf50..e02d4fa7a 100644
--- a/dev-util/xmake/xmake-9999.ebuild
+++ b/dev-util/xmake/xmake-9999.ebuild
@@ -14,12 +14,10 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/xmake-io/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
 	KEYWORDS="~amd64 ~riscv ~x86"
-	# extraction path may change in future
-	S="${WORKDIR}"
 fi
 
 # tarball doesn't provide tests
-RESTRICT="test"
+RESTRICT="test strip"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -40,14 +38,11 @@ DOCS=(
 	NOTICE.md README.md README_zh.md
 )
 
-src_compile() {
-	emake build
-}
-
-src_install() {
-	einstalldocs
-
-	emake PREFIX="/usr" DESTDIR="${D}" install
+src_configure(){
+	econf --prefix="${EPREFIX}"/usr \
+		--plat=linux
+		# --plat=linux is necessary, which enables correct directory:
+		# build/linux/ARCH other than build/ARCH/ARCH
 }
 
 pkg_postinst() {