summaryrefslogtreecommitdiff
path: root/app-portage
diff options
context:
space:
mode:
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/Manifest.gzbin9755 -> 9751 bytes
-rw-r--r--app-portage/elogv/Manifest2
-rw-r--r--app-portage/elogv/metadata.xml1
-rw-r--r--app-portage/gentoolkit/Manifest2
-rw-r--r--app-portage/gentoolkit/gentoolkit-9999.ebuild68
-rw-r--r--app-portage/java-ebuilder/Manifest2
-rw-r--r--app-portage/java-ebuilder/metadata.xml1
-rw-r--r--app-portage/porticron/Manifest2
-rw-r--r--app-portage/porticron/metadata.xml1
9 files changed, 66 insertions, 13 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 813901580d8d..8be81e34ca46 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
Binary files differ
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 322341ce38eb..10c5e3667d7f 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -8,4 +8,4 @@ EBUILD elogv-0.8.0.ebuild 1732 BLAKE2B 056a2909dcf8a6f7e677885095382f3096dcf80f2
EBUILD elogv-0.8.1.ebuild 1735 BLAKE2B 3af56332709a0068636cb0472ac161ba2843bf6c14efc37034278bca6075aa2039fa4124b3d89e5531f0007c91e626b192ae9ec1f773771eaae8fbe272ee2239 SHA512 209e78da9b5246f3dc237757ff51ecfaddaf03afbb0fc0e5302523d2582a333eaefc51566e8299783758ee0675b243a6b15a422dac29c2052431ec6711571529
EBUILD elogv-0.8.2.ebuild 1735 BLAKE2B 24334bc3483c1de8565051258be7d1225346940f561f2d9cbb3f2ce35821c523712695c0011da90e90aa94313f48aa95d3e0ea88a7f6cfe8cc44d3c471d62101 SHA512 d07683e8a42f228fd3955272caa1c4182de25e522af99b90dae24a5631580ad9abb176cd40b14f650d26884d29aa061e123b042d634d422cc157faa30056af77
EBUILD elogv-0.8.3.ebuild 1735 BLAKE2B 24334bc3483c1de8565051258be7d1225346940f561f2d9cbb3f2ce35821c523712695c0011da90e90aa94313f48aa95d3e0ea88a7f6cfe8cc44d3c471d62101 SHA512 d07683e8a42f228fd3955272caa1c4182de25e522af99b90dae24a5631580ad9abb176cd40b14f650d26884d29aa061e123b042d634d422cc157faa30056af77
-MISC metadata.xml 470 BLAKE2B 8929c8c694be9a3296adfdb126acc0505333cb9b780a6ede783b18046f45d90a75039fd02742b53982a67e10912fc091528a75775aae08aa725a16c9df37ab01 SHA512 16782cd7c0f06ab11b81ab3c3850b6084bcaf160e2e0e383f3a0cfa9737f73a9ad3f2532b1b3c779c7eea746aaadd2e360f6e2b57baace74f5a18e4ca266ef17
+MISC metadata.xml 522 BLAKE2B 7035e1f7ac2c1a900c69dbf9be615e18e6e88e348afe031323cd7d131a481fdef548a3b9a6120fc2c5f68c017c469d3ab55fd3f0d3c0cd6b05f5f387569a7398 SHA512 8c2fe48120e937fb59066da92087ea93d88022c01832daf7da9d051db67a597018653fb6c5092331b777af43af21eab8d24ab0e499b75ae5e05b2dc41b6d9d00
diff --git a/app-portage/elogv/metadata.xml b/app-portage/elogv/metadata.xml
index 64585ba22a6c..c1b6a7fe55bd 100644
--- a/app-portage/elogv/metadata.xml
+++ b/app-portage/elogv/metadata.xml
@@ -10,6 +10,7 @@
<name>Gentoo Portage tools team</name>
</maintainer>
<upstream>
+ <remote-id type="gentoo">proj/elogv</remote-id>
<remote-id type="github">gentoo/elogv</remote-id>
</upstream>
</pkgmetadata>
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
diff --git a/app-portage/java-ebuilder/Manifest b/app-portage/java-ebuilder/Manifest
index 68c8591ea87d..47e35a5780a4 100644
--- a/app-portage/java-ebuilder/Manifest
+++ b/app-portage/java-ebuilder/Manifest
@@ -1,4 +1,4 @@
DIST java-ebuilder-0.5.1.tar.gz 51590 BLAKE2B d37638247650610637d71e91c7209c1bace4489a5bdd2a3c3be3961e8f1238c96c6d0978f59b32f3a44f51d4f1b26c5016cc5c82c7b619ae35601eeeed866a35 SHA512 e091b1c80eaced03b1950fcb769f2bd5922aa37ebdb480b48870f9c601017c621486b049e7cd694a57f832baf4f04c6fc8a31848f9c63f4d26dd4092b1193c55
EBUILD java-ebuilder-0.5.1-r1.ebuild 1270 BLAKE2B 054d72db96afb08dd56ead62d1eda0455ff000a28bb3119b9a48b9d2ed604a9a19ed0ad771e8ef438fde40a4504e5a9c38a003d273f0ebd0a79d6efb8e75d83c SHA512 1cee599104e774f182bdb0ae7f7bd454657949503e61652c36218e920f587269ad53d774b6faacce9cc0097754597cfd048c6a422cb1ee60f6f8d2b510b9db3c
EBUILD java-ebuilder-9999.ebuild 1271 BLAKE2B 4f182da84e66accd13e4498b5ea2ee26a4395b736d880f41f6705953a3341d5154870bfd43e2d9a9a181a6dd8bf7c153112183f1a3ab9f26721b4e2abf21e33b SHA512 736157ea5f6d5230900aa80ee9e05d358dbf3cf77874bf62f1334a948e2bc47bc7322fb0fc6b55cf758716ea0ce6bef99b170529fa148d1c18b1d20a8f73423a
-MISC metadata.xml 340 BLAKE2B 599670e8036ae8eef31e9c506b260e13229155887f85d6be3905dd59839fc541bfa9acc1b702ae3acdf8427c3fc95bda8435588adced693f3921066b673e5498 SHA512 f7687305a9acfe43da6d0579bbaaa2a5e60104f204b6427d7cd59271d190799c8b3c0aa3ad9e08638f5ccaae7f00a8c9408fc2a1f322461d12abdb31b69ba72a
+MISC metadata.xml 400 BLAKE2B 30d8c160b24ec74d420c06eebf9b7c8ae8c951f715a5ccb3222bf160bcb13a79f7205e73a80aaf9f71411a0a49f52b802d999859a38089c525ce04db0820d0f4 SHA512 8c1c1a0b7a4a41b9bb2171fb94360ebd3ceb667f7fd166152b6bdf18f5db2459645fc3e8546d9f92ad9a072155f7466c6cc96714f7a9f9206fb6899b636f7353
diff --git a/app-portage/java-ebuilder/metadata.xml b/app-portage/java-ebuilder/metadata.xml
index 7f410f327859..2760a3d5cbe4 100644
--- a/app-portage/java-ebuilder/metadata.xml
+++ b/app-portage/java-ebuilder/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
+ <remote-id type="gentoo">proj/java-ebuilder</remote-id>
<remote-id type="github">gentoo/java-ebuilder</remote-id>
</upstream>
<maintainer type="person">
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index f207eab4fd00..39eb74fc6bf2 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -1,3 +1,3 @@
DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
EBUILD porticron-0.7.1-r1.ebuild 525 BLAKE2B 2af6fb842fce08d448608cfa8e33a13e4129d89119531e97a6dcab540f6f06f733ab00f3b913401a847a664f18e5c76915a6a0b20fb0cc78f74dc02ef1387fdd SHA512 f01ea83efde07eb4862d1e9bfce6f272bbfbca1820c3249a5f36eeeab2bdf090969f1c5829d850b9997246d9fb13ab9a975974cf73922f6417afbcb451634f3b
-MISC metadata.xml 254 BLAKE2B e8873c09a7b18372b964c2e8bb515bf6843f441b58da5e41d6a51e433a9660ae8f6fc913adcdc000c8907f02f271139ef50220acd2d3330c73aa45091de0a82f SHA512 1a705c11d078bc0fb97a7bb51fdf41e35d88c41a74d1b7a3b13cd5cf78a70fc1dd064ac097509cb6c58669fbdb268861f494f28205bbceaacc4c1ead705610e8
+MISC metadata.xml 310 BLAKE2B be8143717980447fbe2722cbb1ccbe51536b6ed4381f59a828498adea948fb60520c6b3e5e1c818561e98fa33c3ca64729dba9c9c7f3626a07411daba4c74d71 SHA512 f8b22a2f4b859c7910f809c537259d5047f3da0b870533edb0fac32b814f6a905677e90791d678e214872d93db4a48cc10ebd2b5569e205ca2314b8d94792a94
diff --git a/app-portage/porticron/metadata.xml b/app-portage/porticron/metadata.xml
index 4a39ba0898b1..8d0917744ca6 100644
--- a/app-portage/porticron/metadata.xml
+++ b/app-portage/porticron/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
+ <remote-id type="gentoo">proj/porticron</remote-id>
<remote-id type="github">gentoo/porticron</remote-id>
</upstream>
</pkgmetadata>