From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/
Date: Thu, 16 Nov 2023 15:55:14 +0000 (UTC) [thread overview]
Message-ID: <1700150104.f9edecf8b9d748a4849c58313c0066cfe3d525cc.flow@gentoo> (raw)
commit: f9edecf8b9d748a4849c58313c0066cfe3d525cc
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 15:54:38 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:55:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9edecf8
dev-java/java-config: update for new Meson-based build
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/java-config/java-config-9999.ebuild | 51 +++++++++++++++++++++-------
1 file changed, 38 insertions(+), 13 deletions(-)
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 852afb28806a..a4dc516e9ab8 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -3,13 +3,11 @@
EAPI=8
-# jython depends on java-config, so don't add it or things will break
PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 prefix
+inherit meson python-r1
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
else
@@ -24,27 +22,54 @@ LICENSE="GPL-2"
SLOT="2"
IUSE="test"
RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
# baselayout-java is added as a dep till it can be added to eclass.
RDEPEND="
+ ${PYTHON_DEPS}
sys-apps/baselayout-java
sys-apps/portage[${PYTHON_USEDEP}]
"
-python_configure_all() {
- # setup.py fails to update this file
- eprefixify src/launcher.bash
+src_configure() {
+ local python_only=false
+ python_foreach_impl my_src_configure
}
-python_install_all() {
- distutils-r1_python_install_all
+my_src_configure() {
+ local emesonargs=(
+ -Darch="${ARCH}"
+ -Dpython-only="${python_only}"
+ -Deprefix="${EPREFIX}"
+ )
- # This replaces the file installed by java-config-wrapper.
- dosym java-config-2 /usr/bin/java-config
+ meson_src_configure
+ python_only=true
}
-python_test() {
- esetup.py test
+src_compile() {
+ python_foreach_impl meson_src_compile
+}
+
+src_test() {
+ python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+src_install() {
+ python_foreach_impl my_src_install
+
+ local scripts
+ mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
+ python_replicate_script "${scripts[@]}"
+}
+
+my_src_install() {
+ meson_src_install
+
+ local pydirs=(
+ "${D}$(python_get_sitedir)"
+ )
+ python_optimize "${pydirs[@]}"
}
next reply other threads:[~2023-11-16 15:55 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 15:55 Florian Schmaus [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-08 6:28 [gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/ Sam James
2024-07-29 8:55 Arthur Zamarin
2024-07-27 11:58 Sam James
2024-07-27 11:58 Sam James
2024-07-27 11:58 Sam James
2024-06-27 7:23 Florian Schmaus
2023-12-20 15:47 Michał Górny
2023-12-20 10:36 Sam James
2023-12-20 10:36 Sam James
2023-12-20 10:36 Sam James
2023-11-17 8:25 Florian Schmaus
2023-11-16 20:30 Florian Schmaus
2023-11-14 14:12 Florian Schmaus
2023-11-14 14:11 Florian Schmaus
2023-11-14 14:11 Florian Schmaus
2023-10-12 9:47 Sam James
2023-09-17 14:35 Arthur Zamarin
2023-05-30 18:01 Mike Gilbert
2023-01-03 13:01 Florian Schmaus
2022-05-01 20:47 Georgy Yakovlev
2021-12-25 10:11 Georgy Yakovlev
2021-05-23 9:10 Miroslav Šulc
2021-05-23 9:08 Miroslav Šulc
2021-05-23 9:08 Miroslav Šulc
2020-12-15 19:32 Fabian Groffen
2020-11-05 22:41 Patrice Clement
2020-07-16 21:10 Patrice Clement
2020-07-09 11:52 Sam James
2020-07-05 13:44 Agostino Sarubbo
2020-07-05 13:36 Agostino Sarubbo
2020-07-05 8:52 Sergei Trofimovich
2020-06-23 13:30 Patrice Clement
2020-06-23 13:30 Patrice Clement
2020-06-18 7:36 Patrice Clement
2020-06-17 21:04 Patrice Clement
2020-04-29 18:31 Thomas Deutschmann
2020-04-18 3:02 Craig Andrews
2020-04-15 5:54 Mike Gilbert
2019-05-18 10:02 Michał Górny
2019-01-05 23:17 Georgy Yakovlev
2018-11-02 21:37 Patrice Clement
2017-05-05 15:28 Manuel Rüger
2017-01-24 20:21 James Le Cuirot
2016-04-03 22:36 James Le Cuirot
2016-04-03 22:36 James Le Cuirot
2016-02-21 11:55 James Le Cuirot
2016-02-18 19:13 James Le Cuirot
2016-02-18 17:05 James Le Cuirot
2015-09-11 7:53 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1700150104.f9edecf8b9d748a4849c58313c0066cfe3d525cc.flow@gentoo \
--to=flow@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox