diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-12 12:14:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-12 12:14:42 +0100 |
commit | 3a0e100e02e1c6c2818268f57eae51095cee35af (patch) | |
tree | fdc72a395f9087c6e6dfa08b8a1791f65c5af170 /app-portage/gentoolkit | |
parent | b71bf04bdb3f690dbd36fcda860a5a68c1988f6e (diff) |
gentoo auto-resync : 12:10:2023 - 12:14:42
Diffstat (limited to 'app-portage/gentoolkit')
-rw-r--r-- | app-portage/gentoolkit/Manifest | 2 | ||||
-rw-r--r-- | app-portage/gentoolkit/gentoolkit-9999.ebuild | 68 |
2 files changed, 60 insertions, 10 deletions
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest index c00c8a2d71e5..45b7eaa10bc7 100644 --- a/app-portage/gentoolkit/Manifest +++ b/app-portage/gentoolkit/Manifest @@ -4,5 +4,5 @@ DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4 DIST gentoolkit-0.6.2.tar.bz2 3186974 BLAKE2B 48f388962e70842b7959467b7697b98121ee2a27bca6e2fc2ebb69782ece1df9b63b4451e19ebacf5a627a9c6feb17f7af395229d2eb870d8bbde1da80262593 SHA512 a1c9157758453f214e6131237df2bc91c49c28a4411ecbb0f74768ae0dd7c4fe8272cfc354a424f6acc8cc322d4eaa35ef98147fe749bc41cb680bb3acfdc2ac EBUILD gentoolkit-0.6.1-r3.ebuild 2061 BLAKE2B f3cbbe94e63f285e9eb5826f98fe311649ea2b82ff034ba738ebeb851d9a6f757688f5fce84d7142074fd1a1cdfaf811ebd52f0321ed127a006f7bb5fd608d38 SHA512 75037990e0dbd389e1ff755831fb8773529696596b380cda30a0936b8efd03a39f544e042e57b10a1e080eb0f18ee317eb78fff960f3e7c2195b664846a44e23 EBUILD gentoolkit-0.6.2.ebuild 1995 BLAKE2B 038f05f22a88dda546be2f2c148d5031b0a6d0618eec531e24c1f313d78eba50743bd190b76da5ed2157681f98ef9a9bed0958313b96f98dc6b0f60d3a58c914 SHA512 5849591a8471a5b08a81e54589afc24a59dfe02827314ad7ac9493c2e0505ee1c6705c3a6d72879a880bb94bfb95fed566e34660ecec705a8a0a0982c787c87d -EBUILD gentoolkit-9999.ebuild 1993 BLAKE2B 1455426d3691ce60a3c5e1782eea30bfc4928bbd2fc223f8149707dd2b401d084058551a537df2a038ade84bdc2ef66252dee17dece51cd127d35cffd174cf0a SHA512 8c5fb4f27bf71a69d2e2d69409588a93173cc1a94451416a971c1f46ce3dfabe213990ceb399d6021f0f27546e068f8efa73e4e96b33060a7d16369ece959165 +EBUILD gentoolkit-9999.ebuild 2922 BLAKE2B 90875764be028eced1389b3fa540b6a35405330365362408a23f3b9cbcd4d784bff0a6bdc8a3ca16c6ecc6fccfbba0d612d08f03f1dd4129a9621ddc65f5fc3f SHA512 7f1596837aec6e628076b187895682466c0860cad55869e09215feb436f854437d2b20f2aed01a3e5c99257453e36f3342d656fcd3804de003e62ff0bef8165f MISC metadata.xml 737 BLAKE2B 4145e08f0b544b2bd32a5322944bad4d019d5a693e23ace8d7b0592230c6660bf7ef4d1df4f8852745af7939c8e88e58aa04233d3a69a6e7ad624349b8e335f0 SHA512 28ec82f6a523f69d2c908b4e2cf9823ff8825e39a01187b74d37f90ee78cec751002cdf0786b177df048a5cb1c728bb29fc9f2f743b18200bf307eccdf052ce8 diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index 018a60d8df98..e4a3125c8852 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" -inherit distutils-r1 tmpfiles +inherit meson python-r1 tmpfiles if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" @@ -21,6 +21,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" LICENSE="GPL-2" SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Need newer Portage for eclean-pkg API, bug #900224 DEPEND=" @@ -28,19 +29,25 @@ DEPEND=" " RDEPEND=" ${DEPEND} + ${PYTHON_DEPS} app-alternatives/awk sys-apps/gentoo-functions " -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -distutils_enable_tests setup.py - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all +# setuptools is still needed as a workaround for Python 3.12+ for now. +# https://github.com/mesonbuild/meson/issues/7702 +# +# >=meson-1.2.1-r1 for bug #912051 +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/meson-1.2.1-r1 + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ' python3_12) +" +src_prepare() { + default if use prefix-guest ; then # use correct repo name, bug #632223 sed -i \ @@ -49,6 +56,49 @@ python_prepare_all() { fi } +src_configure() { + local code_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Dcode-only=${code_only} + -Deprefix="${EPREFIX}" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure + code_only=true +} + +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 + dotmpfiles data/tmpfiles.d/revdep-rebuild.conf + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) + python_replicate_script "${scripts[@]}" +} + +my_src_install() { + local pydirs=( + "${D}$(python_get_sitedir)" + ) + + meson_src_install + python_optimize "${pydirs[@]}" + python_fix_shebang "${pydirs[@]}" +} + pkg_postinst() { tmpfiles_process revdep-rebuild.conf |