From ce163dcd0944d81d8406c9532b457535efca7a6d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Jan 2024 16:48:54 +0000 Subject: gentoo auto-resync : 22:01:2024 - 16:48:54 --- dev-util/Manifest.gz | Bin 64306 -> 64294 bytes dev-util/gdbus-codegen/Manifest | 3 +- .../files/gdbus-codegen-2.78.4-distutils.patch | 36 ++++++ .../gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild | 80 +++++++++++++ dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild | 74 ------------ dev-util/pkgconf/Manifest | 10 +- .../pkgconf/files/pkgconf-2.1.0-digraph-test.patch | 41 +++++++ .../files/pkgconf-2.1.0-fix-modversion.patch | 95 ++++++++++++++++ .../files/pkgconf-2.1.0-traverse-only-once.patch | 71 ++++++++++++ dev-util/pkgconf/pkgconf-2.0.1.ebuild | 69 ----------- dev-util/pkgconf/pkgconf-2.0.2.ebuild | 69 ----------- dev-util/pkgconf/pkgconf-2.0.3.ebuild | 69 ----------- dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild | 75 ++++++++++++ dev-util/poke/Manifest | 2 + dev-util/poke/poke-3.90.1.ebuild | 126 +++++++++++++++++++++ 15 files changed, 532 insertions(+), 288 deletions(-) create mode 100644 dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch create mode 100644 dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild delete mode 100644 dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild create mode 100644 dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch create mode 100644 dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch create mode 100644 dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch delete mode 100644 dev-util/pkgconf/pkgconf-2.0.1.ebuild delete mode 100644 dev-util/pkgconf/pkgconf-2.0.2.ebuild delete mode 100644 dev-util/pkgconf/pkgconf-2.0.3.ebuild create mode 100644 dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild create mode 100644 dev-util/poke/poke-3.90.1.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 53fe78a1ce35..6ad50c9a1743 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest index 0b084865cba9..e437ef68a53a 100644 --- a/dev-util/gdbus-codegen/Manifest +++ b/dev-util/gdbus-codegen/Manifest @@ -1,9 +1,10 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b +AUX gdbus-codegen-2.78.4-distutils.patch 889 BLAKE2B eb9749bb47f6485751c9d31fad5c6ac846f049315b12d959a85ecac74c7f238da8b7c5225a3fdc566af368a86661b11037e7f8c4768b59a060f6e21f0fc2f4eb SHA512 cdf02f1791d9144145bc442758e0e729b2ffff99c52309a3798447a428d4bfdc3a5c583e6d0814c5be494d5f67a6053a425fd7384465c5186cfe5052c69db3c4 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 EBUILD gdbus-codegen-2.76.4.ebuild 2205 BLAKE2B f14f73a09f58af0d389f8c152a28cb26d4214415d4283ecd011858b8e392e04225d94ca4d21d38e4737760c65f5163899b8c07f0056e0c95075f47e0ee92ee30 SHA512 54b44a179203fdd817ed7a9479bae47d9b14bee870ce18c398fde23a82defca89ab0f7d34dc15b2859cba0075e2b81e8646a5fb23d00dfefb15de408dc1945f5 EBUILD gdbus-codegen-2.78.3.ebuild 2208 BLAKE2B 22963759fd60dcd643bc457cf66160ec938ea0226fc102e2a39bb9e0df1bfd484c4c35b98def56c079fd7c023a5debfdfeff62d48dbc24ec1f3ae9f5b0385b0a SHA512 492c5b32fdf405091facb25fd0039cb4f956502fe0d1800da596ecfba6bb272010ac6dadf9b202e843be33a619b94c4491e72e5abbcdf6f20dbaea10a8e505ac -EBUILD gdbus-codegen-2.78.4.ebuild 2214 BLAKE2B 5bfc287bbbeb1b59ce4d156c0c7d3d7803e871a7c9807b5f7e5ad4fd1e893307499479ce059ef7c56ca567f3d5622dc6e4effbb53c76e93fbcbc59b2c2cee099 SHA512 9b095d637786dbbbec322ab6b7539e068ed6f961f142587d9d85d026689248f9d9d945c13abb74bf94335bb0f1b7d0b0a3ae8821dfa13ff5d2055ce5c6292a71 +EBUILD gdbus-codegen-2.78.4-r1.ebuild 2332 BLAKE2B 04ad09b7c32c05a4e4c1d37944b900c5d49601c1b0ff4513576509ca57de551b57f24fb333555fa0af47b3c2926ab6d1f3c02f8d8980ab47e04ad1e2d2c756b0 SHA512 cc1bf57f9500358470f086e789f690b67b595875ed182778c0b68490612b0f128efdabd4de59009e887df54ba2623679734f4c18a32163f7f7361a9b54e9b762 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752 diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch new file mode 100644 index 000000000000..38fbe0e1a9b5 --- /dev/null +++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/922654 +https://gitlab.gnome.org/GNOME/glib/-/issues/3134 +https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291 + +[sam: Trimmed the CI changes.] + +From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001 +From: Jordan Williams +Date: Fri, 1 Dec 2023 09:53:50 -0600 +Subject: [PATCH] Switch from the deprecated distutils module to the packaging + module + +The distutils module was removed in Python 3.12. +--- + +--- a/utils.py ++++ b/utils.py +@@ -19,7 +19,7 @@ + # + # Author: David Zeuthen + +-import distutils.version ++import packaging.version + import os + import sys + +@@ -166,4 +166,4 @@ def version_cmp_key(key): + v = str(key[0]) + else: + v = "0" +- return (distutils.version.LooseVersion(v), key[1]) ++ return (packaging.version.Version(v), key[1]) +-- +GitLab + + diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild new file mode 100644 index 000000000000..00234d0e217a --- /dev/null +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + "${FILESDIR}/${PN}-2.78.4-distutils.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild deleted file mode 100644 index a859319309e2..000000000000 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.78.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome.org distutils-r1 - -DESCRIPTION="GDBus code and documentation generator" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xsl-stylesheets -" - -S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" - -python_prepare_all() { - PATCHES=( - "${FILESDIR}/${PN}-2.56.1-sitedir.patch" - ) - distutils-r1_python_prepare_all - - local MAJOR_VERSION=$(ver_cut 1) - local MINOR_VERSION=$(ver_cut 2) - sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die - sed -e "s:@VERSION@:${PV}:" \ - -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ - -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die - cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" - sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" -} - -do_xsltproc_command() { - # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) - xsltproc \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - -o "${2}" \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - "${1}" || die "manpage generation failed" -} - -src_compile() { - distutils-r1_src_compile - do_xsltproc_command \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \ - "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} - -src_test() { - einfo "Skipping tests. This package is tested by dev-libs/glib" - einfo "when merged with FEATURES=test" -} - -python_install_all() { - distutils-r1_python_install_all # no-op, but prevents QA warning - doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index a692399b820d..1dec5eb06846 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,12 +1,10 @@ +AUX pkgconf-2.1.0-digraph-test.patch 1200 BLAKE2B e46ed6e40e853ea879b7c840f0e04f52049026f14f46f11562602a20b3f7c73a8cdf0323768ac9cad279937d95e5fe9c26ee8ca1c8127525948db0141a7d0b72 SHA512 6d1a8464f67782370ccda54b3a07780490853ba53205fc8cc90758bf23eae0b43ef61ac9ef02ddf8667d4a54fa45964992540f02e087b758bcd61d717cf050dd +AUX pkgconf-2.1.0-fix-modversion.patch 3007 BLAKE2B c81f97e96cde8accb848b8fe56001daa1ad3342731afd9146fcda89ddfc164d4d2df38fc03143d0ac134940663e06d1581c3c4371269496d6bca4c143bd91e4c SHA512 d47da4d58abe5fdd8877b012a205dcab96e7d39624d6e333ce8e72d1af9e3daafc2a9106bc80a04599fb27d8a61a1a176fc2819c680eac482477c4a4fef8e75d +AUX pkgconf-2.1.0-traverse-only-once.patch 2192 BLAKE2B 801d55d823f2a0d8698c75c84297f586c22f2250b0e9663f8e6f49491507352762cfeed0639320443af7289c336f4bd6b7b295effc0da6603da9d631198b075b SHA512 f50f1f250544a7fa0476dec9f415920a43aa0799c473ea28de931ad121c60a74eab83b0207be4ba706e0e007445dee3ccf11714ef7079c6564a86b9c7f3ed48c DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba -DIST pkgconf-2.0.1.tar.xz 310576 BLAKE2B 9cb4a1a2ba9a961f184e8d600e15866b6ca971c84b1f9ce83a9ce528b16ec1f6c425ca0deebe5aa11f54d4daf64afbd59e96289a2e17a4bf62f8a82d48d59248 SHA512 1f6e6e421e6e6228aad5cbd834016c8657a59e3bbb5929de4b62377a79cb4e4a52e339f305378b80e6309701bbc0490179e0ead7bdee9da6d7c78565d7b80bc8 -DIST pkgconf-2.0.2.tar.xz 310604 BLAKE2B bc13a987d2ed4076af126dfd81c77c10004d0436fcb94c9e7ba18d37a7209ac432f4eb6909e65b22bdff0a4392ef1e764840efa7605adab0db1efa687b131796 SHA512 ca0570cff61534508b091408edf0021773c5f7f4c57ec5427474242f5f84a37e8fdc220cc02b9b362e71b6f8735f0be2c2c246e2212c65a833e44182e2e12e32 -DIST pkgconf-2.0.3.tar.xz 310796 BLAKE2B a0a526d59dce4eaafb5a43784676d7717ea8718ea207b3c47e78ef5388804547633ca76cf5b0942d8409c51ff293b8760ee2f9ebfc3ee6c4e4d41861e93db25a SHA512 cdbacd2894f9e5767dd7407ac4d4301a769ee0c6122a1219ce2c89d1a2019056d150cc42b98fda7fb0bd3d167fda2b897a1a92619f64ec5bb02ac9dbc31e445e DIST pkgconf-2.1.0.tar.xz 311576 BLAKE2B 43ac91f15106764f0b03ac4e1c3ff59aaba0436a221a295be93dd1a78b74e0185e60be8d24d040cc4ce0b0fb4446a6a8f493e7cc69bafafe5cefa9beab9b2bd5 SHA512 239dd75814d23f98a64c7df7ab12bc87a0ba52227ef0102086876e39712a2a5d2fdd1e27314070f66f9b38ef5bc0a31f0b90522f34bf8351e7bfb12c75313641 EBUILD pkgconf-1.8.1.ebuild 1557 BLAKE2B 713707b02b74f5abbee292446c94ee2dff2040b01bae387f541a610aa9332f8bd4b094932f1f4e806c8db3da0ad2e7a8f8f1328fcacf7801de6f6c5d5cb2d331 SHA512 fe9f9aedf8f38686d5d83a9f17355955d1da48e0e3eed4176a37b36f8417b5b0d2c8d84ee2d3e98f9484b3a5a2f82e2d6a87f1aeb4dece86a7ad938fa3e944cc -EBUILD pkgconf-2.0.1.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce -EBUILD pkgconf-2.0.2.ebuild 1506 BLAKE2B 53529ae196f486988c3f5a9eeb1c81106e78f40b58121857c9b6cebcdb2c3540f770d3a55be00e262cfd7ec735a9009f11f4478f66e84e04b94e5572e9455d31 SHA512 6844fc0c703848e2f84edccee1fdf0f4fe13c4114928cccb7fcb479e1c119704525ad5c3085bdd48b7dac416f1e63df7dc6f2dcc4fb558a3e9e9e93db686a4ce -EBUILD pkgconf-2.0.3.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b +EBUILD pkgconf-2.1.0-r1.ebuild 1678 BLAKE2B 2ad2f33ef24443f9be4279951130b30d720a773241ba19756fc7e584a45f306b38f2767ed1c0cb003ebdaa17c6a838504f349d142173023b88730e6fd2bd9a23 SHA512 ff1020f223eae2d6ca04a610b313492c76019e74898b00fb894f68eacda6c33a45f3cf6655dd21edb105046ba5d5b10834ad24db0b760d0286a954895b063a12 EBUILD pkgconf-2.1.0.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b EBUILD pkgconf-9999.ebuild 1519 BLAKE2B 0aaf33fef4394eaae96798a1642da77788105a5f10af56e3294e34149f4895e5bc5c1da6b0fd61998b018d5cbaf7e1aa7c0818e6829bfec7750533c6fb5c2284 SHA512 f74643e5fef09d071d6a8882b88c067eecdd8fe16d4c5f197abd989f90bc4fea468092b921a85bae4cd31b129eff59cf69d89087f6c4f99aa54a6cb4e387343b MISC metadata.xml 434 BLAKE2B 5a9cf47c90626564f39e00f9a06d5085ae9dcd4e0a99a074ba0cc053919c9223d44576bc4e534b76fe6172cf40c9a2f8ca3b9a4e111cf99e91d6828495d10b25 SHA512 eab817a711dcccf9dae4dacd9b8c68b58537d4219803c9cf89c3dc8a0625020f3af95a6fd2d1e80a588726b36ddd71bcc4d920556746146ee132ba0875030747 diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch new file mode 100644 index 000000000000..90232ab4c15b --- /dev/null +++ b/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch @@ -0,0 +1,41 @@ +https://github.com/pkgconf/pkgconf/pull/340 + +From db387172ac5fe2a3118945bf45bd90d8a2efeaf4 Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Wed, 17 Jan 2024 18:28:38 +0100 +Subject: [PATCH] Test digraph completeness for private-libs-duplication + +Complements 45073b7. +--- a/tests/requires.sh ++++ b/tests/requires.sh +@@ -10,6 +10,7 @@ tests_init \ + argv_parse2 \ + static_cflags \ + private_duplication \ ++ private_duplication_digraph \ + libs_static2 \ + missing \ + requires_internal \ +@@ -73,6 +74,21 @@ private_duplication_body() + pkgconf --static --libs-only-l private-libs-duplication + } + ++private_duplication_digraph_body() ++{ ++ export PKG_CONFIG_PATH="${selfdir}/lib1" ++ atf_check \ ++ -o 'match:"virtual:world" -> "private-libs-duplication"' \ ++ -o 'match:"virtual:world" -> "bar"' \ ++ -o 'match:"virtual:world" -> "baz"' \ ++ -o 'match:"virtual:world" -> "foo"' \ ++ -o 'match:"private-libs-duplication" -> "bar"' \ ++ -o 'match:"private-libs-duplication" -> "baz"' \ ++ -o 'match:"bar" -> "foo"' \ ++ -o 'match:"baz" -> "foo"' \ ++ pkgconf --static --libs-only-l private-libs-duplication --digraph ++} ++ + libs_static2_body() + { + export PKG_CONFIG_PATH="${selfdir}/lib1" + diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch new file mode 100644 index 000000000000..3336a455794f --- /dev/null +++ b/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch @@ -0,0 +1,95 @@ +https://github.com/pkgconf/pkgconf/issues/335 +https://github.com/pkgconf/pkgconf/issues/332 +https://github.com/pkgconf/pkgconf/issues/317 +https://github.com/pkgconf/pkgconf/pull/336 + +https://github.com/pkgconf/pkgconf/commit/125af82dbe93eddadb7ec10eebac5087e9fbc451 +https://github.com/pkgconf/pkgconf/commit/b2f8386c32d1cb4dfa8f51c619c0c2a56a3544d6 +https://github.com/pkgconf/pkgconf/commit/5825e2c6d608ef74a97349e81d750ab95c53cf50 + +From 9a5c9be4ccef66a80df7533e00e525f87ff2fb01 Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 21:20:39 +0100 +Subject: [PATCH 1/3] Test --modversion with constraint + +--- a/tests/regress.sh ++++ b/tests/regress.sh +@@ -27,6 +27,9 @@ tests_init \ + modversion_fullpath \ + modversion_provides \ + modversion_uninstalled \ ++ modversion_one_word_expression \ ++ modversion_two_word_expression \ ++ modversion_three_word_expression \ + pcpath \ + virtual_variable \ + fragment_collision \ +@@ -301,3 +304,21 @@ modversion_uninstalled_body() + atf_check -o inline:"1.2.3\n" \ + pkgconf --with-path="${selfdir}/lib1" --modversion omg + } ++ ++modversion_one_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion "foo > 1.0" ++} ++ ++modversion_two_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion foo "> 1.0" ++} ++ ++modversion_three_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion foo ">" 1.0 ++} + +From 0d4e6fa01074f5e540a7d89731edf44751bd17fc Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 21:50:46 +0100 +Subject: [PATCH 2/3] Fix --modversion output + +--- a/cli/main.c ++++ b/cli/main.c +@@ -333,7 +333,12 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int + pkgconf_dependency_t *dep = world_iter->data; + pkgconf_pkg_t *pkg = dep->match; + +- if (strcmp(pkg->why, queue_node->package)) ++ const size_t name_len = strlen(pkg->why); ++ if (name_len > strlen(queue_node->package) || ++ strncmp(pkg->why, queue_node->package, name_len) || ++ (queue_node->package[name_len] != 0 && ++ !isspace(queue_node->package[name_len]) && ++ !PKGCONF_IS_OPERATOR_CHAR(queue_node->package[name_len]))) + continue; + + if (pkg->version != NULL) { + +From ace73a690437488baea28130c98f0b1eaab4689e Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 22:12:20 +0100 +Subject: [PATCH 3/3] Fix crash on two-word expressions + +--- a/cli/main.c ++++ b/cli/main.c +@@ -1405,6 +1405,15 @@ main(int argc, char *argv[]) + pkgconf_queue_push(&pkgq, package); + pkg_optind++; + } ++ else if (argv[pkg_optind + 2] == NULL) ++ { ++ char packagebuf[PKGCONF_BUFSIZE]; ++ ++ snprintf(packagebuf, sizeof packagebuf, "%s %s", package, argv[pkg_optind + 1]); ++ pkg_optind += 2; ++ ++ pkgconf_queue_push(&pkgq, packagebuf); ++ } + else + { + char packagebuf[PKGCONF_BUFSIZE]; + diff --git a/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch b/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch new file mode 100644 index 000000000000..80eab2485e1e --- /dev/null +++ b/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch @@ -0,0 +1,71 @@ +https://issuetracker.google.com/issues/317357322 +https://bugs.gentoo.org/912843 +https://github.com/pkgconf/pkgconf/pull/339 + +From 478199b425b46e9dae36bb174f1bd08bf3ffb0f1 Mon Sep 17 00:00:00 2001 +From: Yi Chou +Date: Fri, 22 Dec 2023 00:13:31 +0800 +Subject: [PATCH] Use traverse_id to prevent traverse pkgdep twice + +--- a/libpkgconf/libpkgconf.h ++++ b/libpkgconf/libpkgconf.h +@@ -137,6 +137,8 @@ struct pkgconf_path_ { + #define PKGCONF_PKG_PROPF_CACHED 0x02 + #define PKGCONF_PKG_PROPF_UNINSTALLED 0x08 + #define PKGCONF_PKG_PROPF_VIRTUAL 0x10 ++#define PKGCONF_PKG_PROPF_VISITED 0x20 ++#define PKGCONF_PKG_PROPF_VISITED_PRIVATE 0x40 + + struct pkgconf_pkg_ { + int refcount; +@@ -176,6 +178,7 @@ struct pkgconf_pkg_ { + + uint64_t serial; + uint64_t identifier; ++ uint64_t traverse_id; + }; + + typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data); +@@ -212,6 +215,7 @@ struct pkgconf_client_ { + + uint64_t serial; + uint64_t identifier; ++ uint64_t traverse_id; + + pkgconf_pkg_t **cache_table; + size_t cache_count; +--- a/libpkgconf/pkg.c ++++ b/libpkgconf/pkg.c +@@ -1628,6 +1628,21 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client, + if (maxdepth == 0) + return eflags; + ++ unsigned int visited_flag = (client->flags & PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE) ? PKGCONF_PKG_PROPF_VISITED_PRIVATE : PKGCONF_PKG_PROPF_VISITED; ++ ++ if (root->traverse_id == client->traverse_id) ++ { ++ if (root->flags & visited_flag) ++ return eflags; ++ } ++ else ++ { ++ root->traverse_id = client->traverse_id; ++ root->flags &= ~(PKGCONF_PKG_PROPF_VISITED | PKGCONF_PKG_PROPF_VISITED_PRIVATE); ++ } ++ ++ root->flags |= visited_flag; ++ + PKGCONF_TRACE(client, "%s: level %d, serial %"PRIu64, root->id, maxdepth, client->serial); + + if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) +@@ -1672,6 +1687,9 @@ pkgconf_pkg_traverse(pkgconf_client_t *client, + int maxdepth, + unsigned int skip_flags) + { ++ static uint64_t traverse_id = 0; ++ client->traverse_id = ++traverse_id; ++ + if (root->flags & PKGCONF_PKG_PROPF_VIRTUAL) + client->serial++; + + diff --git a/dev-util/pkgconf/pkgconf-2.0.1.ebuild b/dev-util/pkgconf/pkgconf-2.0.1.ebuild deleted file mode 100644 index 742423bfd5ac..000000000000 --- a/dev-util/pkgconf/pkgconf-2.0.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-util/pkgconf/pkgconf-2.0.2.ebuild b/dev-util/pkgconf/pkgconf-2.0.2.ebuild deleted file mode 100644 index 742423bfd5ac..000000000000 --- a/dev-util/pkgconf/pkgconf-2.0.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-util/pkgconf/pkgconf-2.0.3.ebuild b/dev-util/pkgconf/pkgconf-2.0.3.ebuild deleted file mode 100644 index 1a3b9b6870e5..000000000000 --- a/dev-util/pkgconf/pkgconf-2.0.3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf$(get_exeext) - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild b/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild new file mode 100644 index 000000000000..7ad7f087b464 --- /dev/null +++ b/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 2012-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib multilib-minimal + +if [[ ${PV} == 9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" +else + SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" + +LICENSE="ISC" +SLOT="0/4" +IUSE="test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND="!dev-util/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-modversion.patch + "${FILESDIR}"/${PN}-2.1.0-digraph-test.patch + "${FILESDIR}"/${PN}-2.1.0-traverse-only-once.patch +) + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local myeconfargs=( + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest index 68126320061f..2737e43d4965 100644 --- a/dev-util/poke/Manifest +++ b/dev-util/poke/Manifest @@ -6,6 +6,7 @@ DIST poke-3.1.tar.gz 7562582 BLAKE2B c348973185e7f33d670a9dccab60c02e8ccc247c5aa DIST poke-3.2.tar.gz 7559660 BLAKE2B c1d5739a1a497fb3daadec53fe812b65ec787dd268030a6517764541497c82451f4df391f3c434ef7729bc8e3762c31852ef3ce41aa83928e7646c40bde557dd SHA512 bd3651a2962165b318cc59c53604199eb6278ee3be45c18c36864612b0926d78a06f0e1338fdcc1fcd1cd48e2792bb3cd36a2bb5383143a66dc3aab023c0019c DIST poke-3.3.tar.gz 7553544 BLAKE2B 1e98f77937f9c45daa80591be603a74857b1bbd230cb931e59d7e9753c1687d5a4c96837bb6aca76615feca71cbeabd3be7ad234260657288d060ff63d59c040 SHA512 b00dca38d27bddee6ea131d45988aaead1d11d29b757c048f3b2be8013575cedc591844d4d99870f90964fd4f517d500cbb42aae5aff57e9fe07aac8273aa236 DIST poke-3.90.0.tar.gz 7971780 BLAKE2B ef4a5e0a25f1851e4f44314cc9e3b62c6eeb7458d5c4b3da1d7ea798c7b58b57c4ba113e3dac221e757b0d52d8b609c9cd1910a82f36d9aafe0393a1a1fa6a02 SHA512 34b2baee4317582d4ca68001b9f1bd540277c6ef133ebec49de6d45db0d564815da376b4f9761369e80976570c4bbd05272b215e78391b0a818390e613e21b1a +DIST poke-3.90.1.tar.gz 7953029 BLAKE2B f098fe68316d172e700a896fdc588c6ae5d352eca21b5230940902e51adca8b57d19093d406b6fd66391e79025d79604cf3db63ef3f7783b65cd39788a727c76 SHA512 0d4d4b63ed5448427a72ecee182065bc6fb86eb460f9a05daef2d40d5678a5352a568d0f403cce17e6711c7a82875c91d0e00890162ac85636edbf6e277d1f3e EBUILD poke-2.4-r1.ebuild 2601 BLAKE2B 22d1fc25a12e11578728742150ec3d48b1f3cfaf49c39879148735a9a4af4360bf7561f97d77f28309a2d9ebba2e443639f54fcf5d5db98e1386d96f1574ed5c SHA512 86936f8039c7389a52e6137d498169fd8b4710e15bf9fe179b82a4b2095f5b290baded078f2aa09ea66c7ebaba4e6f70fe25b7b516382dd07c86abe49e9beeec EBUILD poke-2.90.1.ebuild 2300 BLAKE2B 39e204187868b66f2e3a73916e6afab650a0ae7e2ed76006b173e60a85d9848a4ed687d805770e46580d7d402a1245a370d60755f12d6596c9389f274a139bf7 SHA512 e92e05271e6bc612e20551b78c260de47b53800ad72d09db7da6ee3aa2105e76c855bc2488c5de6ab789578f66c20e8aff8a51d41c7e631be98e51c24d0a4722 EBUILD poke-3.0.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd74149cb1b0321fc563dab9ffdaa3175c88d1f870eb353b7ac8db520349c184c13c5dd5e2da981885adc7dbf SHA512 493dd8a3bc740cf5ab7fb7a4a4babae71f9efd5e1aa91bbc9f1b8956e448840951cde6dd0c4608e994cd2fd940b04873751327b9612a83800f8f6cc620b6b314 @@ -13,5 +14,6 @@ EBUILD poke-3.1.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd741 EBUILD poke-3.2.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd74149cb1b0321fc563dab9ffdaa3175c88d1f870eb353b7ac8db520349c184c13c5dd5e2da981885adc7dbf SHA512 493dd8a3bc740cf5ab7fb7a4a4babae71f9efd5e1aa91bbc9f1b8956e448840951cde6dd0c4608e994cd2fd940b04873751327b9612a83800f8f6cc620b6b314 EBUILD poke-3.3.ebuild 2574 BLAKE2B b8653eaf3b947bc84b28fd244091fa2bf090345cdad027acbac4851f0efe56ad6a5ade677984a7bf8df388e51eda9c1e0d1fbc00af2e6aed229614a58c1d510f SHA512 f4393dade5ab20cbe49856ef7ec90b1259dee115eaefd08f0a7092b22d36137488eac6b5798c66c911fb801b116bbadc775ed7b6cf5d431251e4ba403c6741b7 EBUILD poke-3.90.0.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b +EBUILD poke-3.90.1.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b EBUILD poke-9999.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2 diff --git a/dev-util/poke/poke-3.90.1.ebuild b/dev-util/poke/poke-3.90.1.ebuild new file mode 100644 index 000000000000..1aadadd1833d --- /dev/null +++ b/dev-util/poke/poke-3.90.1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp-common flag-o-matic toolchain-funcs + +DESCRIPTION="Extensible editor for structured binary data" +HOMEPAGE="https://www.jemarch.net/poke" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git" + REGEN_BDEPEND=" + >=dev-build/autoconf-2.62 + >=dev-build/automake-1.16 + sys-apps/gawk + sys-apps/help2man + sys-apps/texinfo + app-alternatives/yacc + app-alternatives/lex + " +elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then + SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz" + REGEN_BDEPEND="" +else + SRC_URI="mirror://gnu/poke/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + REGEN_BDEPEND="" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="emacs pvm-profiling nbd nls test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boehm-gc:= + dev-libs/libatomic_ops + sys-devel/gettext + sys-libs/readline:= + emacs? ( >=app-editors/emacs-23.1:* ) + nbd? ( sys-libs/libnbd ) +" +DEPEND=" + ${RDEPEND} + test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) ) +" +BDEPEND=" + ${REGEN_BDEPEND} + virtual/pkgconfig + pvm-profiling? ( sys-devel/gcc ) + emacs? ( >=app-editors/emacs-23.1:* ) + test? ( + dev-util/dejagnu + nbd? ( sys-block/nbdkit ) + ) +" + +SITEFILE="50${PN}-gentoo.el" + +pkg_pretend() { + if use pvm-profiling && ! tc-is-gcc; then + die "USE=pvm-profiling requires GCC" + fi +} + +pkg_setup() { + use emacs && elisp-check-emacs-version +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]]; then + ./bootstrap || die + fi +} + +src_configure() { + # See bug 858461. + # Upstream support might happen one day. For context, only one file needs + # LTO to be disabled (since it's an autogenerated bytecode interpreter), + # others do not. The build system will handle this at some point in the + # future. Until then, just filter out LTO. + filter-lto + + local myconf=( + --with-lispdir="${EPREFIX}/${SITELISP}/${PN}" + --enable-hserver + $(use_enable nbd libnbd) + $(use_enable pvm-profiling) + $(use_enable nls) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + if use emacs; then + cd etc || die + elisp-compile *.el + fi +} + +src_install() { + default + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + cd etc || die + elisp-install "${PN}" *.el *.elc + fi + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3