diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-24 00:11:52 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-24 00:11:52 +0100 |
commit | 67e5603b2844a6657dd0438fa26626b013e5567f (patch) | |
tree | e7319631fdf1c41ddbe888e89a717d1ba42af992 /sys-apps | |
parent | bff543bb632933380da922cbfc07c67157d72d42 (diff) |
gentoo auto-resync : 24:06:2024 - 00:11:52
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 51184 -> 51175 bytes | |||
-rw-r--r-- | sys-apps/intune-portal/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/intune-portal/intune-portal-1.2405.17.ebuild (renamed from sys-apps/intune-portal/intune-portal-1.2404.23.ebuild) | 0 | ||||
-rw-r--r-- | sys-apps/moar/Manifest | 5 | ||||
-rw-r--r-- | sys-apps/moar/moar-1.23.15.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/moar/moar-1.24.0.ebuild | 51 | ||||
-rw-r--r-- | sys-apps/paxctld/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/paxctld/paxctld-1.2.5-r1.ebuild (renamed from sys-apps/paxctld/paxctld-1.2.5.ebuild) | 30 | ||||
-rw-r--r-- | sys-apps/pkgcraft-tools/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild | 53 | ||||
-rw-r--r-- | sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild | 14 |
11 files changed, 133 insertions, 32 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex aa69ac7b51cf..222a6c2ce7af 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/intune-portal/Manifest b/sys-apps/intune-portal/Manifest index 2851378bae99..a90abd55bdb9 100644 --- a/sys-apps/intune-portal/Manifest +++ b/sys-apps/intune-portal/Manifest @@ -1,4 +1,4 @@ AUX wrapper 345 BLAKE2B 5540b50377a3593d1ff12670fa3596850083e19fbfeb508e529fa218be0bb66410ac6cce440aa1e12b4fb9b4113e895ee5943e302b8568f571f97f13faca5342 SHA512 e70deccdf3c00a139b6230c5fa59224bf9b29156f107b4ab494e9d8bee0c96f4e2bb33c595b17b4378dbd860c9a841264f8d782a563adeefbaba20b09d531542 -DIST intune-portal_1.2404.23-jammy_amd64.deb 6666262 BLAKE2B 66e615fabcf1d307a8fc794fea03c842b3380d78f67c412acb673f185a04658427566c1f23a60b34a294462e782da46cf9004c4ef8aaf41eea67a42f671ae53c SHA512 8c344eb9b0edb4639bf2903a26c341eb0eefe15e4e663516dba9381d50cc6bc5b4868e71f85d9bb70e33b70db785eb47f74b136246b36f438d09aa7ac80e7119 -EBUILD intune-portal-1.2404.23.ebuild 1963 BLAKE2B 741d45a674383e1280d6c1d04b880275563833eacc8918498f7f23a8d4a244e592be6cb5efbb9711c7fd6beb620a0e33f7999d46d72af2f90285e144884d2df5 SHA512 62fa7582ef8c2c3d97480521c9114e89c4157af8727fb42cba67eeee8afec507522ff580de463fb4513816d558955e35cef37cb5a8535d1e18f8b35c5a710323 +DIST intune-portal_1.2405.17-jammy_amd64.deb 6662402 BLAKE2B 0f745cb0ebe6876645b14db04ba50e840cb11cfa8e9239080704299e461ffaded22f9e854ff8c635c08289e4b15f128780f30a6e2ef03d2ded4f2f1db512d3cc SHA512 5188f7467ed7cd85c8a70a24669ad2906517e71a5ca2f06f27437e9078df569afbf95c3b7b02b2c65dc85c2e58a799313e30211bab9226fabe4399a2bdb52073 +EBUILD intune-portal-1.2405.17.ebuild 1963 BLAKE2B 741d45a674383e1280d6c1d04b880275563833eacc8918498f7f23a8d4a244e592be6cb5efbb9711c7fd6beb620a0e33f7999d46d72af2f90285e144884d2df5 SHA512 62fa7582ef8c2c3d97480521c9114e89c4157af8727fb42cba67eeee8afec507522ff580de463fb4513816d558955e35cef37cb5a8535d1e18f8b35c5a710323 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203 diff --git a/sys-apps/intune-portal/intune-portal-1.2404.23.ebuild b/sys-apps/intune-portal/intune-portal-1.2405.17.ebuild index 47eb619b6b16..47eb619b6b16 100644 --- a/sys-apps/intune-portal/intune-portal-1.2404.23.ebuild +++ b/sys-apps/intune-portal/intune-portal-1.2405.17.ebuild diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest index 797f1761c92f..ec49536b6671 100644 --- a/sys-apps/moar/Manifest +++ b/sys-apps/moar/Manifest @@ -6,8 +6,11 @@ DIST moar-1.23.15-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2 DIST moar-1.23.15.tar.gz 2804019 BLAKE2B b870275909af4b16f20f755186bcc834045854e4612780e5ec7fd64f352699da1a704918e5a3e0b1544c4363ace32f789f3a714a977f69acfda83b0f36d7ebe8 SHA512 cb2aded40af9f80199dc84008552c9eda989d2de90f00ce2b37b7cdd3c16a387fe5a78593bde71b62bfe0d02e2b2dc051f91159ccd2466570847a6e2c1b5445c DIST moar-1.23.9-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa DIST moar-1.23.9.tar.gz 2804191 BLAKE2B d5663fedd70fc80d70a206c276ece6ec11da4f4b4dc396a3e11b1fb8edd5bd9f3395e943158c4bb297b5ebfeecd8f61bdbaaff79e78c4a89458f1b1a02db0e71 SHA512 9ab4a3e49b66b39f642b6a1f882c0980a4e755e3e127ca37d1319615ae836fe3250676a8c0e95ccd0f8e714357df5dc00235bf67be6097a7b2811f0e3bf02e9f +DIST moar-1.24.0-deps.tar.xz 1228028 BLAKE2B f8895cef15f6ab0eb5dcf826d86deb7dc2c67dd6e692e456d5d98830fba93b3a17e5d3b3026c0f7ea10e3810db1f17ccb27b3cb704cff1c9bcbd267fbf68acbd SHA512 f12f2fa563b5170c8fe092f15476692815c2e0ab341d8becff504e5ded426efae5fc20697ef935ca5d037fa40abbfebbe5d0f59ac4e805e2d7d60e19070df3d4 +DIST moar-1.24.0.tar.gz 2805681 BLAKE2B 02ec37082a65df2d9b2bc7b0149384f005e8b9bfe89b5ff198e376d3ae235089e858ca8866c9fd4e8f36e254915aa0ac6b17ebdb31521cf207784eb33025c2c6 SHA512 6351a4505b693f9b6dfdcd495a9f1da3fa717870d3ba2e77b65d19296a9c3b9fce53f518aea402acb9a78423cb7cb40bc5c6ed72be1115b46c1002a5cfa1dfab EBUILD moar-1.23.13.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071 EBUILD moar-1.23.14.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071 -EBUILD moar-1.23.15.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071 +EBUILD moar-1.23.15.ebuild 1141 BLAKE2B 6837c1c68e6c64e83a6fc3d51e0699676444231359a74e55e8229a83d41cbb59d30d22cf381c722cc34b857bb1680d104f83e0bf6163496be8538b1f85dafcd9 SHA512 4674a8715b00da1fa5ef4a3497c7df1cad6bb239445fd58ca4cd0883fc4a90bd095fc443555ad956f57b0070035bf1397ad93ca87e90db5e7d2f7f242e45cce6 EBUILD moar-1.23.9.ebuild 984 BLAKE2B 59e8ecfe756c1a600b9ca5e39bc43663264434288be4e7a1a7064c8e2b7dbbf47f130ebe847e6385e28d92aba622d5999a1f48777fe2eae62cf0aec56c24d78e SHA512 a4e31acdd2bc81ff9789e9b1c871a3d080dccf2532c4210f7c1b4a02b2a6366a98cf46eb785f9b896523ef401b71c4e3cda313c9162f1d8ea6151a2b54db8fd7 +EBUILD moar-1.24.0.ebuild 1143 BLAKE2B 3b995dadce97cddd595cc95ebcc290651b0c94255eae7d6fd36e9b8029764fb981dab2728a3ed808f9438080f5b3f0727474fe4051bd2f704e21df48a3437b90 SHA512 c29255a40fdec0fd4f37afd2d899e4ff9ed435ec5b5b14656ddbc4039572c56196dd597f61e444963096d1e0051f7e83a0ad2c4e5bc863cb8a141e134b4b1071 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1 diff --git a/sys-apps/moar/moar-1.23.15.ebuild b/sys-apps/moar/moar-1.23.15.ebuild index 928e03d26244..7da7d0e2a6a0 100644 --- a/sys-apps/moar/moar-1.23.15.ebuild +++ b/sys-apps/moar/moar-1.23.15.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar LICENSE="BSD-2 BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="amd64 ~arm arm64 ~ppc64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-apps/moar/moar-1.24.0.ebuild b/sys-apps/moar/moar-1.24.0.ebuild new file mode 100644 index 000000000000..928e03d26244 --- /dev/null +++ b/sys-apps/moar/moar-1.24.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-env go-module + +DESCRIPTION="Pager designed to do the right thing without any configuration" +HOMEPAGE="https://github.com/walles/moar" +SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD-2 BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +IUSE="test" +RESTRICT="!test? ( test )" + +# moarvm: https://github.com/walles/moar/issues/143 +RDEPEND="!dev-lang/moarvm" +BDEPEND=" + test? ( + app-arch/bzip2 + app-arch/xz-utils + ) +" + +src_unpack() { + default + + if [[ -d "${WORKDIR}"/vendor ]] ; then + mv "${WORKDIR}"/vendor "${S}"/vendor || die + fi + go-env_set_compile_environment +} + +src_compile() { + # https://github.com/walles/moar/blob/master/build.sh#L28 + ego build -ldflags="-w -X main.versionString=${PV}" -o moar +} + +src_test() { + # From test.sh (we don't run that because it has some linting etc) + ego test -timeout 20s ./... +} + +src_install() { + dobin moar + doman moar.1 + einstalldocs +} diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest index acc8e2770879..1ad5a0e329d2 100644 --- a/sys-apps/paxctld/Manifest +++ b/sys-apps/paxctld/Manifest @@ -1,3 +1,3 @@ DIST paxctld_1.2.5.orig.tar.gz 18694 BLAKE2B 9d219846bbdfc5d709d9fb3758ec9451bef1545d6bb25263aef1c42f992f4201e2ce9f9cae0a77ed7584ec5c3c6dd0e3d0c58ec251a52f0b855c87b0fcf0e826 SHA512 c38b2cb0bf07d0075fa01f95d82adf6aae6e7bd010fa31b349af7c92b0498bf3225344500ef306bb633caec0b642771f453a8445cadbf342775931495d0ef2c2 -EBUILD paxctld-1.2.5.ebuild 732 BLAKE2B b0c1a4bc809bf1e6c08b284addabfc974eb6bbbae0786b9cc5f018c66a7f727329f35eab6846f412b8968892144fb706f61283c8905304270c8205399e6cb391 SHA512 43d1065c3fe84e8427c8bbf29edc0f3367eaf8a60076299395d2b9f50736e4239a2f99c7c2aa7f5bb2224c191f648bac4b2acafc2e0fa8dc9aa20020f27ebef2 +EBUILD paxctld-1.2.5-r1.ebuild 655 BLAKE2B 59726a18737a467f9ce62755a633d2236bdf7556ae8b5b23eb53319878f49197e7d72395b9826ef2257a5d3aa2794fd014c9895245868cd68a5dda99b34401c2 SHA512 9dd507fc620df96a48a9267c010fe7708ee2d608ff302aabb8abf7dafb1cff567da8dfcaf8e7c991261113fa8fd9fceeec062315abcafa93e7dbac51a551bc9f MISC metadata.xml 252 BLAKE2B 77d0ee5309919adedac9caf60e48d1feea156ab00e03740fc83282b32e3424e66a9e49c3736b6e186143373653d99cb43baca8a876b9601720583693af3d43f7 SHA512 0638df454dd637421d42dd06154095824d66a1e08c5160ab406bfa45dd414d3330a5181a1d0127bee99eb56c125832b68b4ea1c1ee8da54e4929a1748070f435 diff --git a/sys-apps/paxctld/paxctld-1.2.5.ebuild b/sys-apps/paxctld/paxctld-1.2.5-r1.ebuild index c4650263e8b3..cba38e8e2631 100644 --- a/sys-apps/paxctld/paxctld-1.2.5.ebuild +++ b/sys-apps/paxctld/paxctld-1.2.5-r1.ebuild @@ -1,37 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit systemd +inherit systemd toolchain-funcs DESCRIPTION="PaX flags maintenance daemon" HOMEPAGE="https://www.grsecurity.net/" -SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz - https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz" +SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="pam" - -RDEPEND="" -DEPEND="" src_prepare() { # Respect Gentoo flags and don't strip - sed -i \ - -e '/^CC/d' \ - -e '/^CFLAGS/d' \ - -e '/^LDFLAGS/d' \ - -e '/STRIP/d' \ - Makefile - - eapply_user + sed -i Makefile -e '/^CC=/d' -e '/^CFLAGS?=/d' -e '/^LDFLAGS=/d' -e '/STRIP/d' || die + + default +} + +src_compile() { + emake CC="$(tc-getCC)" } src_install() { default - systemd_dounit "${S}"/rpm/${PN}.service + systemd_dounit rpm/${PN}.service } diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest index 607322671b84..e9ea1c1795d0 100644 --- a/sys-apps/pkgcraft-tools/Manifest +++ b/sys-apps/pkgcraft-tools/Manifest @@ -1,4 +1,6 @@ DIST pkgcraft-tools-0.0.14.tar.xz 30138240 BLAKE2B b9d0b238f26d980f032cfad26602348dabe574e3968e8adf5172e91efeea051b9720b158941a1bea53e2c1fa8180d516b1bb9668d9178f17c789fb5ba76b7bd9 SHA512 ca7c0f429228567c91a18db793b2fa81f6918cde54f302269deb6a1d2f6445756fbc73e3957ad7b29c8a0e8e000c1b939290c6bbc34bb693cc54b87841fef06c +DIST pkgcraft-tools-0.0.15.tar.xz 23029344 BLAKE2B 7e5f6e119a98bc061578bcfad954bc286bef2bfa93687d16daab615e17ede1512bb0fcbd7ce342c915f4494397169a05b7846029c1c59f2f5f0565ef34ae1bb3 SHA512 6009582531f21c3896441a04ad462fc6d06b509bc4faaa3944ae3696b7b67a0d492ec6345cc6bedc7388b20d558a01bb8a24f3c439da3972c01fcae9277d2c2c EBUILD pkgcraft-tools-0.0.14.ebuild 1143 BLAKE2B db8d072ac5674edd8de492a4df64c9da5b3e87c288159e71e5376bfb11776129e70f69c979d03a60f5a780d30b940800f16d924881cb93fa69ede13af750c5ec SHA512 1441db25715bdf6ded23ceb9fde80e53bcd66b349fb6d588a524236751a64e9676235b1ddbd54c4cda66919b49b107f4e759e25a710419c1570cda4c91ffa8c6 -EBUILD pkgcraft-tools-9999.ebuild 1143 BLAKE2B 41fc28049557fa8b0c8744aabaf5bf7f7c6b69a661b66377375bd4e6365b96aa178b17fdc4251419df986212c271c93c2b88b66b05c4ae1429215ff8004979ce SHA512 1c6643a547b3be610be712b68955b136c1904400c1ed19bf296dd4fd917b50cb2662beecd153b81e412938074170c2a43e4c8089d391da5fee02e4948fdedd5b +EBUILD pkgcraft-tools-0.0.15.ebuild 1093 BLAKE2B 4addd2b956f6b7b293e4f54c3b9211da7d27319256066daa27fc629abae4924b6c29976462e591dbc3534456557df0c92f746a522b9df186070a03c553d235cf SHA512 74eb328c077066cba08a6bc032dd815d2a1c510cf71c7ddaf66485037a5c4fe427f0b004f859e4a587c11af91886d523e930fbbb74ece877d5d994fb76c849fd +EBUILD pkgcraft-tools-9999.ebuild 1093 BLAKE2B 4addd2b956f6b7b293e4f54c3b9211da7d27319256066daa27fc629abae4924b6c29976462e591dbc3534456557df0c92f746a522b9df186070a03c553d235cf SHA512 74eb328c077066cba08a6bc032dd815d2a1c510cf71c7ddaf66485037a5c4fe427f0b004f859e4a587c11af91886d523e930fbbb74ece877d5d994fb76c849fd MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild new file mode 100644 index 000000000000..e12a623430f6 --- /dev/null +++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15.ebuild @@ -0,0 +1,53 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" " +LLVM_COMPAT=( {17..18} ) +inherit edo cargo llvm-r1 + +DESCRIPTION="pkgcraft-based tools for Gentoo" +HOMEPAGE="https://pkgcraft.github.io/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft" + inherit git-r3 + + S="${WORKDIR}"/${P}/crates/pkgcraft-tools +else + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${P}/${P}.tar.xz" + + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 GPL-3+ ISC MIT Unicode-DFS-2016" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test ) " + +QA_FLAGS_IGNORED="usr/bin/pk" + +# Clang needed for bindgen +BDEPEND=" + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + ') + >=virtual/rust-1.76 + test? ( dev-util/cargo-nextest ) +" + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_test() { + edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests +} diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild index 7f18fbdca06e..e12a623430f6 100644 --- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild +++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild @@ -4,8 +4,8 @@ EAPI=8 CRATES=" " -LLVM_MAX_SLOT=17 -inherit edo cargo llvm +LLVM_COMPAT=( {17..18} ) +inherit edo cargo llvm-r1 DESCRIPTION="pkgcraft-based tools for Gentoo" HOMEPAGE="https://pkgcraft.github.io/" @@ -32,15 +32,13 @@ QA_FLAGS_IGNORED="usr/bin/pk" # Clang needed for bindgen BDEPEND=" - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) - >=virtual/rust-1.74 + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + ') + >=virtual/rust-1.76 test? ( dev-util/cargo-nextest ) " -llvm_check_deps() { - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack |