diff options
Diffstat (limited to 'dev-build')
83 files changed, 2576 insertions, 1056 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz Binary files differindex 095084fdad08..11736c7fc2cf 100644 --- a/dev-build/Manifest.gz +++ b/dev-build/Manifest.gz diff --git a/dev-build/autoconf/Manifest b/dev-build/autoconf/Manifest index c31505ee7bcc..deb08a8cc187 100644 --- a/dev-build/autoconf/Manifest +++ b/dev-build/autoconf/Manifest @@ -31,7 +31,7 @@ DIST autoconf-2.72.tar.xz.sig 833 BLAKE2B cc33101c5d2bd28f233e54a2843d3c81dc9729 EBUILD autoconf-2.13-r8.ebuild 1674 BLAKE2B feaf7b26effb60611b5b0e59cdc97400be93017cde1da13501a6de98b8384572bf002dea7a24afb3f6767856e8d0965da1b448f6451136345329c781399681af SHA512 075002ac755083a7a26fcf6bf3482bb3ededaaadbad36a1174f894c5dedd07ad4091f567c68e04906871bcaa3451fd412803de2fc364215468992d334821e63e EBUILD autoconf-2.69-r9.ebuild 2257 BLAKE2B c3c68b83e1d16f7d23f8b96195634234ccacb78c4115bf9c76b8dbf4a6b0bcd7980ad7c52c243ec102fc22868a44c2dffefd578804ee6a1c377a6b5c528b1053 SHA512 30e2eb5a8b52b13260384ae99012c315798d51cc313328c39c561b2d643412851530368516baa892e2086f8ca8c2dcf4ca1a33c21b6bbc5b5dc3fde5a53212b2 EBUILD autoconf-2.71-r6.ebuild 2459 BLAKE2B ebd8e6a443860a75f0d71e0ca28d1777506116ccbd514de04201a5581f96b8ef62e3cb1fee3206a167bb79e0f56351dbde7b761aab41e5f69502c17e5e410f3f SHA512 c60a4b3138aa953dabf0a75c42333e5cef81712888929c47ab639402128ffb0f8eca0cd484c32b73e0bba7cafb08b76605e143d58c65b9e396a75b8754ec0087 -EBUILD autoconf-2.71-r7.ebuild 2752 BLAKE2B 096d148293fd5d3f1d8d073a4e4e93865b68f1c5cfe79d4b26d785353026a7910fbecfb2a526caecd7e44624fdb871216f5e69f46e8b0de3e9600000841c6c1a SHA512 9a93bc50f9de4be847a4770096e79c5b36c48e9ca5fe5c436fd33e96529d3f311d93c4b63c60f8e4404ccad2364a2b945edc03887866a4bf4119d801172dcaf8 +EBUILD autoconf-2.71-r7.ebuild 2751 BLAKE2B d16754aa2ca4ebe4fa18956228dcf2f3f5d5b93f1d575541f5ea3c5dd8cf3d0f661058cabc2ce771fc35c1851be9c0bd814ac0c3621957ac8ab88b2dc37357bc SHA512 01b058ce00fa401015db58d344791a84ca156e4c27d0d94e0f44deeec809032eac05416cff9b953ae921c07b77b6d255c8e9dd1742059938d28cfa2b1567226b EBUILD autoconf-2.72-r1.ebuild 2748 BLAKE2B 2f14c2faf5fc92a260145cbbbba1fb90098aadec79bd0f6b229824bb0afe127d7230e26fd66288a4895ae188bc782abfb012bcf90f2854be27a320428e2e531d SHA512 84cc3519c78186c0396306b8c5f65467ba7219e80e379f9deaa1e8adf9f27add326bf39324d2398cb44c38201d98c020d9be2a910ca96939577b516c63cc5124 EBUILD autoconf-9999.ebuild 2748 BLAKE2B 2f14c2faf5fc92a260145cbbbba1fb90098aadec79bd0f6b229824bb0afe127d7230e26fd66288a4895ae188bc782abfb012bcf90f2854be27a320428e2e531d SHA512 84cc3519c78186c0396306b8c5f65467ba7219e80e379f9deaa1e8adf9f27add326bf39324d2398cb44c38201d98c020d9be2a910ca96939577b516c63cc5124 MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e diff --git a/dev-build/autoconf/autoconf-2.71-r7.ebuild b/dev-build/autoconf/autoconf-2.71-r7.ebuild index afe15115cf8e..be5e6cf592d8 100644 --- a/dev-build/autoconf/autoconf-2.71-r7.ebuild +++ b/dev-build/autoconf/autoconf-2.71-r7.ebuild @@ -24,7 +24,7 @@ else S="${WORKDIR}"/${MY_P} if ! [[ ${PV} == *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )" diff --git a/dev-build/automake-vanilla/Manifest b/dev-build/automake-vanilla/Manifest index 10598bbf5f19..c5d75e3dea4c 100644 --- a/dev-build/automake-vanilla/Manifest +++ b/dev-build/automake-vanilla/Manifest @@ -9,8 +9,10 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e40 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 +DIST automake-1.17.tar.xz 1652632 BLAKE2B 53c24c138faf3d2be4e30ababcccd4d157c03e815fc4b7f3e3063b6648cf254dfa63afe6e3285b21309dbf260335c3e67991db3825e7532b158b25ccaead83f5 SHA512 46aba1c9d64a6368b326020803a2999831c1deaf31eaa1c1dfdcfa5138a7f755643294e82a08b6daab3983b31eee725bdb7b9edc4e9a558374c7d1f1b8e854a7 EBUILD automake-vanilla-1.11.6.ebuild 2653 BLAKE2B faba55f37ba49fe507d39176ca0e5309287e1a4f9f1ef99fc67430ff9304555037e7de8a212e5c1b743033f062916b46b06369bc4401179cd7b6c434722e1071 SHA512 0f9ee30bd82878882815ab513136084981178751f580d6ab7e9c91492c78a4757fa13feb3d00c4bc81df96195071887825a95514adc5bb6c5f771bf024fd553b EBUILD automake-vanilla-1.15.1.ebuild 2863 BLAKE2B bc9e597712f137ea0014e6ea820625040b4cb133fc13f5e51381534fabe9ed07758495f4056a20739773be27411a9ec614a6ac673fdd3733fdc402f50d7db3d5 SHA512 1f9a933b151fa17b76e42ca5d91696e83080fc718b44b8700853bed647c0406c222067c152acc7fe304d65ae82ca1f3e7b3fd5092a3fde084b1d9f797f0521d3 EBUILD automake-vanilla-1.16.5.ebuild 3410 BLAKE2B 714828d62555d292f1096fe4fcdb3bdc01f9b4a418555e17f10c77d461af6b19cc3cfff28f41f280ce088942948c2bc8c72dc1ed26d151e03fa01554f9d25dd6 SHA512 930947e563034b1d4285c75d4afd4d61f32b2af1820b2da9ae098f1d862caa377bbdff8a0889ce61566762ebb51472b2d0e778fe5b7b2ed45040af49c820c07f -EBUILD automake-vanilla-9999.ebuild 2947 BLAKE2B e5f143458817be3a6cca8f342990164b9457ca855861a086f37ff83d1a5da158bbe8d14a9093607e7cff7245afbe628468e810d9cbb5a7acef3ed1dc70561fdf SHA512 dc186c2ce6d126b41c3158be2841e0d77551bca3b33207a69a99d8e914a88d951b513dbe2fae93f99aa14ff72a49498880f8b2f60295ec5f26176ea5187d3732 +EBUILD automake-vanilla-1.17.ebuild 2947 BLAKE2B ecfaf45366e75d9962e44524127f063510b5f405ef8412277cfe4fc97fee2f4e53230cf88a170761cd4c2768ad62f43fd4daad8efa21a678aaf974d224328307 SHA512 6e658d82c4b16895588fb36762db5a25747b04e8454aa4f7b75e983e3061eb9bb18db9079399c3ec9856e3f72318551ae9e48b1e1e2f297fa7336f73b711e97b +EBUILD automake-vanilla-9999.ebuild 2947 BLAKE2B ecfaf45366e75d9962e44524127f063510b5f405ef8412277cfe4fc97fee2f4e53230cf88a170761cd4c2768ad62f43fd4daad8efa21a678aaf974d224328307 SHA512 6e658d82c4b16895588fb36762db5a25747b04e8454aa4f7b75e983e3061eb9bb18db9079399c3ec9856e3f72318551ae9e48b1e1e2f297fa7336f73b711e97b MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7 diff --git a/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild b/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild new file mode 100644 index 000000000000..21168cdee797 --- /dev/null +++ b/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please do not apply any patches which affect the generated output from +# `automake`, as this package is used to submit patches upstream. + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-any-r1 + +MY_PN=${PN/-vanilla} +MY_P=${MY_PN}-${PV} + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git" + inherit git-r3 +else + SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz" + + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=dev-build/automake-wrapper-11 + >=dev-build/autoconf-2.69:* + sys-devel/gnuconfig +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/gzip + sys-apps/help2man + test? ( + ${PYTHON_DEPS} + dev-util/dejagnu + sys-devel/bison + sys-devel/flex + ) +" + +pkg_setup() { + # Avoid python-any-r1_pkg_setup + : +} + +src_prepare() { + default + + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools - this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + use test && python_setup + # Also used in install. + MY_INFODIR="${EPREFIX}/usr/share/${P}/info" + econf \ + --datadir="${EPREFIX}"/usr/share/automake-vanilla-${PV} \ + --program-suffix="-vanilla" \ + --infodir="${MY_INFODIR}" +} + +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + +src_install() { + default + + #rm "${ED}"/usr/share/aclocal/README || die + #rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake}-vanilla \ + "${ED}"/usr/share/man/man1/{aclocal,automake}-vanilla.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/automake-vanilla-${PVR}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${MY_INFODIR}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-vanilla-${PV}.}" || die + done + popd >/dev/null || die + + if [[ ${PV} == 9999 ]]; then + local major="89" + local minor="999" + else + local major="$(ver_cut 1)" + local minor="$(ver_cut 2)" + fi + local idx="$((99999-(major*1000+minor)))" + newenvd - "07automake${idx}" <<-EOF + INFOPATH="${MY_INFODIR}" + EOF + + docompress "${MY_INFODIR}" +} diff --git a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild index f8bc9f1579a5..21168cdee797 100644 --- a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please do not apply any patches which affect the generated output from # `automake`, as this package is used to submit patches upstream. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 diff --git a/dev-build/automake-wrapper/Manifest b/dev-build/automake-wrapper/Manifest index cfe7c96b908b..64dfbdc516b1 100644 --- a/dev-build/automake-wrapper/Manifest +++ b/dev-build/automake-wrapper/Manifest @@ -1,4 +1,6 @@ DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7 +DIST autotools-wrappers-at-20240607.tar.gz 3648 BLAKE2B 2b63c6b71b0a1eff801d011ed0829b42944dd5fa409464644036b4b312f2fd27862fa169c8d915db7daf1fb9862d52bbf9e606b274e82dfda3395e568120e6a4 SHA512 3754c34520109e4f2d2cbf45fe24cfc788c61210864a1199c7cc208e91c400d45533fb02934c61a5662f1402ba8464a0aa4ef16de17460646c8c176ab09df0af EBUILD automake-wrapper-20221207.ebuild 1264 BLAKE2B 5dc877348c370466c07fbd28b61f1802444fa9f324877b11a6eab0d27e8e73ad85fb83261534095178382032d5b812fdb59e95ee2e328d156debed15c6e79797 SHA512 22b9381903b709b8086b1c0306d07e6e055ff3571bccee334210d6e15d8ee9ada0900efdfb047ba4cc2a04531ddeb3eacc5adaeabe8dfc5f603e84077e868fa6 -EBUILD automake-wrapper-99999999.ebuild 1272 BLAKE2B e6bb7c6257f56a45f4450bed227e6d0f59f60de9c95b7c1b3983625738dfce9cdc867c00a4076d65b8b02764ab40fdb7583a1f59f854f1e98c7b0383a5b1ed88 SHA512 b3f7981b62809a7675f55801960b336914f3037bbedb9a2a478c0cb3e9c279e43e8848e6b58118e3447193292d45787d72b52a68c0926c29729a761ae40a5752 +EBUILD automake-wrapper-20240607.ebuild 1265 BLAKE2B cd3d08cd7d8680a786f38af421412f919ca77bd72a94b6796f314f4760e99e890e6ff153c927865c0bedc954d230fc0d1a8654e3b4cc2cd003dfe72244f41d45 SHA512 b060cf022652a351d3780624733adfae49b67b040315964ed4ab7d4c140504b00136eb1def42903ab91da27f95ca13762cebeefbdfe96fb746dac0ed6ba55fb0 +EBUILD automake-wrapper-99999999.ebuild 1273 BLAKE2B c0a9c6a521eecd14bc24b72b0954f2ed49bd2fecc7bf92803c51be6b80fd05da8084bd73dcccc9304a8ee69050e65db48d500f98f4770658d8dae32b2448ee27 SHA512 e49ec2b85436e342236ae2de018c4ca08088a4f9eab4eac4c7b7cf03e2fc8d1ebf256187d9176942ab6e00c40d851f925efc2e803398e5da6a27a455672773a9 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c diff --git a/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild new file mode 100644 index 000000000000..9c1e181d17f7 --- /dev/null +++ b/dev-build/automake-wrapper/automake-wrapper-20240607.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' on new automake (major) releases! + +MY_P="autotools-wrappers-at-${PV}" + +DESCRIPTION="Wrapper for automake to manage multiple automake versions" +HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" + +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper.sh || die + fi +} + +src_install() { + exeinto /usr/$(get_libdir)/misc + doexe am-wrapper.sh + + local x= + for x in automake aclocal ; do + dosym -r /usr/$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x} + done + + keepdir /usr/share/aclocal +} diff --git a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild index ea8e3bb63674..0573bd599fbb 100644 --- a/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild +++ b/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -# Remember to modify LAST_KNOWN_AUTOAKE_VER 'upstream' on new automake (major) releases! +# Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' on new automake (major) releases! MY_P="autotools-wrappers-at-${PV}" diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest index c812db88f4a6..79d954553711 100644 --- a/dev-build/automake/Manifest +++ b/dev-build/automake/Manifest @@ -10,7 +10,11 @@ AUX automake-1.16.5-py312.patch 1102 BLAKE2B 31b63e6945e1c1b731cd27bd3108269baf0 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 +DIST automake-1.16.5.tar.xz.sig 833 BLAKE2B a79fcdce97e13ac3bf39d73e183da92703681ff80011974d95a41be20169f95414551985f7a46602fba3558e33f24d6dcb76222d99f9de4fef0d3dc59b88807e SHA512 032a7c39abb4cabbefa4eb9c15263baec0902e48c0c81364307361a41fd55be282b9640707c789f5ae572e8e60240e34d1b575a671b5710f5d2a5716fafc2d51 +DIST automake-1.17.tar.xz 1652632 BLAKE2B 53c24c138faf3d2be4e30ababcccd4d157c03e815fc4b7f3e3063b6648cf254dfa63afe6e3285b21309dbf260335c3e67991db3825e7532b158b25ccaead83f5 SHA512 46aba1c9d64a6368b326020803a2999831c1deaf31eaa1c1dfdcfa5138a7f755643294e82a08b6daab3983b31eee725bdb7b9edc4e9a558374c7d1f1b8e854a7 +DIST automake-1.17.tar.xz.sig 833 BLAKE2B 4564c7189360c61bde7e16a7c3a52b86084fb16b7f4625969fc588a6aa0da687c7b27acf7247822ec0e09e59336acf0ef69784032f255190a070081f6d9da5cc SHA512 180dde452ec097a9267c334044a9ec16bb65cc6ccbc000b7eca0af81ed7ece6f4ce6f6c2be8a2cabca9d48fd46085c81f0ee5d020967104bc25f37f52927829a EBUILD automake-1.11.6-r4.ebuild 2205 BLAKE2B aaa67917d5b192613f8ad1584f9b4beef2c69ee2433db94dbc289d5fb6791f41f2762e6f088ef4a2456e39c2448de97c61bfc5c84c247581802fc122307e2931 SHA512 697e10303e70987f1d5be84775b191e0b6e95b761a408f06c754398fc73e548a01c0f83a8d89b778499f1a9f9a36f84d0c1ca5b858c22591f95c05d279574f38 -EBUILD automake-1.16.5-r2.ebuild 3799 BLAKE2B 5df0de857161e1c32a674984f7990549a6e774c6c9b6d74733d1e43f8fa0e8d615218b12ed179ba35a8727f4449238321a092a735edea3ef64f1a9fe1d81156c SHA512 596dedc07aceff1d887e5c068f59d470c34f2ed1f06e8f6959c63df91a8b6409b111fbf6e0dbf33874a1cf68987b82feaf37abf5f7e9e249388d21d8c4a25497 -EBUILD automake-9999.ebuild 3315 BLAKE2B 6c637905a158c864885f1d5a6e3a6eac6e36dddbc2410c5e865b775c1c1ab55ceac72819290a87bafa26966f23e5a27ba3d62cba03629189f2f4ed9e28c497da SHA512 7912f410dbf56bc14897680bf287a14e42bec1a6873ed4605552d471886e294f5a1a4a7c327df5ba59c4c81c3279eaa5834bd1a7363e9db650988361ee540a4b +EBUILD automake-1.16.5-r2.ebuild 4154 BLAKE2B d662cc7d3409f1f3dd58421d4f21e5cf7cb6eae400b99846801048a21e5b12c087220be6e07a29605124be7dca68a0a0750c75b52130a0908ef1d1fe10761f7e SHA512 a6b391c76c2f759f0e25f000c062317da0314df91e6a6dea8ee828d2e1ca9a3fdd5e768b885fce21d75f37c25c2bf7a7e57aa23a8f61d3113408dc539ac1fbdc +EBUILD automake-1.17-r1.ebuild 3638 BLAKE2B 119956e7c7040160e027b317579a5121626aa2b49177ae5219d258c1981a1884984d8484d82bdb9657fa801f35a81d687b1de7dbd8c907320977bd730f8ea0ed SHA512 22cd425409c6cb38e060e27388fbcaec271b2f056a26d45d7c9008626f12e65f3d20cef98f251eca43401ee28ae17556b52e1d6f017989ef458a8c9337efcffc +EBUILD automake-9999.ebuild 3638 BLAKE2B 119956e7c7040160e027b317579a5121626aa2b49177ae5219d258c1981a1884984d8484d82bdb9657fa801f35a81d687b1de7dbd8c907320977bd730f8ea0ed SHA512 22cd425409c6cb38e060e27388fbcaec271b2f056a26d45d7c9008626f12e65f3d20cef98f251eca43401ee28ae17556b52e1d6f017989ef458a8c9337efcffc MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7 diff --git a/dev-build/automake/automake-1.16.5-r2.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild index d4553e58b66f..7fac003550a5 100644 --- a/dev-build/automake/automake-1.16.5-r2.ebuild +++ b/dev-build/automake/automake-1.16.5-r2.ebuild @@ -8,9 +8,10 @@ EAPI=7 # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit python-any-r1 +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc +inherit python-any-r1 verify-sig if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" @@ -22,6 +23,10 @@ else mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.xz + verify-sig? ( + mirror://gnu/${PN}/${P}.tar.xz.sig + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz.sig + ) " KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else @@ -61,6 +66,7 @@ BDEPEND=" sys-devel/bison sys-devel/flex ) + verify-sig? ( sec-keys/openpgp-keys-jimmeyering ) " PATCHES=( @@ -78,6 +84,11 @@ pkg_setup() { : } +src_unpack() { + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + default +} + src_prepare() { default diff --git a/dev-build/automake/automake-1.17-r1.ebuild b/dev-build/automake/automake-1.17-r1.ebuild new file mode 100644 index 000000000000..eeadb43cf475 --- /dev/null +++ b/dev-build/automake/automake-1.17-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bumping notes: +# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper +# on new automake (major) releases, as well as the dependency in RDEPEND below too. +# * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit python-any-r1 verify-sig + +MANGLED_SLOT=${PV:0:4} + +if [[ ${PV} == 9999 ]] ; then + EGIT_MIN_CLONE_TYPE=single + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc + if [[ $(ver_cut 3) -ge 90 ]] ; then + MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1)) + SRC_URI=" + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz + verify-sig? ( + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig + ) + " + else + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( + mirror://gnu/${PN}/${P}.tar.xz.sig + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${MANGLED_SLOT}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/perl-5.6 + >=dev-build/automake-wrapper-20240607 + >=dev-build/autoconf-2.69:* + sys-devel/gnuconfig +" +BDEPEND=" + app-alternatives/gzip + sys-apps/help2man + dev-build/autoconf-wrapper + dev-build/autoconf + test? ( + ${PYTHON_DEPS} + dev-util/dejagnu + sys-devel/bison + sys-devel/flex + ) + verify-sig? ( sec-keys/openpgp-keys-jimmeyering ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools - this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # bug #628912 + if ! has_version -b sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +src_configure() { + # Also used in install. + infopath="${EPREFIX}/usr/share/automake-${PV}/info" + econf --infodir="${infopath}" +} + +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + +src_install() { + default + + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi + + pushd "${D}/${infopath}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Automake pages. + ln -s "$f" "${f/./-${PV}.}" || die + done + popd >/dev/null || die + + if [[ ${PV} == 9999 ]]; then + local major="89" + local minor="999" + else + local major="$(ver_cut 1)" + if [[ $(ver_cut 3) -ge 90 ]] ; then + local minor=$(($(ver_cut 2) + 1)) + else + local minor="$(ver_cut 2)" + fi + fi + local idx="$((99999-(major*1000+minor)))" + newenvd - "06automake${idx}" <<-EOF + INFOPATH="${infopath}" + EOF + + docompress "${infopath}" +} diff --git a/dev-build/automake/automake-9999.ebuild b/dev-build/automake/automake-9999.ebuild index a5d0371f5253..eeadb43cf475 100644 --- a/dev-build/automake/automake-9999.ebuild +++ b/dev-build/automake/automake-9999.ebuild @@ -1,36 +1,42 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Bumping notes: # * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit python-any-r1 +inherit python-any-r1 verify-sig + +MANGLED_SLOT=${PV:0:4} if [[ ${PV} == 9999 ]] ; then EGIT_MIN_CLONE_TYPE=single EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else - if [[ ${PV/_beta} == ${PV} ]]; then - MY_P="${P}" - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jimmeyering.asc + if [[ $(ver_cut 3) -ge 90 ]] ; then + MANGLED_SLOT=$(ver_cut 1).$(($(ver_cut 2) + 1)) + SRC_URI=" + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz + verify-sig? ( + https://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz.sig + ) + " else - MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" - MY_P="${PN}-${MY_PV}" - - # Alpha/beta releases are not distributed on the usual mirrors. - SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( + mirror://gnu/${PN}/${P}.tar.xz.sig + ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi - - S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Used to generate Makefile.in from Makefile.am" @@ -38,13 +44,13 @@ HOMEPAGE="https://www.gnu.org/software/automake/" LICENSE="GPL-2" # Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" +SLOT="${MANGLED_SLOT}" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=dev-build/automake-wrapper-11 + >=dev-build/automake-wrapper-20240607 >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " @@ -56,12 +62,14 @@ BDEPEND=" test? ( ${PYTHON_DEPS} dev-util/dejagnu + sys-devel/bison + sys-devel/flex ) + verify-sig? ( sec-keys/openpgp-keys-jimmeyering ) " pkg_setup() { - # Avoid python-any-r1_pkg_setup - : + use test && python-any-r1_pkg_setup } src_prepare() { @@ -80,12 +88,16 @@ src_prepare() { } src_configure() { - use test && python_setup # Also used in install. infopath="${EPREFIX}/usr/share/automake-${PV}/info" econf --infodir="${infopath}" } +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + src_install() { default @@ -121,12 +133,16 @@ src_install() { local minor="999" else local major="$(ver_cut 1)" - local minor="$(ver_cut 2)" + if [[ $(ver_cut 3) -ge 90 ]] ; then + local minor=$(($(ver_cut 2) + 1)) + else + local minor="$(ver_cut 2)" + fi fi local idx="$((99999-(major*1000+minor)))" newenvd - "06automake${idx}" <<-EOF INFOPATH="${infopath}" EOF - docompress "${MY_INFODIR}" + docompress "${infopath}" } diff --git a/dev-build/b2/Manifest b/dev-build/b2/Manifest index 2a50c1107dda..987b33e544ae 100644 --- a/dev-build/b2/Manifest +++ b/dev-build/b2/Manifest @@ -4,5 +4,7 @@ AUX b2-4.9.2-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c82 AUX b2-4.9.2-no-implicit-march-flags.patch 8376 BLAKE2B 50e0b8effbb268467d90cc51df70dc4bd234789b352a279d9bb3e60161be80296f5f31f4a0d2a3d1ae2380f3079f7b950b24ef494574e25bbda48b516c6aacbb SHA512 0089a48cbe3e9e4f222e5cd1e9e12a5c4d16857b002a1c849f4cf6f8d7935c0a9b1e0f51ced51bf5346c2fdcbd214ce05e3c144c98fbf82a9842c45b59c19740 AUX site-config.jam 685 BLAKE2B b9f73808b6ca454c2220b9d296e7f131c01e6339f545b07160df5f81435926104b134e6baf5af12faf675af074d5de43952678904242f2d7853acd5268bafd2a SHA512 10fc14e622a38d64a9a8cfa78ec9302618de657c38578cf9a9815e88afd80ec7e550bd5a66d8c919bb9de93b77028bce6f382d7dd6bf118f9b2a3a607ced52b2 DIST b2-5.0.0.tar.gz 1015818 BLAKE2B 87b6f34733002479f91f658aee4f776930ae6441f33b2540b82049e18c4199280e73047afafa90dc156cc75db8b587c5bb9e2ce65d93c493775ac4107ce3201b SHA512 37403f0bd863753c5313393405dd8514a4f8d9f0839ccd397ee1856e02af6116bd238d345e5b766512441ca1c0b09883386588e270bd982eca45235eef1b01b7 +DIST b2-5.2.1.tar.gz 1189393 BLAKE2B 26ddc5fa038e899c8e08a27cd79d9b3e39f7a7b6244ea77be4dbe2dff3a7d7309936898362759197850c38789a97c27ca2bf2995ceb14e223fc7045d645328c9 SHA512 5ff2f5735cb34159acc0f8b39a45787bb46731a819658d9374971e8a87e65997249d542c44fe7c7ee197d24ef380c4f523f8c946ac43a97a6ea7a86c91538a36 EBUILD b2-5.0.0.ebuild 1968 BLAKE2B 036dd155a7aac3e1fc74db32065fddd268b2b0c2702f7501840bd5c2825e7d67e8abf11535f64327e53754772bba8ce3c320b78e3c476597ff94b79f11e8b26d SHA512 bb0c2f60fe1b88f9da735111b42546d49b1e8528d647c900426454896a6f6330f27667e0f94183954260bdfec679c7576279b00602cf4358f045cd0f11281110 +EBUILD b2-5.2.1.ebuild 1976 BLAKE2B 20bac67e698111c9eec3118e48d079da579f48d8e2cdb5b53792bb7b7afae14c70afeb49cdb016c52631fd72dfd1bb89c194051bfe5bec637af2b941830a6d68 SHA512 d39a37e4664a51a3db206a63f078e20aa2b72b82903a5c67f8114e00a1145b9d5ffb223a76c1b54016eb873b835da0ef5113373777235255d19de2a85e28967c MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf diff --git a/dev-build/b2/b2-5.2.1.ebuild b/dev-build/b2/b2-5.2.1.ebuild new file mode 100644 index 000000000000..0b95e8de55af --- /dev/null +++ b/dev-build/b2/b2-5.2.1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo flag-o-matic toolchain-funcs + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="A system for large project software construction, simple to use and powerful" +HOMEPAGE="https://www.bfgroup.xyz/b2/" +SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/src" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples" +RESTRICT="test" + +RDEPEND="!dev-util/boost-build" + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch + "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch + "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch + "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch +) + +src_configure() { + # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) + append-lfs-flags +} + +src_compile() { + cd engine || die + + # don't call windres since it leads to broken relocations + export B2_DONT_EMBED_MANIFEST=1 + + # upstream doesn't want separate flags for CPPFLAGS/LDFLAGS + # https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424 + edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \ + --cxx="$(tc-getCXX)" \ + --cxxflags="-pthread ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ + -d+2 \ + --without-python +} + +src_test() { + # Forget tests, b2 is a lost cause + : +} + +src_install() { + dobin engine/b2 + + insinto /usr/share/b2/src + doins -r "${FILESDIR}/site-config.jam" \ + build-system.jam ../example/user-config.jam \ + build contrib options tools util + + find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die + + dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt + + if use examples; then + docinto examples + dodoc -r ../example/. + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-build/bazelisk/Manifest b/dev-build/bazelisk/Manifest index 84ab6d9067cd..23b61be9972d 100644 --- a/dev-build/bazelisk/Manifest +++ b/dev-build/bazelisk/Manifest @@ -1,6 +1,4 @@ DIST bazelisk-1.19.0-deps.tar.xz 2414272 BLAKE2B d044bafa94ce8d4fd9bc6dceb76368653c5052ed579be6f6a6fd37c68c821442f86fabcebc88eff118a414bd99e0e9b49dde5321130107da9c3c3563e7cba01b SHA512 57bafd7bb370f49cf2ff90596e25be8672dc4ed4f8466f8a969b49ce6b1bc57d6aff917065ec07bb04c634efb259d8e045213acb04ba1288c6a5f2a441eb2607 -DIST bazelisk-1.19.0.tar.gz 166002 BLAKE2B 052411a9f43ce511980b0d15fc87b9abe652759aa5b90e420bb3b248f5ae287000c84fb86df21b950bfc708addb36c9b109042526fc3c88d2d6939ce3e9cfc1a SHA512 32e4401d685f46f2b6cf0a26165fedc1f2eef71bcea939f96e0c03f0bb20f666dc3c7a191df51f978b79fcba7941d6a4a5cd211d9e5a42d3b24e4704a6df890e DIST bazelisk-1.20.0.tar.gz 165942 BLAKE2B 2ff0c56bdbd9b8fe6a2fd35c0d2d733b3fa9be706875c2c466e3af22e06674ac23e92b6ee23c8c5150db449ae38f2f9ad313cd0e60a50446182b88f12333549c SHA512 05199786b007572544713653a1cdffb66e8db5edde4bbdb5c6c2e75d7436bfbb26311f1dca8ee107dd4088d8354fc81a6127977c998bdfff9bfddbd7cf7cbbb6 -EBUILD bazelisk-1.19.0-r1.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df -EBUILD bazelisk-1.20.0.ebuild 869 BLAKE2B bf3528bd3feba8f2a37b4149d0fce19dc4a2beff94a1c9c82e5cb06d802633e34f8f5a0550bd97dfadde7b20439ecb6b4dcfde0cb823a0cfe7c17e3ac66d59ae SHA512 b2687c6a568ff0c5273cf1da1e1b5eec99f4342c27df7f8252665564d261bb85692880830bd2f6ce81606a0eb79a29cc3d4e70ee92f99ddfb891ced2e433c9c7 +EBUILD bazelisk-1.20.0.ebuild 867 BLAKE2B 53bf14a72a7617995c14ce0f0998bf961a0dd98822b28f52f106fcdab23eaf4dd4cb2308f6f7690ce0fdd207653372f7fe4e27ce744828ee7363dfadf46c59eb SHA512 b0de0ecbe88224926b5dca2bc68e9ca195bf1aa0ed9209ad667d1929a0647e6adbbf0c95c098279a1b4b155cde992dd2d536f53e6ada5828a24e05cc18479f1b MISC metadata.xml 894 BLAKE2B 4346989ace750cbf341d14c28db0814020ceac6f4b9e7786e4a62b38c363cea25b2ddf500fe1c37168aff957d0d0c5ce40491f4a5e5af9ad4e000581d5ef267d SHA512 7cf7302b01589c587325fffb5a9707b532189996342c3a90fc10949409cea29881a8e476c12fa3724c5b98f7296085d4fd25a1c0976b8074f43061157430d032 diff --git a/dev-build/bazelisk/bazelisk-1.19.0-r1.ebuild b/dev-build/bazelisk/bazelisk-1.19.0-r1.ebuild deleted file mode 100644 index 9b18306d7e1b..000000000000 --- a/dev-build/bazelisk/bazelisk-1.19.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="A user-friendly launcher for Bazel written in Go" -HOMEPAGE="https://github.com/bazelbuild/bazelisk/" -SRC_URI=" - https://github.com/bazelbuild/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+bazel-symlink" - -DOCS=( CONTRIBUTING.md README.md ) - -src_compile() { - mkdir -p bin || die - - local go_ldflags="-X main.BazeliskVersion=${PV}" - local -a go_buildargs=( - -ldflags "${go_ldflags}" - -o bin - ) - ego build "${go_buildargs[@]}" -} - -src_install() { - exeinto /usr/bin - doexe "bin/${PN}" - - if use bazel-symlink ; then - dosym -r /usr/bin/bazelisk /usr/bin/bazel - fi - - einstalldocs -} diff --git a/dev-build/bazelisk/bazelisk-1.20.0.ebuild b/dev-build/bazelisk/bazelisk-1.20.0.ebuild index d201c8361161..4492ce431ba7 100644 --- a/dev-build/bazelisk/bazelisk-1.20.0.ebuild +++ b/dev-build/bazelisk/bazelisk-1.20.0.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" IUSE="+bazel-symlink" DOCS=( CONTRIBUTING.md README.md ) diff --git a/dev-build/bmake/Manifest b/dev-build/bmake/Manifest index 3cc30a2538a8..961f8a35784e 100644 --- a/dev-build/bmake/Manifest +++ b/dev-build/bmake/Manifest @@ -1,8 +1,10 @@ AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4 -DIST bmake-20230909.tar.gz 859801 BLAKE2B 02a44598edf05ebbcb31767b156563bfa10071774a3e7ae565efddc9b1ea6e684558e4ec3cfbc56d7d855cbe8663c43f43bd8d37e0a289c55ec12733e3e4916c SHA512 50622aee8024b3e0385974a8f446a4b5df0ba494b6133ab91ebbe63c408154b112f62c9df8521f4f1beaf28cdd6e7da178c3334337f6b14c8bced532029d8ba5 -DIST bmake-20240212.tar.gz 856614 BLAKE2B a5f6110e8a5c36f66e7a241aae9cab954fcfef99b2a4f0f77ea978f289f658a5e56949301619f4abe15dbf23eff8d78c7f34b1c2d4baea7875794b45de8ca03f SHA512 f6f5db408262768d551067b9f4c365fdadf7e8702b0e8eb52a86840cc28fbbd0eef023c82cadbe6a7f94794b9392e3c83902a1e18accf68af5fcf391dfeadf16 +DIST bmake-20240602.tar.gz 868526 BLAKE2B 0c5357dc0adfd8e9b977798cbb3d7d024c3149b4b7ac945bfbfdde4de091b9afafb9dd1f33c673b6e966430e154e5e799deef517022a947fb584092cee3a3bbb SHA512 0965fe8a35fc75fd22ed66800636e3912a6f8ce008794d39870847bf50b039d86cfe0b3b346831ba0b49f4d2d9d0c10f6c6b82e5c5d9387d21ed4614384367df +DIST bmake-20240711.tar.gz 873343 BLAKE2B 1102a414fe9db25a19bb8ab2c8425e553ca49cd3d01143604c127da7525ae537e66c7bc755101e89bfa3495d6784e7e4bd1986e1851cee5897c2c0d8d22f1ed1 SHA512 df1962d03dd7a577bcf92acb7a3d6b022ec0d6958242c2941345b330ec9c2951f12eb4a2ba2d652a2bd1c6913f47d5ace718f47eb0435d03a5ef3119c0332f03 +DIST bmake-20240808.tar.gz 874139 BLAKE2B 626aecfc152ca3a1c0193f8f64722f20eb653faab031751284a305233e8f808a5c7ecdc78dcdac78f0043613c5eb45fa73611a3ff786b96dbac0183192192850 SHA512 c80a5eb028da68ecd002720301f66ae9708a75a564aaf468d98c4f76416defb8e52bad2024ef3661cafb0741d5afd0146a70d01fe58735f3d5a416acff4c44c7 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b -EBUILD bmake-20230909.ebuild 1331 BLAKE2B e64a8654efd87234cb5b9f7a4855bf72ccf8fa4f54dacb0e50b90fc6b82e1bc00e9daf7f165a3a96037ca36def957d05218b32f6b0adf4987c3e551fad15decd SHA512 2f8e69919dd498f9b7f9dd0a65f08be2da9cc92f908aefdcd4518e4f0506cf4a25c505cc5d1c2200a5cbd49cf4c5068d2a40fa93d323ecaa6e85edad691b00cd -EBUILD bmake-20240212.ebuild 1332 BLAKE2B 00d3c103c7b89c91984d4f7feb649364fb7d8b6892db35d03e2daaf8d6a6621f731f464775f0611a7b9a1c115e0a338f1bd9223bbdfd8a2cb66ff25264bb0f81 SHA512 fd1d8a168f93ce617592035dbc3a5136c68baf241bb33bc20929589ca27e8a5d5884de61c8caa24432499f2f1884ea7f380da3e2ff363e0c8912c70c3997c143 +EBUILD bmake-20240602.ebuild 1330 BLAKE2B 3acb675cb2e6159194cb6d5cd69a1298ec7f5029f7f984a46188040fc998df97ab8d0d79e8f4aa5d65313484e25c68250ccdc3f042eeb778f669b3efc001c930 SHA512 6423ec961d1ceffd6a3d7cdb1f17da852895fa3014668f3b8eb6cc306fe7a9de205ecd7d87cca075db7e593e3191ce60681bb0e8c002686df5c7d08e9cac087a +EBUILD bmake-20240711.ebuild 1332 BLAKE2B 00d3c103c7b89c91984d4f7feb649364fb7d8b6892db35d03e2daaf8d6a6621f731f464775f0611a7b9a1c115e0a338f1bd9223bbdfd8a2cb66ff25264bb0f81 SHA512 fd1d8a168f93ce617592035dbc3a5136c68baf241bb33bc20929589ca27e8a5d5884de61c8caa24432499f2f1884ea7f380da3e2ff363e0c8912c70c3997c143 +EBUILD bmake-20240808.ebuild 1332 BLAKE2B 00d3c103c7b89c91984d4f7feb649364fb7d8b6892db35d03e2daaf8d6a6621f731f464775f0611a7b9a1c115e0a338f1bd9223bbdfd8a2cb66ff25264bb0f81 SHA512 fd1d8a168f93ce617592035dbc3a5136c68baf241bb33bc20929589ca27e8a5d5884de61c8caa24432499f2f1884ea7f380da3e2ff363e0c8912c70c3997c143 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5 diff --git a/dev-build/bmake/bmake-20230909.ebuild b/dev-build/bmake/bmake-20240602.ebuild index 2d2fc27388a5..1bfaee0db2d2 100644 --- a/dev-build/bmake/bmake-20230909.ebuild +++ b/dev-build/bmake/bmake-20240602.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" # Skip failing test (sandbox and csh) PATCHES=( diff --git a/dev-build/bmake/bmake-20240212.ebuild b/dev-build/bmake/bmake-20240711.ebuild index 9c749f92ff06..9c749f92ff06 100644 --- a/dev-build/bmake/bmake-20240212.ebuild +++ b/dev-build/bmake/bmake-20240711.ebuild diff --git a/dev-build/bmake/bmake-20240808.ebuild b/dev-build/bmake/bmake-20240808.ebuild new file mode 100644 index 000000000000..9c749f92ff06 --- /dev/null +++ b/dev-build/bmake/bmake-20240808.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MK_VER=20210330 + +DESCRIPTION="NetBSD's portable make" +HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html" +SRC_URI=" + http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz + http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# Skip failing test (sandbox and csh) +PATCHES=( + "${FILESDIR}"/${PN}-20210206-tests.patch +) + +src_prepare() { + default + cd "${WORKDIR}" || die + eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch +} + +src_configure() { + econf \ + --with-mksrc=../mk \ + --with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \ + --with-machine_arch=${ARCH} +} + +src_compile() { + sh make-bootstrap.sh || die "bootstrap failed" +} + +src_test() { + cd unit-tests || die + + # the 'ternary' test uses ${A} internally, which + # conflicts with Gentoo's ${A}, hence unset it for + # the tests temporarily. + env -u A MAKEFLAGS= \ + "${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + FORCE_BSD_MK=1 SYS_MK_DIR=. \ + sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \ + || die "failed to install mk files" +} diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest index 4ca7f447799d..60c92ebf95ea 100644 --- a/dev-build/cmake/Manifest +++ b/dev-build/cmake/Manifest @@ -7,22 +7,35 @@ AUX cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch 2339 BLAKE2B d9 AUX cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch 1207 BLAKE2B 4cd68da953268521965e04810e9b76a97dbc68c6c7e81cb23e0257166886787519122e425991c9bc9c9fd2d4d23a6a221206a8a3edc888adf58b1fe312cea149 SHA512 da5e897e7b8cc0973fb36ad82ac145c3cc790eadd10c1b7283decec67ede42d3ce132b1a71a3daa362941bd24208d9a3923af7331faac93ebda96df6aaf297dc AUX cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch 1600 BLAKE2B e2d381c5d81a5d8b5668eab8e1fb31f7c4d489c5900a4102983c1f573d5660c1281af5d8e1bf4d6b55839f609046e0ca6ba9781affe2a66b373833696dc45675 SHA512 c2e04ed6594892fa4a35cd67f0442184be76b5b9248e30cb6f316efccb5861c493e9151edf7ff2d40a03d18a871a612647e10c3b674cfc5dfa9859e5c149c3d3 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf -DIST cmake-3.27.0-docs.tar.xz 521348 BLAKE2B 319c84195c37b1944bb5d3fde1aeae75623fc90a734c1ba74d730cd5678bff75806f7aa8aa8171fd7878a09b3316c9c0ee23c0c055e869a4385f54987f86d801 SHA512 e9c300526f9fe4e450e921308b7af42f4b8972f2f546f7bbf2dffb4ca696793fe09f1610636b05c82b1cf74ed8ef95377bec69e15f8c9197d6960e674e0d5400 -DIST cmake-3.27.9-SHA-256.txt 1646 BLAKE2B abfef38f8994d7684a44caaa4a5efa1ac8fbe38bd8e8c98bf341cf813f77ee54bea58f7b3ab7f68b3f5d992519396fd15a1f72a1d9587f593d80b8d2f8ba36e7 SHA512 310c45281735cf9812d9d1cf22a656c5b44e596ef7032a8b7b09900ef838e74b884599b42ed2f5469946f371d431b7d4b1e44f6cd49dfb36ea49d88b187b4804 -DIST cmake-3.27.9-SHA-256.txt.asc 833 BLAKE2B 57d52fc2f3233662af13eb362ec82626c4821267f55f1313907513b61cee5b8481936da2b03c908c507b3e0919e4811e90c6cb47568420a8b2187c7942de9f1e SHA512 cad2007e356eac480b2cb93778f90152788e33be2e565b38535a2d205794054e5d67d4ed7db0765a05017aedc5f1af21556535a084014fe6c446bc13258253da -DIST cmake-3.27.9.tar.gz 10984490 BLAKE2B 66f8fb6e301ed19f993fde6c4f9e336124be6373d49b58d130ce59f4e5225cd27e02813856636b51c2521403c3a56c200ce646de5c35be2b25b5e6240c98bdb4 SHA512 56ce723b0b6d09b420a2f89ba1636cdfb1bc305bc2df91ae716f866bee07f5d702d75efbddfbaf724f47382df809107fe1e6d046314cd2f1ff07bca34ad6340a -DIST cmake-3.28.3-SHA-256.txt 1646 BLAKE2B 1ed1c47e62bc2969c72efbdf5f9dc8853e642b0cfb8d4c0423eff897d731e76407606a05cfb481849bc80cc54119b413cec715c0fde08825e8dc48e7a37c6400 SHA512 e596cf9290ebf3ffe88bc4715db9d2db4f013a5da3b0d433b71e1927e9386e06cb2d2d7f025195b183ab07c8dc263ce0b318f1ad38a43f01d646016ad60fd611 -DIST cmake-3.28.3-SHA-256.txt.asc 833 BLAKE2B 63dd7e69c7003d183e65c15391177bf84fb77b54a44807ddcccbd2b34a5e06275a7be9308cba4df75cf27974f3dbdbc9bc18cd646714a58d0a8d4bdaf6eb929d SHA512 0c987d2aa6f464a44b97a8f1ef00c6e80b5e5277b0885f34f01c17318bcd4345905e8ee06b63dc8aea367364f7c063d0cc2eab63b94a13b813bae53ad4a1b623 -DIST cmake-3.28.3.tar.gz 11067653 BLAKE2B a329c7cd80e8e74d11ec2a8b377857b1ae8c4c50a792f982803fcc6a00f531ecb7ac2dd7ccad34968b3e3efc14933085b51425974fc5ee29b6c49c2da5ceeaf4 SHA512 66e923925b764e1fe3d150c69dab3e0abd9e0c90d8e30cab63c3a1f70c3e37df0a5e3ff12b378eeae3bdc6608495f41399e6f81602e26b513b19fa19ff6c48fc +DIST cmake-3.28.0-docs.tar.xz 525776 BLAKE2B b643f76012768f0100c51f0dd146230eba25b634ab4f9abd9c739b0b257e4b1d54aa01be8d2dcd27a7b1d9822bf13eb8af16ff3c6984eeefdeb58988a164bc26 SHA512 474dc77e44240de921013219bd7cdc4aee80214fbf38d60dc2ddb53c0fda8a11c466c01bbee2abbd32b711ec7524678515e39a79a5634354a6cb38f9683e229f DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b201712f52d98ecdf8035887232fe6000675c9bab90f275ff6d44406839f04352784a921dcbc9d65c5e2440b53f52 SHA512 0fdeed277d113e4642c11b87b98305da43213bd89566e3aaaf427a11e168d9e6754632c2fd76fae542d29fddfa8b67c3c0df19f741c53fdd3aea8ce7bec73ff3 DIST cmake-3.28.5-SHA-256.txt.asc 833 BLAKE2B bde735a577b556bc30ae1a5de0df8533243c955cc5d222537b3323e7108900af2f01799a4bfa843d953b141cc76a19aed77bfba15cf4e2c3cc36a0e7e844e853 SHA512 d495afd2ce4e16f8d3ecc0b319d59c3634aae71c26110d14225f9dd628bfe173cdd94818c69c930ef5cfff3b331445e192db0082188e0822155184e3f6f80e7d DIST cmake-3.28.5.tar.gz 11076017 BLAKE2B 7da653e42fca4848362a97e80320ffcc85ced4951dfe475f48f1619a40dc674d2828a78df2ef09589868f41f1da86970074186f730e675851cd9e7c1b099ba4c SHA512 d8f1c056e94c835c2078a5e68b23a3918f0e2cc40ef9dacaf5df4f2c26106149d85364c01528fcc2d6a4b6c2182ba420d938c519fa98757a5fc375cf152c7f82 DIST cmake-3.29.3-SHA-256.txt 1646 BLAKE2B a1cb6895e9d98ac750450230adaba562a4be7134563869feb59c5a32dbea62a49273a9d163aade84c81fa410a94fcdfe2adaa653cd663972376b20a3b5436be9 SHA512 118604ac64ccd02995e6b421c256cb414637471094a72ff65d0f604cc4cc9f869f64fe1d409584925b93050373e7b69966ea91e4a9fc34b98287b0ee49eeb23c DIST cmake-3.29.3-SHA-256.txt.asc 833 BLAKE2B e4bfe4ea447441bcb7d4c46861b30da21e15ba6327c5ccbf1456ef273383b0ce8ee4a2e5a3de3312e112c26fe256e23021f4a1f89f8f96b5b39ff28398d4a51c SHA512 f2ed15c13a8fc7e05f5a8e41c3506435b4a204be37372c769577b51e30478740863eac800d32a0ef838f9b0a1125c1fe6772132ac4570e88a482109d42333fd9 DIST cmake-3.29.3.tar.gz 11247199 BLAKE2B 8d18aca8871a615a4dca8eeb380ad79fdf41a2696bfbc69141db2a2715ff52b2a17c57b195aa00f7b0643791f40991c123056ef10482e80c1f963631d8d8ea50 SHA512 930060cf484a769992ebc798d5e81984560b2cd7e163db7053181ad842656ccd0085e7e077c9c620e719d212f78283ca0db19bec5491a355d38078bbe0bac254 -EBUILD cmake-3.27.9.ebuild 9114 BLAKE2B 54f89e907b123c6a7cca316b76436b3de5cc2d2bcb533300d25c4b1ca1276b410d535b61ebf41d32734424b2522e73875e63f0d694c70153dfadda66dd77f0e4 SHA512 141d63aec061f4ba4cdddb2b4e3561dfbea948347ff9759fafcf289c65ae47dbfadfbbe86fe305fb3a8dd350ddb7ce2b1880cb88e76b79f8aa476a09643cd645 -EBUILD cmake-3.28.3.ebuild 8597 BLAKE2B 5fa0d35b797062ab9a2de27a4d4754fc9c4fe224d512b8160a8d3a80487f35043d37d79dc69063a924da08d370707a866f5fc09ed5a19cd22525f829856f7741 SHA512 632af44e6dbf364e26065b60ba49559492035f8fb02dccdeaa91e238cedd9d0e99bb68fc41c85fdf740f6ec3c5451f68f29b3f3a02231f10bee51ee5cf061c6e -EBUILD cmake-3.28.5.ebuild 8598 BLAKE2B d0723549dc43bdaefb2979c040b064c772600db4ed396c08a0df184855566604ea9fbfd9e043893752852bd38aa1c97f272ad056829e5738edaad42d728e9150 SHA512 2df1e5e1ab678ef4e6a233285ab518e4659576821d60d68dcbe8109bd61337ac85395a3c6692274c1aa8e54d55ee5a84868008c6c698d562e2a04f9dcd5d1093 -EBUILD cmake-3.29.3.ebuild 8604 BLAKE2B 5b984b7845e9ecf0862cecc826804935e0d9bc3944c4f92cc3178ed86a1fb8c760f08ef26b6c4df169816f412928fbb18e0c7867f5073fa81b178bd3fa61fdd3 SHA512 e52cb4186e14ebdd02b8c2b3f9c6e5b6b3d22589af7802e71a91d760ac19a980dc430bf77029bffed5abd30334164cb8b31b814b1a82d0476786e4d7ada8c7c2 -EBUILD cmake-9999.ebuild 8604 BLAKE2B 5b984b7845e9ecf0862cecc826804935e0d9bc3944c4f92cc3178ed86a1fb8c760f08ef26b6c4df169816f412928fbb18e0c7867f5073fa81b178bd3fa61fdd3 SHA512 e52cb4186e14ebdd02b8c2b3f9c6e5b6b3d22589af7802e71a91d760ac19a980dc430bf77029bffed5abd30334164cb8b31b814b1a82d0476786e4d7ada8c7c2 +DIST cmake-3.29.6-SHA-256.txt 1646 BLAKE2B 8d2e11fe0e7ba89e394e51920657deb793e5f45026ebb86c39748410f110568c68021099286901f05fea47bf641d583b4f3715fe315e795cc8041a1fb66d5107 SHA512 1df0e791c3f42e5f96a967b385155b1f2e5214d78df639c81d2632455748f68423ab5de580f7f3e64c06387fd25247660da4b4bda0c9881f7ca25a317b62556f +DIST cmake-3.29.6-SHA-256.txt.asc 833 BLAKE2B 25e2588375d353cc3d56480dae7aa3d2376c11cb1d830167f57544429fb0b455aeaceb121ac0fdd3f6f2b235c418bc4f52eafacc436472d9a2f3e80b97b08b18 SHA512 f01fff8b188ddd5aa7501acba3d68f3ba2a6b94d402af1afd716be66fa8f76c2d373cd6851a7fe308761171e2206c60f4f785209c86170037afcf3f416f080de +DIST cmake-3.29.6.tar.gz 11248411 BLAKE2B cfd639ce975a4a13221d1fffea97c3bf0599c9af1c8de28e340013ea918bd0fc1eff1d97ca07b2cdd9c34f790950246530ebf1282d400f658fb2d1f4f89a089c SHA512 ecb7b62d2ed133da5c03932d78cc218deddd3c5d7d1116a5ded80b07f6e5f8145928fc15a5c22265995a2b451b1e20aa4dcaa1918060d025485fe8fa7730f3ec +DIST cmake-3.29.7-SHA-256.txt 1646 BLAKE2B 8de09802b055a05fe3cddae74f3952173a63dcbfdd2aef36f31c2c362bbd942a37cd2b7dae4cb56e46501be5c0963c21f2273eba55da026887ab0d2b37039958 SHA512 21c6c186a20ec986d6e4df528f68b9946d051e63feb7f94cfe80c9a7b686b933b4bd26242c391475bf3cb52ed2a7bb02fff06fda42688fe4129f05e54945fc0d +DIST cmake-3.29.7-SHA-256.txt.asc 833 BLAKE2B 73cb2182d7b10d1e36e08494a2c97607550ddab0048f62362ecc0ec37e08967d0968982d2beb606fc099cea99dec9f1c57f0e84128cbea4b09dcf62b87156bea SHA512 783ea23764ac41a487fd58075eec529ae2b1e1ea5057d61c933245474b84e3a866715c81255ac353578bd272d2a17e54f925aa2238c516f6a4c00ba58336174b +DIST cmake-3.29.7.tar.gz 11249246 BLAKE2B ffc1c67e310632d58353c361b0f7a7c3624ab54662829e982adb1ebf3c4ab0479b6ae96d10c3d2273ea460a9836b2f0a43cd769154e2f1a30b77eb3a9f96dad3 SHA512 96e963cd2b5bccd34ed8ec3d2a7f19bd798611cd946adce8ebe142015562b20cb3bae0aa832e8ccb60bb3dc290e41218b4f3ca0361f3e11afecbccf7a182f7d2 +DIST cmake-3.30.0-SHA-256.txt 1646 BLAKE2B 9ef563e1b7a49a34bd08547483e628de469edf64889e4a82975441eba6ec77f1ae3cafec4bfcc641699f9c5a60a9998960a6a3e0fd2b955678dc3c40729248ed SHA512 7236dba187dcd5c92b5221116fe31931324ffd09f3371eb3d06b10cdcdb45c6822d95646cf4f8a44926210485f68f34c09f78cc4e3939b5f176f84aa818e82cd +DIST cmake-3.30.0-SHA-256.txt.asc 833 BLAKE2B 2c2657afba4b9d2b176d82789d634505e1eb9a1f46969a0993aadf52da34a242dc104988bc2d5d24cecbab7f32266aa22ac57c09986e20871321bbab11d2aa92 SHA512 de86b2b88c78bc5db905f0d8cbbb7f3ce736c1905375de93d68a2eea3927a02bc4d93d2f3a49c6cb5b0afbc61f6520c9cb1e8b4a33897670d16caff60aa4cdb3 +DIST cmake-3.30.0-docs.tar.xz 572276 BLAKE2B 0c258f8dd0a518bb7bf97d35a778d8e406c986e123fc8acafb174a750ad0883d346254d12e8134dd9d030faefddc13b8260e7b43e405272157ada742c75b5fc2 SHA512 9d534b0efc30829f1144fb32c4f10ba25749e238c8ceeb4399b6d1eb8421b9fb1363972a497757ef84689bb987840619cbb4333ae95fd2397eea07eebed112c1 +DIST cmake-3.30.0.tar.gz 11500060 BLAKE2B 62b3f3d5ed92f7f118991f36ba7098ff20c202dd924ecd1e7af3fedc54345c5db26ce6fa782fe1acb490857b478067c17383f0453dece579482c2e962bd9de12 SHA512 1dd872a3f93cfadb7ac0f93177e7d4d7ded67cf09c71b1b776dc3bc8b7d4e44dd81533a8a4bf2c9eaaed56443060aa27a11250a5e47de316c89db7e146929782 +DIST cmake-3.30.1-SHA-256.txt 1646 BLAKE2B 39c8a32acb873f3b2b35af543006ef4ebc976f1939f4a857e55048654c60c23ee79cde0f1c625a7388f612d5ad594fa4ddfc89e4bb6e13764ffc78ce2e70f0e4 SHA512 bf3ba7218d504c75474b048b7c8b5db3928994fa269ea3762e68a751905403f87946c3dfdfbf63836d87f5180c905ed57b0d287bec97b04ee0e81f1f420a8c5f +DIST cmake-3.30.1-SHA-256.txt.asc 833 BLAKE2B 5232626cc85bbcf0f44a9df4904ede8935c4d028b9604c9749a04b6eb2d51f648c817412b7870ae7f3e635dd88a44143568985d4ed2322d5239c5935e073a92b SHA512 b2a7b344a2d6350e55721860e7579a70c767b94b04a88b73a9fb1e9830658689561f9467d09eed87b2dce00106917543cf69ede5c7ed66a529359a1f6427dbc5 +DIST cmake-3.30.1.tar.gz 11500521 BLAKE2B 0e604ecc6b7da1c1c1baa81488a033aef6fa39cbddaaf43364193dda3e30d02a072f58a75573723e71653a2d1b34d09a7e1d0cc98280d76801d262bf54ffe77d SHA512 e3b38d309554a4239b8048434d770d3ac4533280a82c1bec65c37c9b0996cdf1753185e38deb4fb5da890ddc3d39c1d5c075e2ab0f7e0c52d61f5d556851fd20 +DIST cmake-3.30.2-SHA-256.txt 1646 BLAKE2B b36e1e099261d80bde7c57564d3030bc99b12ed3f6a70f69de16d81f6e6da567e3cfa792d010921017a02eaf238b056e7eb2cf330e6c6711aa3a4bd835732b57 SHA512 7991c834ed2e384d863793725fbe0b6195824f4e14a665ddd71348ecfa8bd03dddb46d0e9f26cc75b7d9e0a2eb90bdec01b7e79f32ff1a9cc9a8fcdd1d060de3 +DIST cmake-3.30.2-SHA-256.txt.asc 833 BLAKE2B cf99bfec2bd4cc8c828162353ceac9ebae2d7ad02c5df77873a751df7314eb56266525c755ba2f9015e043c9bb6c8218251b47744741c02fb81a80f93809ab32 SHA512 d7f07fcdd02b1846bafff4a3e08e38a2cce38131358a783097555d7934dddc82a67c3a6b84cbd8731171d82e293ff18f7e5e66d0d3bbb7d200da3904089e923d +DIST cmake-3.30.2.tar.gz 11500719 BLAKE2B 85873311000831d2a8acb2c9d7f107e7fcef9dcd56f47307bd384a26c1b63d8f15b41989944e41969d6637139d916101fe236d3fe448a76f5b18b7809570ad5d SHA512 2b4c4ebb2213e19a08b9bf5a3cf0427dd2bfc44c7d86734abf5524c311bbce7e79f76d08e4df87a1e4508fe9fa05a28333068dc3bab308ef9724a9beeb39daab +EBUILD cmake-3.28.5.ebuild 8728 BLAKE2B 82fc985ff8c7e0ec1fb5f69e5c9c6005d6fa869a397df3047a73f638aacc593cabd41268f1049f3dafdf0001204814a6349a5a52c4790cd753ff5e5dac42534b SHA512 31c34a401630dc7c6ffa04c73316db469ddae4db4b5ced5bd4fadc46ff8715898578b513668523fc4629811d13f6ecebfe5137f8699f2ed8c1917fc5e5ab422e +EBUILD cmake-3.29.3.ebuild 8569 BLAKE2B 69e20587b9e1cac49c9dd36f47c659af7bb24ebe0f1979cb3d0fec52b9beeeea23cd7ef1334d5e74bd22f2fe09ed4968489ba6bc54e1c0b539f8a2049a932b13 SHA512 58b7d7aa6783d37d077b9e92939c1ec69e314ecd8d569b1329b7ed43d4ff86cf63a21ba09db216c86f5024c2d4b3b725f58d934437d895b9ca3dbe0cbe9a64a0 +EBUILD cmake-3.29.6.ebuild 8837 BLAKE2B 33dd1c3b29de57b3d15837689b02e5ec553055893e40cd4060ed491814279c271a9ca1933b371b9208587bfcad2d263de6571181654e10a13fdfb5d140ab285e SHA512 4983005e8147c9b636036ebc3bf68cb0ccaded183aa439fb3f0030bd51add42f8b4f76d3865e62154f02e951d089f03061c2a86f89bc9668beae4a39f75825ad +EBUILD cmake-3.29.7.ebuild 8837 BLAKE2B 33dd1c3b29de57b3d15837689b02e5ec553055893e40cd4060ed491814279c271a9ca1933b371b9208587bfcad2d263de6571181654e10a13fdfb5d140ab285e SHA512 4983005e8147c9b636036ebc3bf68cb0ccaded183aa439fb3f0030bd51add42f8b4f76d3865e62154f02e951d089f03061c2a86f89bc9668beae4a39f75825ad +EBUILD cmake-3.30.0.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 +EBUILD cmake-3.30.1.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 +EBUILD cmake-3.30.2.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 +EBUILD cmake-9999.ebuild 9233 BLAKE2B b64d1e1c46336eabb80e23391533aa8b97a62c49a9a99a101cf61a1f0c0de83cdb9be0e86eda7a96012392675015dc89e56a4e81a72a9f44932dec8e90857ca7 SHA512 26cb6fe0a21a1cbe7eda849639bb1532009510c05d483f42397c70dea2b030786478fd7b94011b2744ab78cfeeda18acb4c6aa8f8de4673e01256e77d0039b88 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f diff --git a/dev-build/cmake/cmake-3.28.5.ebuild b/dev-build/cmake/cmake-3.28.5.ebuild index cdf93efc2e7c..03a085cef924 100644 --- a/dev-build/cmake/cmake-3.28.5.ebuild +++ b/dev-build/cmake/cmake-3.28.5.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=3.27.0 +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -48,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" fi @@ -179,13 +178,9 @@ src_prepare() { -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. -src_configure() { # Fix linking on Solaris [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl @@ -193,6 +188,13 @@ src_configure() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMake_ENABLE_DEBUGGER=$(usex dap) diff --git a/dev-build/cmake/cmake-3.29.3.ebuild b/dev-build/cmake/cmake-3.29.3.ebuild index 45477a10bfce..b40e1ca5c088 100644 --- a/dev-build/cmake/cmake-3.29.3.ebuild +++ b/dev-build/cmake/cmake-3.29.3.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=3.27.0 +CMAKE_DOCS_VERSION=3.28.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" diff --git a/dev-build/cmake/cmake-3.28.3.ebuild b/dev-build/cmake/cmake-3.29.6.ebuild index de04ca8f2aef..dc2e2378fa00 100644 --- a/dev-build/cmake/cmake-3.28.3.ebuild +++ b/dev-build/cmake/cmake-3.29.6.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=3.27.0 +CMAKE_DOCS_VERSION=3.28.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -21,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc" CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES_LIST=( none ) inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils + toolchain-funcs xdg-utils MY_P="${P/_/-}" @@ -48,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" fi @@ -179,13 +178,9 @@ src_prepare() { -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. -src_configure() { # Fix linking on Solaris [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl @@ -193,6 +188,13 @@ src_configure() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMake_ENABLE_DEBUGGER=$(usex dap) @@ -218,6 +220,8 @@ src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + pushd "${BUILD_DIR}" > /dev/null || die # Excluded tests: @@ -238,7 +242,9 @@ src_test() { -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ ) - virtx cmake_src_test + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test } src_install() { diff --git a/dev-build/cmake/cmake-3.27.9.ebuild b/dev-build/cmake/cmake-3.29.7.ebuild index 4ca92ca579cc..dc2e2378fa00 100644 --- a/dev-build/cmake/cmake-3.27.9.ebuild +++ b/dev-build/cmake/cmake-3.29.7.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=3.27.0 +CMAKE_DOCS_VERSION=3.28.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -20,8 +19,8 @@ CMAKE_DOCS_USEFLAG="+doc" # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs xdg-utils MY_P="${P/_/-}" @@ -48,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" fi @@ -60,7 +59,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -73,7 +72,6 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) - emacs? ( >=app-editors/emacs-23.1:* ) gui? ( !qt6? ( dev-qt/qtcore:5 @@ -106,9 +104,6 @@ PATCHES=( "${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch # Upstream fixes (can usually be removed with a version bump) - # pkgconf - # fixes https://github.com/pkgconf/pkgconf/issues/317 - "${FILESDIR}"/${PN}-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch ) cmake_src_bootstrap() { @@ -183,13 +178,9 @@ src_prepare() { -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. -src_configure() { # Fix linking on Solaris [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl @@ -197,6 +188,13 @@ src_configure() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMake_ENABLE_DEBUGGER=$(usex dap) @@ -215,11 +213,6 @@ src_configure() { cmake_src_configure } -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - src_test() { # Fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass @@ -227,6 +220,8 @@ src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + pushd "${BUILD_DIR}" > /dev/null || die # Excluded tests: @@ -247,7 +242,9 @@ src_test() { -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ ) - virtx cmake_src_test + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test } src_install() { @@ -258,11 +255,6 @@ src_install() { doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] fi - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - insinto /usr/share/vim/vimfiles/syntax doins Auxiliary/vim/syntax/cmake.vim @@ -276,8 +268,6 @@ src_install() { } pkg_postinst() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update @@ -286,8 +276,6 @@ pkg_postinst() { } pkg_postrm() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update diff --git a/dev-build/cmake/cmake-3.30.0.ebuild b/dev-build/cmake/cmake-3.30.0.ebuild new file mode 100644 index 000000000000..7957c7bb58b2 --- /dev/null +++ b/dev-build/cmake/cmake-3.30.0.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +if [[ ${PV} == 9999 ]] ; then + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" + fi +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + dap? ( dev-cpp/cppdap ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # Prefix + "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + + # Upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # Disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die + + # Disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # Disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # Don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. + + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + + cmake_src_configure +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-build/cmake/cmake-3.30.1.ebuild b/dev-build/cmake/cmake-3.30.1.ebuild new file mode 100644 index 000000000000..7957c7bb58b2 --- /dev/null +++ b/dev-build/cmake/cmake-3.30.1.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +if [[ ${PV} == 9999 ]] ; then + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" + fi +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + dap? ( dev-cpp/cppdap ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # Prefix + "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + + # Upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # Disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die + + # Disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # Disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # Don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. + + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + + cmake_src_configure +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-build/cmake/cmake-3.30.2.ebuild b/dev-build/cmake/cmake-3.30.2.ebuild new file mode 100644 index 000000000000..7957c7bb58b2 --- /dev/null +++ b/dev-build/cmake/cmake-3.30.2.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +if [[ ${PV} == 9999 ]] ; then + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" + fi +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + dap? ( dev-cpp/cppdap ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # Prefix + "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + + # Upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # Disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die + + # Disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # Disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # Don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. + + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + + cmake_src_configure +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild index 45477a10bfce..f6f904da2105 100644 --- a/dev-build/cmake/cmake-9999.ebuild +++ b/dev-build/cmake/cmake-9999.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -#CMAKE_DOCS_VERSION=$(ver_cut 1-3) -CMAKE_DOCS_VERSION=3.27.0 +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -21,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc" CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES_LIST=( none ) inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils + toolchain-funcs xdg-utils MY_P="${P/_/-}" @@ -154,6 +153,14 @@ src_prepare() { sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ -e '/cmGlobalXCodeGenerator.h/d' \ Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die # Disable isysroot usage with GCC, we've properly instructed # where things are via GCC configuration and ldwrapper @@ -179,13 +186,9 @@ src_prepare() { -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. -src_configure() { # Fix linking on Solaris [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl @@ -193,6 +196,13 @@ src_configure() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMake_ENABLE_DEBUGGER=$(usex dap) @@ -218,6 +228,8 @@ src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + pushd "${BUILD_DIR}" > /dev/null || die # Excluded tests: @@ -238,7 +250,9 @@ src_test() { -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ ) - virtx cmake_src_test + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test } src_install() { diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest index f264316033f1..602810e95bac 100644 --- a/dev-build/gn/Manifest +++ b/dev-build/gn/Manifest @@ -8,6 +8,6 @@ EBUILD gn-0.2122.ebuild 1548 BLAKE2B 3fece061ecdc971f00bf73cc1536b1d096e90027f5f EBUILD gn-0.2143.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36 EBUILD gn-0.2154.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02 EBUILD gn-0.2157.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36 -EBUILD gn-0.2165.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02 +EBUILD gn-0.2165.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36 EBUILD gn-9999.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf diff --git a/dev-build/gn/gn-0.2165.ebuild b/dev-build/gn/gn-0.2165.ebuild index 5dea03c85f58..172b7d8d4a54 100644 --- a/dev-build/gn/gn-0.2165.ebuild +++ b/dev-build/gn/gn-0.2165.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then else # The version number is derived from `git describe HEAD --abbrev=12` SRC_URI="https://deps.gentoo.zip/dev-build/gn/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" fi LICENSE="BSD" diff --git a/dev-build/gyp/Manifest b/dev-build/gyp/Manifest index 1294444d6d58..b374e9a4e5f4 100644 --- a/dev-build/gyp/Manifest +++ b/dev-build/gyp/Manifest @@ -1,4 +1,4 @@ DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee -EBUILD gyp-20200512145953.ebuild 1517 BLAKE2B 259ed354bc13caab7d58f6b66658e1e7cd11dfa036fede46e235504530d0649e58e4503d311186fa52461c5f023db0e85d105740ae1e4c855107e90d662dfb52 SHA512 abbed34097844d414a6e8eb4e4f79e3c1acb3f78fb98e79c4b29e060c061e29b67b5e317d61ca0094e764d68ed4270f6afdfae572cf10d0a3d96b6c850e30f9b -EBUILD gyp-99999999999999.ebuild 1520 BLAKE2B 3ca6a99fc6b467d0b7f3ae6d8ae2ef408a60b1293b2510444eb1c0b52f0a93f9d8b173db41a6f9ce29268af60f487a694b2af2038880f376d193e362ff957ef0 SHA512 e34e502fbbfbaf6c8c0efec36f1f2a29584d91858f38775eb1c709a7d2ae4150634da4030e9afaede71b6ab4976626fd0c6803f64ce8b951cd389bfa862a1c3d -MISC metadata.xml 383 BLAKE2B 11d9ccc1a7c12278a0087dd176b09d4ef34a9e9372b1a278e3dc19744605a424f02c38d4c311a4148e4938274780020d45f77a5497fab070e80e0e2e655516cc SHA512 c7c78ed2fbac6a1eaa4e6c9ac1bbca07e6d4584ed925d9a37b53e903ee29497e98720cb5eb94918c103288cdb61e4a586e758e6bfbf5f4ff97c8ff5ba54921de +EBUILD gyp-20200512145953.ebuild 1517 BLAKE2B 4883fd2a5834b8f1067f4dda8e5098bb6fbe7b4836b5a7dce1480211554277a420c1517c9368b52e86ae11f8d407f9c696b2a23552cc4b25219c8a4bdc772190 SHA512 95332b6b3b5cc8d727ab12d67dfb3d26836e4275ffc3be3f3f2bca6d9cbbc4ba8b03b7a8e16f8b8fbe9e1866163c2320ed862b167f26dd2ee1d0a4e73f70e2e5 +EBUILD gyp-99999999999999.ebuild 1520 BLAKE2B eb58d0943903a263a545494d627be191f7edef9c580a686eb0f2b44a471f8dfe0cd14b68b8daaa7d85e4ed70fa3ec3ddb08c748e01bf033d1ce01e325eb0956f SHA512 042df5b7ac97a0350b1f316f9a466a52864db53a3bac5d5a207419fc979aee9d26eacb7ed0c9d7bdee127cb0152100bc5fb933cd722aedc3eb0bc0e15420d30c +MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c diff --git a/dev-build/gyp/gyp-20200512145953.ebuild b/dev-build/gyp/gyp-20200512145953.ebuild index 1e3d8e400eef..2a097d13e4b8 100644 --- a/dev-build/gyp/gyp-20200512145953.ebuild +++ b/dev-build/gyp/gyp-20200512145953.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL="1" inherit distutils-r1 diff --git a/dev-build/gyp/gyp-99999999999999.ebuild b/dev-build/gyp/gyp-99999999999999.ebuild index 3ef8251ef799..d0cfc3580646 100644 --- a/dev-build/gyp/gyp-99999999999999.ebuild +++ b/dev-build/gyp/gyp-99999999999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_SINGLE_IMPL="1" inherit distutils-r1 diff --git a/dev-build/gyp/metadata.xml b/dev-build/gyp/metadata.xml index 58dbc167607e..a94766977fa6 100644 --- a/dev-build/gyp/metadata.xml +++ b/dev-build/gyp/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest index 876949c5c3d6..dbc87fa18a01 100644 --- a/dev-build/libtool/Manifest +++ b/dev-build/libtool/Manifest @@ -9,7 +9,9 @@ AUX libtool-2.4.7-grep-3.8.patch 1282 BLAKE2B b64b6eab6bed4b5595ef228c9d3bc65a8b AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609 +DIST libtool-2.5.1.tar.xz 1043544 BLAKE2B ae1e45c9d56a94980549476ed5abb7d617491360ff23ce88da9e884630280004152a9f5a96267be710930f14917bf7b00ab212acd4c65ceba1e201d2f01809e0 SHA512 ac0a6a8570ff81099585f6c3bf5a8f94851457a068b808e505422276a22638b1912a81f94e185bc2f8661b7abe2f2b2482b1af2cf42307787cbbd71d1b1612da EBUILD libtool-2.4.7-r4.ebuild 3764 BLAKE2B 50a9b74ed16d701dba58c7b0aa7f2af9d0520d5722c1be553fa1496b93279fa3ae5620092059593e6dbf1d32a9f73bdb89d3a51576ffbebc993998c2e81545d8 SHA512 3570c57b455382196b2e2c9cf1b8b50aa41a8b7cdb48a8f0bfab3c84a4205192c584581e75c484ba48b7188d3bf05f76335a93854e7b2074d20e055c9a2b4870 EBUILD libtool-2.5.0.ebuild 4405 BLAKE2B 67616a35ebcdfbeae9954b627e7d63bef185c87df10bd63a4baa2a48e3ddd84fb62e7f933adff370123a7c978662563ef7446dc563bbacb808a3c14d3c8cc29a SHA512 8f2df4646049b565f04a210da6de4a6c63ce1370e0123d184b44d45af7edc5de06b8a480aa1103565d21c56eb457201f318f8c4f09611274ca3c1f3ae313329a +EBUILD libtool-2.5.1.ebuild 4405 BLAKE2B 67616a35ebcdfbeae9954b627e7d63bef185c87df10bd63a4baa2a48e3ddd84fb62e7f933adff370123a7c978662563ef7446dc563bbacb808a3c14d3c8cc29a SHA512 8f2df4646049b565f04a210da6de4a6c63ce1370e0123d184b44d45af7edc5de06b8a480aa1103565d21c56eb457201f318f8c4f09611274ca3c1f3ae313329a EBUILD libtool-9999.ebuild 4405 BLAKE2B 67616a35ebcdfbeae9954b627e7d63bef185c87df10bd63a4baa2a48e3ddd84fb62e7f933adff370123a7c978662563ef7446dc563bbacb808a3c14d3c8cc29a SHA512 8f2df4646049b565f04a210da6de4a6c63ce1370e0123d184b44d45af7edc5de06b8a480aa1103565d21c56eb457201f318f8c4f09611274ca3c1f3ae313329a MISC metadata.xml 387 BLAKE2B 67cf835b47b93429e11c197920fa03784c03bbc55f85968bc338859054b67e037f6dcf4b12c949da802b822a97090896b520fb9cf890375f72e0aa53b13bcab1 SHA512 f61389a94f3241944037c02d6179bb962f1f4c6d9b502dc3f49147a682922e9f80033977afc0af0677afce4de9633a901e1a8fef2767e286c2ee40204b62418c diff --git a/dev-build/libtool/libtool-2.5.1.ebuild b/dev-build/libtool/libtool-2.5.1.ebuild new file mode 100644 index 000000000000..170c55f2db74 --- /dev/null +++ b/dev-build/libtool/libtool-2.5.1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-libs/libltdl. + +# bug #225559 +LIBTOOLIZE="true" +WANT_LIBTOOL="none" +inherit autotools flag-o-matic prefix multiprocessing + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git" + inherit git-r3 +elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" + +LICENSE="GPL-2" +SLOT="2" +IUSE="vanilla" + +# Pull in libltdl directly until we convert packages to the new dep. +RDEPEND=" + sys-devel/gnuconfig + >=dev-build/autoconf-2.69:* + >=dev-build/automake-1.13:* +" +DEPEND="${RDEPEND}" +[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" + +# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/ +# for package builds. The patches here are just those which are definitely fine +# for the system-wide libtool installation as well. +PATCHES=( + # bug #109105 + "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch + # bug #581314 + "${FILESDIR}"/${PN}-2.4.6-ppc64le.patch + + "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch + "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch +) + +src_prepare() { + if [[ ${PV} == *9999 ]] ; then + eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876 + ./bootstrap || die + else + PATCHES+=( + "${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876 + ) + fi + + # WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway + chmod +w build-aux/ltmain.sh || die + + if use vanilla ; then + eapply_user + return 0 + else + default + fi + + if use prefix ; then + # seems that libtool has to know about EPREFIX a little bit + # better, since it fails to find prefix paths to search libs + # from, resulting in some packages building static only, since + # libtool is fooled into thinking that libraries are unavailable + # (argh...). This could also be fixed by making the gcc wrapper + # return the correct result for -print-search-dirs (doesn't + # include prefix dirs ...). + eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch + eprefixify m4/libtool.m4 + fi + + pushd libltdl >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != *9999 ]] ; then + touch doc/*.1 || die + export HELP2MAN=true + fi +} + +src_configure() { + # the libtool script uses bash code in it and at configure time, tries + # to find a bash shell. if /bin/sh is bash, it uses that. this can + # cause problems for people who switch /bin/sh on the fly to other + # shells, so just force libtool to use /bin/bash all the time. + # Do not bother hardcoding the full path to sed. + # Just rely on $PATH. bug #574550 + export CONFIG_SHELL="${EPREFIX}"/bin/bash + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + local myeconfargs=( + # Split into dev-libs/libltdl + --disable-ltdl-install + + # Tests break otherwise (when porting to EAPI 8) + # https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html + --enable-static + ) + + [[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +src_test() { + ( + # The testsuite is sensitive to warnings, expects static + # archives to really be archives (not compiler IR), etc. + strip-flags + filter-flags -fno-semantic-interposition + filter-flags '-Wstrict-aliasing=*' '-Werror=*' + filter-lto + + emake -Onone check \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + FFLAGS="${FFLAGS}" \ + FCFLAGS="${FCFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" + ) +} + +src_install() { + default + + local x + while read -d $'\0' -r x ; do + ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die + done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) +} diff --git a/dev-build/make/Manifest b/dev-build/make/Manifest index d3e33a033f13..7814135ebfbc 100644 --- a/dev-build/make/Manifest +++ b/dev-build/make/Manifest @@ -1,6 +1,7 @@ AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b755cd988054464275c5ae255a9c77a507d9772f2124614569a858c820c533a46d859e11813591a6cdea636d74f2a SHA512 f569ebd924d64c95e0d3d7c61daaedb7780cccded83bd73036d56f1ef658497056f95a65c463fe347b14b1d12205507173eaab8cb74205cbcf32bf1a25531f9d -DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c -DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09 -EBUILD make-4.4.1-r1.ebuild 1917 BLAKE2B acd3052b39e8bc3825a547ee0d86ba28213b7db09ba9fb1a417bae859a7b98926c167c095f31e1dc4311a3bd65969d1bf4b6c5c6a4186344fdf9d4d3b7e168d0 SHA512 be34b10a3846d784094cc45f70badedff0a3ca2b6c0fdc5f7d7f9e900fbf2f428a720ee12fd99a9c2c39a422ea581269fd29b0757ab91869b49ac294cb43dce5 -EBUILD make-9999.ebuild 1925 BLAKE2B b39815967636af9db127007d80d3389c60afd144e0f47b258a4fa322f5b6d7d1adabb5c70ebaa48d6715906bcda31f4c7816f2f870471cb424592be4dfa552c1 SHA512 c111610e79e6d5ebfcd3c3f9cdb20f8eeb36586c0d25929057b1032319dab0c9f6f03f2a844b81b945d22bcb45ded0146fd77748aa4991189e2906d752522681 +DIST make-4.4.1.tar.lz 1305648 BLAKE2B b0c62a85a99b15e38ee9e08c38be9b1c4c6d81a01bc8ea94f83e7f1a93968b9c8c8b69c92bb4112646a58e38bb9d2effdd461fb2a82b1360681351e07c123a26 SHA512 591e9fab2f807bfda908f3376fdbf304c3377a6b15d13f3029456722972e361d205b692855de8ddbce64ff3f404873cbfb65f4097ca4a3b81029dc83bafcc67c +DIST make-4.4.1.tar.lz.sig 833 BLAKE2B f72d2afaec6f21f4c731a42408200c05ed56532cbee16c1f1a4db2f1d641d27fb3c41ff2becd717e94ded7d079e683ff320c795e5073a95aed731d99666173cd SHA512 a6e4d3ef63456031c357277f0867652776afd0bd801c3be67a3f81b03103dddc5c6471ce50a89a4fd379a535163f22758cadab25a5c2192a2332124bcbbe8d74 +EBUILD make-4.4.1-r1.ebuild 2033 BLAKE2B 26979ee38e1bd46df45e9e893b7bfe7e2b173634ceba558aed0a0a6f9624bd3012fa45267244eb1affc169f984fa29e365cd998a8999a5cb2361cd1c673b9d2a SHA512 289ed7c2c8de634e4de2bae5f79b415df0904e63738eda3053b3c503406a04df187ebdf3c63b2d92b9ac92ec5222a1a7dd4dde92f50205f15a27f68696503bb1 +EBUILD make-4.4.1-r100.ebuild 2253 BLAKE2B 792f2d493da8421fab65b39a52a78a5ac887ab3a061bdad537a48c4a42196777d2818f34c9a8f20b2e8432a92fc4c998685f4557608b6867c9f1ab776839b9e4 SHA512 f5fb6988e7932448b6956e8c2db70f91014d41fd0d5610a207cc88ed6c6aed4f60662d337b9d54f714798df05c945c71f4b89b0de126ba5fd7e5a85f19db33c0 +EBUILD make-9999.ebuild 2231 BLAKE2B 3a3c23ac5054dcfaf8aa07975c7c269f4c0485d40765f2c7588df5c76a23df31160622c8604ed6ca5a87241268c22c29db9ea187b1f13d8fd42e8e606a8c6de2 SHA512 55f8da0113bdfa5a17f7fef2da503af2ba6236f377f2cfa569b1a089ff5fb27fe087c073c6dae71788c87ab78fbea5de83bda33e2b20b66a5cc3493203a024fb MISC metadata.xml 381 BLAKE2B 867fd4a045ef622ccb62c72b7198e205293501d075ec0dca7daf702bacbe2df21ea23aadb4150e42fdc0914a95cab0f48d439c1f7073acf2302bdaf48fa18688 SHA512 66494f08f599035728fa7f87b3f7ca093e3c50dbb694aed8214d1dbbb3d1e03441e6e159b1453709fa8c7da8cc8d73ab2c972517a3506b1fb671533d459c4418 diff --git a/dev-build/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild index 2e65b08c27e4..aa47d6e80b6c 100644 --- a/dev-build/make/make-4.4.1-r1.ebuild +++ b/dev-build/make/make-4.4.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc -inherit flag-o-matic verify-sig +inherit flag-o-matic unpacker verify-sig DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html" @@ -12,11 +12,11 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" inherit autotools git-r3 elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.lz.sig )" else - SRC_URI="mirror://gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + SRC_URI="mirror://gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi @@ -31,6 +31,7 @@ RDEPEND=" nls? ( virtual/libintl ) " BDEPEND=" + $(unpacker_src_uri_depends) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) @@ -50,7 +51,8 @@ src_unpack() { cd "${S}" || die ./bootstrap || die else - verify-sig_src_unpack + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig} + unpacker ${P}.tar.lz fi } diff --git a/dev-build/make/make-4.4.1-r100.ebuild b/dev-build/make/make-4.4.1-r100.ebuild new file mode 100644 index 000000000000..a1793d14fe37 --- /dev/null +++ b/dev-build/make/make-4.4.1-r100.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc +GUILE_COMPAT=( 2-2 3-0 ) +inherit flag-o-matic unpacker verify-sig guile-single + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.lz.sig )" +else + SRC_URI="mirror://gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="doc guile nls static test" +RESTRICT="!test? ( test )" +REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )" + +DEPEND=" + guile? ( ${GUILE_DEPS} ) +" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) +" +BDEPEND=" + $(unpacker_src_uri_depends) + doc? ( virtual/texi2dvi ) + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make ) + test? ( dev-lang/perl ) +" + +DOCS="AUTHORS NEWS README*" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4-default-cxx.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig} + unpacker ${P}.tar.lz + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi + + if use guile; then + guile_bump_sources + fi +} + +pkg_setup() { + if use guile; then + guile-single_pkg_setup + fi +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --program-prefix=g + $(use_with guile) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake all $(usev doc 'pdf html') +} + +src_install() { + use doc && HTML_DOCS=( doc/make.html/. ) DOCS="$DOCS doc/make.pdf" + default + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 + guile_unstrip_ccache +} diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild index 146e017cec5b..0a9275fbe6af 100644 --- a/dev-build/make/make-9999.ebuild +++ b/dev-build/make/make-9999.ebuild @@ -4,7 +4,8 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc -inherit flag-o-matic verify-sig +GUILE_COMPAT=( 2-2 3-0 ) +inherit flag-o-matic unpacker verify-sig guile-single DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html" @@ -12,11 +13,11 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" inherit autotools git-r3 elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.lz.sig )" else - SRC_URI="mirror://gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + SRC_URI="mirror://gnu/make/${P}.tar.lz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.lz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi @@ -24,13 +25,17 @@ LICENSE="GPL-3+" SLOT="0" IUSE="doc guile nls static test" RESTRICT="!test? ( test )" +REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} )" -DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +DEPEND=" + guile? ( ${GUILE_DEPS} ) +" RDEPEND=" ${DEPEND} nls? ( virtual/libintl ) " BDEPEND=" + $(unpacker_src_uri_depends) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-make ) @@ -50,7 +55,8 @@ src_unpack() { cd "${S}" || die ./bootstrap || die else - verify-sig_src_unpack + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig} + unpacker ${P}.tar.lz fi } @@ -60,6 +66,16 @@ src_prepare() { if [[ ${PV} == 9999 ]] ; then eautoreconf fi + + if use guile; then + guile_bump_sources + fi +} + +pkg_setup() { + if use guile; then + guile-single_pkg_setup + fi } src_configure() { diff --git a/dev-build/melange/Manifest b/dev-build/melange/Manifest index 8e4b1123819f..f8a44c27390b 100644 --- a/dev-build/melange/Manifest +++ b/dev-build/melange/Manifest @@ -1,4 +1,4 @@ -DIST melange-0.6.11-deps.tar.zst 308919689 BLAKE2B e9ef8d0ff221721d09c0679eea4ed50cb22eab905bd4c064914f4e6307d1be6e27f32855d562fb59d78df470238d3981083a716ca5cf45e638432900014ea86c SHA512 6d45e266b9dc1a84ebfee75ec7e4fb58d0eed08c77ef8974ac69af034b88d5d6579cbaf39939d13979a59e32ff87f894506e8caa5612f09f58743ac57c891a5f -DIST melange-0.6.11.tar.gz 1129391 BLAKE2B 997e3592f43944cccd08a6ed4ab77d46cec12bd4fb86268f1eaf7e38bc25d583ac7e99677b0885e9527ba367bcbbdb6bdca01ad6447d3834ff2d835efab955f6 SHA512 debfa29653f91d94670d7f73dd05f78bbbef8fa45a248d327fd9dc0c56e85ef1fb8434e326af0fa75334fc51b1c991171541d10d72a8f15bc127c8cc3d293fa4 -EBUILD melange-0.6.11.ebuild 1251 BLAKE2B 35c2ddb4c9859ccfe23366b227faffe6445d1845ec5eb75202fb22e796a86e50aa0f8f6222bd534143552d14b60c7d6332a38330ac47ca1d11bba380a5c42c76 SHA512 86bb9d8f0b2d85f5e7730f0ce247f15137395a5ac4d09b7d3c603c5488a2bf8f0884bf04e10c55eb15e78b58b85279bd773387428062429382a120761a6885d0 +DIST melange-0.8.1-deps.tar.xz 239749504 BLAKE2B feb4958b1c01226cefece8e746e8e83e5507bc7cc1feae8be0837971357993645fafffab505a249c96f01079a36cc5bd735d79a459fd81ebb88efb3cf3f85ffb SHA512 6df1448ad16995f31349a4a5c77d459501b99ec590483fab38ed08fd8aa6a425ef68ddddb5ddd8ff261ca37e2e41e40b63243806bd8d9d934d1bbded4cc0b35d +DIST melange-0.8.1.tar.gz 1139855 BLAKE2B 46b18ddbff4044712db6df2c3d8195bc1cb714d686f0af4f3ad92907942e14296e01dad2b9a70bc9870ac727463faea779eb9d40b78923f93d7c1d653f85cd64 SHA512 55d4f94197b9b772daf629c6c24969ddb306e67ac4c0f07017e7d5a466863129ec984a8291c6fb33aded706f4deaa5c5432e1de81e67527ec8ce0f4e070a3218 +EBUILD melange-0.8.1.ebuild 1179 BLAKE2B 1b8f25fa975ebebb0314c043d01f25e7dfc925ad1d6062b692cb2a8b28c2331bc8a50a4f7f032afe30b2a26a7722eb0910eb5a2bb6961cfd26db03973488a21c SHA512 53f4a2d81e03b43006f1b1fd31e32ebc0e4c2ef39a279c055bfaf15582f0917e081a067198ab1aa65f63c7f96e079366332064ada9dc48d21d12b82fb3d84c0d MISC metadata.xml 803 BLAKE2B e13fe69a39f3d28d077a26d1cb6ae0b55070de6c0ac907efc7516cacc3b9f3a5296b4a210e81701e1ade002d3cb60b921b16d21718429c2563211bb75687b7bf SHA512 c77b32a1f7b99b6acbc7e3a155a3d1e169258ba55c44939fc38efba5edbd5aeb871200a24d2f1e2e5e709bcf8795a7de40ff9b3015321252f2bc61f938ec0424 diff --git a/dev-build/melange/melange-0.6.11.ebuild b/dev-build/melange/melange-0.8.1.ebuild index 6e3d018a1c2f..9f156703c547 100644 --- a/dev-build/melange/melange-0.6.11.ebuild +++ b/dev-build/melange/melange-0.8.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/chainguard-dev/melange/" SRC_URI=" https://github.com/chainguard-dev/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.zst + https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz " LICENSE="Apache-2.0" @@ -26,12 +26,6 @@ pkg_setup() { check-reqs_pkg_setup } -src_unpack() { - unpacker "${P}-deps.tar.zst" - - go-module_src_unpack -} - src_compile() { local -a -r go_buildopts=( -o ./ diff --git a/dev-build/meson-format-array/Manifest b/dev-build/meson-format-array/Manifest index 9d4e02acacba..87909af9b611 100644 --- a/dev-build/meson-format-array/Manifest +++ b/dev-build/meson-format-array/Manifest @@ -1,3 +1,3 @@ -AUX meson-format-array 642 BLAKE2B 5daa5807f11f35c96d9451e5c6b7198950b4edf24119fa606620f00133075a6a830c98a05f1d3d2c7a5fac1f15107c571d6e8750a5790e3ab945cf8a07d2f51f SHA512 54c173f286cd0b98d6b69633d45b4d57dae26c561dd8c3f3bb2e6690773422c925e5f1d510d0a00f7723136b3f1ab51c5738d4bf207dcaad4d35ae6b8409cf8c -EBUILD meson-format-array-0.ebuild 640 BLAKE2B 3ef282d5ff2b5fb575d8d9d6d2946c4715377b0bd1ba2bf9332d1f81a69a62f6dabda3c05a200d866b9f1b5386a2440801f9e08becdbbcbbe40edc8d216eaa14 SHA512 c472a83cc2b27d3a0cfa349f9536a28542489bc5d2ae02a47e9f09ec11056d37e867f584b8340e94797d130e33a8c5645dea1f470f29098afec505268b88d9d3 +AUX meson-format-array.py 980 BLAKE2B fb80a4a2675909c66135befe008f3a5809a07ffb9cf1d2262f1d8b520607f038505d377e2c081dc91bd1832693d3476a77f60716a3d0cb23596fc8443baa4043 SHA512 30fff80a4351600f33e046ff69c5d95d00bac44b2b06ca0d6ac29bd13f71be60d357da0dac0fcd26c74accb42a80cb573527e1eab3f3cff1edbae275c069f0a1 +EBUILD meson-format-array-0.ebuild 803 BLAKE2B 62b07f389ef74fd0703ba5b976ade9a6befb290d48f8b13ac9658cea85064ceb0fc6544c11ccfa4979b4050fe95b60db99b51bea125f8bb7d11b87dd39ef6768 SHA512 743db3b47f8175c3a5055f9016216c6553f1f17f631c82136c550b84ca87d37092c79b2353bd7e3146ecf234ae86b2a227f2da66ca92c95fa5218953546aeaf9 MISC metadata.xml 271 BLAKE2B a2279fc595f4360379e0df7685e0e2d2f14c0b06ecfc3cada635d7d993af586c3fecf94d36534208266b9f8cbe3111d1d88c5cbad3618a62694ba367eeab5369 SHA512 5d347bfa3c17b76d8f226a33620534d142c58006734529b3345791a51966b87c92a578b70cab1104caec353dfcbd6838a309d608783fea37ab36660533f62142 diff --git a/dev-build/meson-format-array/files/meson-format-array b/dev-build/meson-format-array/files/meson-format-array.py index d2bf49ba8e59..84a490cf29eb 100644 --- a/dev-build/meson-format-array/files/meson-format-array +++ b/dev-build/meson-format-array/files/meson-format-array.py @@ -6,10 +6,22 @@ import itertools import shlex import sys + def quote(s): + """ Surround a value with quotes, escape embedded quotes. + >>> quote("foo'bar") + "'foo\\\\'bar'" + """ + return "'" + s.replace("\\", "\\\\").replace("'", "\\'") + "'" -def main(args): + +def format_array(args): + """ Format shell-compatible expressions as a meson array. + >>> format_array(['-O2 -pipe -DFOO="bar baz"']) + "['-O2', '-pipe', '-DFOO=bar baz']" + """ + # Split each argument according to shell rules args = (shlex.split(x) for x in args) @@ -20,7 +32,12 @@ def main(args): args = (quote(x) for x in args) # Format the result - print("[" + ", ".join(args) + "]") + return "[" + ", ".join(args) + "]" + + +def main(args): + print(format_array(args)) + if __name__ == "__main__": main(sys.argv[1:]) diff --git a/dev-build/meson-format-array/meson-format-array-0.ebuild b/dev-build/meson-format-array/meson-format-array-0.ebuild index e9b3d6f92bc7..d278f439afb0 100644 --- a/dev-build/meson-format-array/meson-format-array-0.ebuild +++ b/dev-build/meson-format-array/meson-format-array-0.ebuild @@ -2,12 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit python-r1 +inherit edo python-r1 DESCRIPTION="Format shell expressions into a meson array" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" @@ -15,8 +16,14 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" -S="${WORKDIR}" + +src_test() { + run_doctest() { + edo ${EPYTHON} -B -m doctest "${FILESDIR}/meson-format-array.py" + } + python_foreach_impl run_doctest +} src_install() { - python_foreach_impl python_doscript "${FILESDIR}"/meson-format-array + python_foreach_impl python_newscript "${FILESDIR}"/meson-format-array.py meson-format-array } diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest index 27b5e6833967..974d36fce6ce 100644 --- a/dev-build/meson/Manifest +++ b/dev-build/meson/Manifest @@ -1,35 +1,26 @@ -AUX 0001-Only-convert-boolean-values-for-cmake-formats.patch 1094 BLAKE2B 3c65ba28fab604a1c63e195650a88a9ae7539a04d373e46d48fb742f372efdcebcb68977a669e7d6ceacec98db02c21b6daec45c1fea569c9cec29728ef83e6f SHA512 b6e4ee780969f858f5bd8a92998b012988df5aa6deba4666108dbed8bc77012c224499a3b09ce5278e67c41f7eaabe2cfa1452ece8877509f05241a3d5e2d7c2 -AUX 0001-Revert-clike-Deduplicate-rpath-linker-flags.patch 2283 BLAKE2B e90a39bcfbdb5695eafce58d4e2a458d61377228a8b37352862fee7e15c14137ea508d325e76eff8ca65bbba13c5d1fdbb5d51064299d8652394d79a34b85560 SHA512 095a9fd8960616a12aa1bbc3a89ff2792eb18c5c7e9b482e50fe2d39d825d073128aa77d56745ac98cefbb8de72d8f125972503ef3377bd743a6b296308951e7 AUX 0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch 12301 BLAKE2B 44875bf6aa6e18de99e9c7202cd931f95a43dc29dac69a83cfa1cefbdf5442bc292920bd46b2479e39f150a534afe9f8db72022eb029c344b4c3e5f59a7274a6 SHA512 f106bf93bdedb82d079061715178bb0cbdf333113555ca0f61da0d0112ca6eff08135585d7e442d16a85b65232ff501a33e5ad208d230ea6d9fa10b30271f247 -AUX 1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch 1547 BLAKE2B 4a61642466aa4ed4eee39fce2e796832b8325938f8ca15ea86a5d4f255dbe65be837ccbcf82ebb1a766d0ff5e7d8a69e93b7676f3af421bbc6907fec0e6ca231 SHA512 efdd2b0cb9fac0188b5c21cb3f98152d488c5299820a055031f2f75598bc0a8811988511091dfc7f99440b48defdf7e80a783cb7c374ccbba2a1e4d20a9065e3 -AUX 1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch 2799 BLAKE2B 1806655c247c4f009b41062e5ae5c90cb7ea3150c311bbdbc768e37a1d6e4a4599568584c1cd00a06315159422150ea953cda2325e97aae761bf6c7fb8b4b89e SHA512 3654092cd93f54af7ec7ea89f396c0e947d00b6a626037b827be589926502f37ecf3795c01d514b97a9990d95c6b5050f1304ba1de2ae867a86b3ca73a163893 -AUX 1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch 1295 BLAKE2B 5422ac19ec0e44e2f773851895e0fee95d71a8c2c76b904779af04d36f1e59b457f7378a2898496b24873be2262cb24a17216d1d3bbd13ced864b55047ca16e6 SHA512 5c2e389dc313fb0ac7d2a717eeda602839c610120e1251b110201e75fdd2b1e65a1870229fb327c5947ccb5ebc9f6165bb301ab6c20468943ba91dc5e6a6b36c -AUX 1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch 3030 BLAKE2B f0e8e914799e2cc1ddd76ba70acbbaf3d6de113a8259c2910cd2fd2fe73d2c4f003314bffffd1db3ccb6338faa9a932bed43fa26b60b48d6dde89d6bbd3e2111 SHA512 97ebb84f2b76a0b08b1fafd4e7e537960d3f2c547eb03389b83f35f27f82135ae3fdba0002ae9871c0ca0b90afbea42ebb7e3a4947500d51af74536aa7acaa7e -AUX 1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch 1313 BLAKE2B d1555c748afcc9a77252ce72e3fe95311584f8c33802a203cbe3b5777bda03a282afcf24a45cb8ec977a99bbcdad4538a124443f8ff837a2f47d3ee6da31a5c3 SHA512 3f25299c21ab967d860a3845a75d77fc032ee5b63ce6de14cec5fb21dbc826f27923409a02d685d73a9b04ac6ab74b1b92caab7f064087bc809fc93de9609a5e -AUX 1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch 1092 BLAKE2B 21fd1a0edec2de670d58eab734bf5d86159c73df3016baa7c2c863a5a65b312129aaa90b26e9c64943fba5798ab87090076426f1feb4e67b590a4ed66fca8b6d SHA512 f0f56ce827ced24135d1b571cc0e28a26a21826f3a964ec59fecc16495d9fe69d7f104e53ab05c8555e6d4fc249f4c5c09e9404784aff65a0015c8ea863a74a4 -AUX 1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch 4822 BLAKE2B 4746bbb6ddc587df50f1fdff039115aab0715dac5413af495fc4ccf0dc98f4d87e5eb79349ad9b26a365794ea0532f8fdd5bdb3a13257417038f7127a64c3b0b SHA512 03394dab9ca6e777cc7d41cc339da6857bf7728b8c503522948a3c67c257353063159f2bf12d652ace90761d8bae3edeaac5b1c6b125ff4781b6a99fe1a75d79 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61 AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08 -AUX meson-1.3.1-xtools-support.patch 1783 BLAKE2B 8feb8af8c26d4c9b250e2784398f108933140a3a9ec32f281c4d8d0569da2061e0ba7af8826d45695e00e544170131442c0ea900186a99be3e292334aa916b7a SHA512 35ce809d56446fa34e45e18b4d0ac8253d103840aa1820cdff8b5d7959714220b034c2db0654a2d49e622421686d2d27a7e5a7b81faee69f9a6818f056f7eb8f DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073 SHA512 004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8 SHA512 cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780 SHA512 852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9 -DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5 SHA512 fbcbdd9551ad12b7be84411b96357e01c7c0c38a8e9933093d2e71ed7e12bd4278245798684d389c332eb75dd50c99310affc9acb01cf8bedd45265335083a32 -DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25 SHA512 8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba -DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a SHA512 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba -DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873 DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3 -DIST meson-1.4.0.tar.gz 2224663 BLAKE2B 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 SHA512 2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd -DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B 6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62 SHA512 ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad -DIST meson-reference-1.4.0.3 339324 BLAKE2B 8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925 SHA512 8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768 +DIST meson-1.4.1.tar.gz 2235558 BLAKE2B 1eb83ad34d9e0a80eaf667a5edf04cf40ff043c0b9e8c78c5bd553eb2dae372b4c0dc8e30760da0321b7c33d331304c21c7f51d2133681c9fa66d551039952f3 SHA512 2616bcca70d5554407d4852aa3494e05e53aa8a33f58859ada42750221922fcb6ea7f3452844883f4800d77eed4a7289b061324871218f052219b3caa02dcc9e +DIST meson-1.4.1.tar.gz.asc 833 BLAKE2B cbdac6620111acbb8c1e07a017a9f5f1cea2cfee62dc7ebf77a9dba7a578e43f8706923e4054ae8458c27a43112c634811c1a0d698f693f2e40744288ce586ea SHA512 bfc4f52a5e21684012aeef95dafba74a6d730efe88bc81bc410c183c253605f119dacd9684c3742ce1d3abf798a4443172526e535523531443beb0ca8c1c3633 +DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0 +DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093 +DIST meson-1.5.1.tar.gz 2257106 BLAKE2B 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95 SHA512 3239d6f3d64dcedddd456dc451278a37aa6c4460708b0efdff1b04b6e8844c20f5f882060de311c59a678bebd51ee09e1906c9384d4b0c85b28015fd1713ab0a +DIST meson-1.5.1.tar.gz.asc 833 BLAKE2B c099720b102b8fff581f2043000454f5cb3593352a8b69c681cda73dae7172fb7d892dc0500e29fffe4ba7828cdcba418acea230563dc26a7a89139ab526b231 SHA512 f8210dd309a104b4169bc2eae9ff370f3ced6fe2c5dfc8f3477c9fbbed983dd6636ea05822d9345d7570e88bfe7789c6cc075e5a91d578a8376666d16ad550a3 +DIST meson-reference-1.4.1.3 339324 BLAKE2B a0ea6a1dd599c0a559dae64772f730ac7cad7df3ea63acc8355ff933152873567803efff012e6ea0a4c75ef9c8be023a8d927411a49e43de20bbfc69b1263488 SHA512 fc94aa95df3cd04af49ab2f27050c3ef206407a2ccb3b61d9c8660deba55eae3fb627d83713de62f3e1216a1a33a88e989bf5b557b7e17adbb73a57d5f2ad11a +DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca +DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3 EBUILD meson-1.1.1.ebuild 3287 BLAKE2B d449d5e7511b47baf4d26aae0359183d4ef9ea21bf163d5af5fbe6cc78c44bd9788d5c807486f106be3a8abfb07cc1d34782616cffed333e94dd4225f6650056 SHA512 9fca53429ebd722f91084a4796bc1c466216b2021cb6b88e76cdaa559fefa17651d76e744e32c3126b2bad5b4ca36f5b17d402cec57a764340406610e7c97dae EBUILD meson-1.2.3.ebuild 3285 BLAKE2B f937d7add71afbfb05e1ce2f7a07c9077a76b8018d6cc3e7e5ebc029419aa45e57cb98f0b05e7236500bfdcee35a35ddbedad9c3c00133817c4b0867cea71730 SHA512 e8415edf199ad281e253331e72e7ed4e2398c658d006b54a7a89b24b9e2ce3950fb6d750c8a6b728849e973af7e576e9d95b7510d3aa27a320fc38614ec439bc -EBUILD meson-1.3.0-r2.ebuild 3565 BLAKE2B 45aebd9f7f4978385d339588d5177418e3fc6e77878b3b5f095e95d30b0b237e5481f94225c651043888ab4af27510315de5f747eec45566e9b018dd5f2e9c22 SHA512 89646f67dbc7182a5808664125bc6d370b280f298fe3359a8837ebda3320b2e244adfbe39742c530da0a342f74aed5d3ba1d9b476440f393fd09a4af2babff85 -EBUILD meson-1.3.1-r1.ebuild 3706 BLAKE2B b7ba27a07e480500a8876d56286a4be4fc734011f253deb05465147e3babc99d81b70a54c0918c8db79179327eb92bd7e16a7758552ed92a42e53de29500cebc SHA512 e065666d6a70bdcc83040911cc6dcc8c4fd0e994509356a1cff13d6a64f2165e5e5a5b16c27361537a0c7b8eb7381cf19a9a6ad50551ff4b42702744ce6c971e EBUILD meson-1.3.2.ebuild 3417 BLAKE2B 167f9f98a9cdde3e2629144c25e8a1fea8ad2446618879968cbf9d8544f8bd2c1c1ff9c9741d3c526204a36f5e62b63004a0644a20624ab1fb0258edbf01454e SHA512 a123f1501259fec57b2b0e286d34db993eb52d4d13c8fcbc2d9ad7824f47517b7d6d255c952a985f9830a17a7e04a2da95e0bd9e779b9ff065adc044d5efd90e -EBUILD meson-1.4.0-r1.ebuild 4587 BLAKE2B 22fdaf1715940df969cba34097ee765430d859b8024173ad04e58ea16dda3dd0549146e024a64b0ad0f2da325695bba81485b404e354d7d11baf5136317936be SHA512 2405c329971cd7b00fa46a4c9aa37b6e6438d4123d662635fd2cad940bbcdc45e48a36e30305f10d4291a2fbe6c26a64751635bd049622e093c527b5502f4b46 -EBUILD meson-1.4.0.ebuild 3451 BLAKE2B f7b685c9f0c03b9f0205a8be9e14827bcc54f7bef8131607001711b3b70419d9b88ef0f3d27c14d9a503e5e2cd3c7763f00c0061393a1e53ace5a09f779b9ddc SHA512 3b9609b4eb8ed93ba48bed4d9916ce082a318484b6a9dface0c200c79896b7001b5c4e35dce5cd56ef8dbb66c24b0e9e943e0c169c9142be249595ee83126126 -EBUILD meson-9999.ebuild 4595 BLAKE2B abe593815de1d0fa35a06facd8df69d24983a8d9fe4207263af43d0fa7e75151ec9df9e7aecde9edea9f0aaad1424a50cb9523454ef080617d3a74d6cd256ab1 SHA512 425b89d45403130d53c9ebb8bab3790af79012a2e3d992463c8b706bbde139ec7ab6c95fe6382a791ce1e1f9f2b86fc25b9db256710857f7d88f834dd81b0966 -MISC metadata.xml 472 BLAKE2B 559073667cf007cd507f379014c8d0d494908742f606ca5eeb2a0cef3b5a8cb63cea4e9aa33b228163211dff8f794d178cbcd6c91bb283f894e6b072db28bacc SHA512 9232fe05900dca57d21f41023255c9a6fba57b213737ac8842ea180681488d9a2a306c8fbeba66cf02204f4523192e64af745aa65db946beac723cfe271e4fd5 +EBUILD meson-1.4.1.ebuild 4927 BLAKE2B fe6c5c98c98ef42cb226638ee24bdc5c0de5070c263407ccc59ef31166c96fda42b64e45701081dbfdf769ab86a31fb6085d40b8326ebf1fa6024b350d6a5054 SHA512 ddf3e4aa09c7134b0daf49e2a466cd627845bd1e9a34b3740bf790392314350d38b543cdfc976917096f5b4426448f44f4c7c33afa09738629d7d61701ddfac1 +EBUILD meson-1.4.2.ebuild 5086 BLAKE2B 5b07a3c16a920a4aae4dcf1510881ae63d0afb68c3fe491627181dbc9b05a9aba0340177c028d736ec5a35c88affbe6f1f84b36d0ac384c4c3f6783395c24a0a SHA512 d98ca90067362ece7de7830228615083ac8cf7858ca53a5e8391ab6703e9d9940f0a7b9ff33d3fca5fe4bae40f2eba01be3b469738bad92f139b34b3d1536ef0 +EBUILD meson-1.5.1.ebuild 4931 BLAKE2B e0457402a9656b8c79474d566b5a93072071c007f041615f0955f92add8c6b6daecec59be21a499b81613ba29386bcb0767e138aac7b7dd45f7a0e0b3c7a9753 SHA512 1d3f1fb1805e22c0214498743a274db34591ad2d3c13cf7f185ecd2524e34c48e7ab1ab2891a665ab9c5f18805273abca610fb0886b477bb9d3cb8c84ddb7225 +EBUILD meson-9999.ebuild 4938 BLAKE2B db4f9bf32eaa6dd7a60fa9eb3845ef58dfa2e842099a3b1148fa51dfe68fe26a8ae175b11227c24e4154e6e3780a1968ccee9d8e82808d105d08b4ec22c3642f SHA512 4d882f8f01c395546a09d5ec0e006cd87385574ae5427c59fe629ff070b85262a114c481caf03dd6dc988bd58acab72f84707203790db50ed0a758d26f27b2d3 +MISC metadata.xml 457 BLAKE2B 65bcd07bc76772c13ef3f5cf602206330c3b7456180d140b82ee1ad759762a9d0066b4c60001862ce8e2f99150bea411eb804e5df65ef3f7824dc790626319f3 SHA512 aacb863efe3f8548eb8e97a4be3c013ad8d351c0a6173f6204ac4df46054bddf934bdd6ea5673fbf4671b7aa83405847626393ac012c0db3bbc062c234eec1f3 diff --git a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch deleted file mode 100644 index 394b1bbb7c1b..000000000000 --- a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001 -From: Jan200101 <sentrycraft123@gmail.com> -Date: Tue, 21 Nov 2023 08:42:56 +0100 -Subject: [PATCH] Only convert boolean values for cmake formats - -This caused a regression with mesondefine where - `conf_data.set("FOO", true)` -turned into - `#define FOO 1` -instead of - `#define FOO` ---- - mesonbuild/utils/universal.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py -index 26194628c..93e64c0a2 100644 ---- a/mesonbuild/utils/universal.py -+++ b/mesonbuild/utils/universal.py -@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str, - var, _ = confdata.get(varname) - if isinstance(var, str): - var_str = var -- elif isinstance(var, bool): -+ elif variable_format.startswith("cmake") and isinstance(var, bool): - var_str = str(int(var)) - elif isinstance(var, int): - var_str = str(var) --- -2.41.0 - diff --git a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch deleted file mode 100644 index 3d40616fec1f..000000000000 --- a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2fbc7b5ce3aced483b196dd10ca9eee1713b7494 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Tue, 26 Dec 2023 15:06:12 -0500 -Subject: [PATCH] Revert "clike: Deduplicate rpath linker flags" - -This reverts commit 53ea59ad8455277797117d225f326851fe7d369c. - -This breaks at least: -- frameworks/17 mpi -- frameworks/30 scalapack - -The problem is that openmpi's pkg-config emitted link arguments -includes: - -``` --Wl,-rpath -Wl,/path/to/libdir -``` - -The deduplication logic in meson doesn't contain sufficient information -to tell when the compiler is passing an argument that requires values, -and definitely cannot tell when that argument is split across argv. But -for arguments that *can* do this, it is not possible to deduplicate a -single argument as standalone, because it is not standalone. - -The argument for deduplicating rpath here was that if you have multiple -dependencies that all add the same rpath, the Apple ld64 emits a -non-fatal warning "duplicate -rpath ignored". Since this is non-fatal, -it's not a major issue. A major issue is when builds fatally error out -with: - -``` -FAILED: scalapack_c -cc -o scalapack_c scalapack_c.p/main.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,--start-group /usr/lib64/libscalapack.so /usr/lib64/liblapack.so /usr/lib64/libblas.so -Wl,-rpath -Wl,/usr/lib64 -Wl,/usr/lib64 -Wl,--enable-new-dtags /usr/lib64/libmpi.so -Wl,--end-group -/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: /usr/lib64: read: Is a directory -``` ---- - mesonbuild/compilers/mixins/clike.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index b3fc96cec..76c8e0413 100644 ---- a/mesonbuild/compilers/mixins/clike.py -+++ b/mesonbuild/compilers/mixins/clike.py -@@ -54,7 +54,7 @@ class CLikeCompilerArgs(arglist.CompilerArgs): - - # NOTE: not thorough. A list of potential corner cases can be found in - # https://github.com/mesonbuild/meson/pull/4593#pullrequestreview-182016038 -- dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic', '-Wl,-rpath') -+ dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic') - dedup1_suffixes = ('.lib', '.dll', '.so', '.dylib', '.a') - dedup1_args = ('-c', '-S', '-E', '-pipe', '-pthread') - --- -2.41.0 - diff --git a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch deleted file mode 100644 index c552831cfd6b..000000000000 --- a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5f96e35b873d6230970fd63ba2e706bbd3f4e26f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Fri, 8 Sep 2023 16:54:48 -0400 -Subject: [PATCH 1/7] python dependency: ensure that setuptools doesn't inject - itself into distutils - -We do not use setuptools for anything, and only lightly use distutils. -Unpredictable issues can occur due to setuptools monkey-patching, which -interferes with our intended use. Tell setuptools to simply never get -involved. - -Note: while it's otherwise possible to check if the probe is run using -sys.executable and avoid forking, setuptools unconditionally injects -itself at startup in a way that requires subprocess isolation to -disable. - -(cherry picked from commit 9f610ad5b72ea91de2d7aeb6f3266d0a7477062e) ---- - mesonbuild/dependencies/python.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 160772888..f04494674 100644 ---- a/mesonbuild/dependencies/python.py -+++ b/mesonbuild/dependencies/python.py -@@ -113,7 +113,9 @@ class BasicPythonExternalProgram(ExternalProgram): - - with importlib.resources.path('mesonbuild.scripts', 'python_info.py') as f: - cmd = self.get_command() + [str(f)] -- p, stdout, stderr = mesonlib.Popen_safe(cmd) -+ env = os.environ.copy() -+ env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib' -+ p, stdout, stderr = mesonlib.Popen_safe(cmd, env=env) - - try: - info = json.loads(stdout) --- -2.42.0 - diff --git a/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch b/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch deleted file mode 100644 index 51c13d6926ff..000000000000 --- a/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cb4e62a8c55118988babac8b8254e0af1dc9698b Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz@archlinux.org> -Date: Mon, 21 Nov 2022 20:47:14 -0500 -Subject: [PATCH 2/7] python module: stop using distutils schemes on - sufficiently new Debian - -Since 3.10.3, Debian finally started patching sysconfig with custom -paths, instead of just distutils. This means we can now go use that -instead. It reduces our reliance on the deprecated distutils module. - -Partial fix for #7702 - -(cherry picked from commit 40f897fa92f7d3cc43788d3000733310ce77cf0c) ---- - mesonbuild/scripts/python_info.py | 32 +++++++++++++++++++++++-------- - 1 file changed, 24 insertions(+), 8 deletions(-) - -diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py -index 9c3a0791a..65597b121 100755 ---- a/mesonbuild/scripts/python_info.py -+++ b/mesonbuild/scripts/python_info.py -@@ -13,7 +13,6 @@ if sys.path[0].endswith('scripts'): - del sys.path[0] - - import json, os, sysconfig --import distutils.command.install - - def get_distutils_paths(scheme=None, prefix=None): - import distutils.dist -@@ -37,15 +36,32 @@ def get_distutils_paths(scheme=None, prefix=None): - # default scheme to a custom one pointing to /usr/local and replacing - # site-packages with dist-packages. - # See https://github.com/mesonbuild/meson/issues/8739. --# XXX: We should be using sysconfig, but Debian only patches distutils. -+# -+# We should be using sysconfig, but before 3.10.3, Debian only patches distutils. -+# So we may end up falling back. - --if 'deb_system' in distutils.command.install.INSTALL_SCHEMES: -- paths = get_distutils_paths(scheme='deb_system') -- install_paths = get_distutils_paths(scheme='deb_system', prefix='') --else: -- paths = sysconfig.get_paths() -+def get_install_paths(): -+ if sys.version_info >= (3, 10): -+ scheme = sysconfig.get_default_scheme() -+ else: -+ scheme = sysconfig._get_default_scheme() -+ -+ if sys.version_info >= (3, 10, 3): -+ if 'deb_system' in sysconfig.get_scheme_names(): -+ scheme = 'deb_system' -+ else: -+ import distutils.command.install -+ if 'deb_system' in distutils.command.install.INSTALL_SCHEMES: -+ paths = get_distutils_paths(scheme='deb_system') -+ install_paths = get_distutils_paths(scheme='deb_system', prefix='') -+ return paths, install_paths -+ -+ paths = sysconfig.get_paths(scheme=scheme) - empty_vars = {'base': '', 'platbase': '', 'installed_base': ''} -- install_paths = sysconfig.get_paths(vars=empty_vars) -+ install_paths = sysconfig.get_paths(scheme=scheme, vars=empty_vars) -+ return paths, install_paths -+ -+paths, install_paths = get_install_paths() - - def links_against_libpython(): - from distutils.core import Distribution, Extension --- -2.42.0 - diff --git a/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch deleted file mode 100644 index 484e967c8328..000000000000 --- a/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c179c18765514d5c37737dec996b4c91cb31477f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Mon, 2 Oct 2023 16:40:15 -0400 -Subject: [PATCH 3/7] python module: refactor pypy detection into a consistent - variable - -(cherry picked from commit 3d3a10ef022284c8377bd9f8e1b1adec73c50d95) ---- - mesonbuild/scripts/python_info.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py -index 65597b121..d17b3a376 100755 ---- a/mesonbuild/scripts/python_info.py -+++ b/mesonbuild/scripts/python_info.py -@@ -72,6 +72,8 @@ def links_against_libpython(): - variables = sysconfig.get_config_vars() - variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)}) - -+is_pypy = '__pypy__' in sys.builtin_module_names -+ - if sys.version_info < (3, 0): - suffix = variables.get('SO') - elif sys.version_info < (3, 8, 7): -@@ -88,7 +90,7 @@ print(json.dumps({ - 'install_paths': install_paths, - 'version': sysconfig.get_python_version(), - 'platform': sysconfig.get_platform(), -- 'is_pypy': '__pypy__' in sys.builtin_module_names, -+ 'is_pypy': is_pypy, - 'is_venv': sys.prefix != variables['base_prefix'], - 'link_libpython': links_against_libpython(), - 'suffix': suffix, --- -2.42.0 - diff --git a/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch b/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch deleted file mode 100644 index 2ebdbcc2b30f..000000000000 --- a/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3c493dae4bd8410bfb09e8f654605f65e15d8e66 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz@archlinux.org> -Date: Tue, 22 Nov 2022 22:56:10 -0500 -Subject: [PATCH 4/7] python module: stop using distutils "link to libpython" - probe on recent python - -On python >=3.8, this information is expected to be encoded in the -sysconfig vars. - -In distutils, it is always necessary to link to libpython on Windows; -for posix platforms, it depends on the value of LIBPYTHON (which is the -library to link to, possibly the empty string) as generated by -configure.ac and embedded into python.pc and python-config.sh, and then -coded a second time in the distutils python sources. - -There are a couple of caveats which have ramifications for Cygwin and -Android: - -- python.pc and python-config.sh disagree with distutils when python is - not built shared. In that case, the former act the same as a shared - build, while the latter *never* links to libpython - -- python.pc disagrees with python-config.sh and distutils when python is - built shared. The former never links to libpython, while the latter do - -The disagreement is resolved in favor of distutils' behavior in all -cases, and python.pc is correct for our purposes on python 3.12; see: -https://github.com/python/cpython/pull/100356 -https://github.com/python/cpython/pull/100967 - -Although it was not backported to older releases, Cygwin at least has -always patched in a fix for python.pc, which behavior is now declared -canonical. We can reliably assume it is always correct. - -This is the other half of the fix for #7702 - -(cherry picked from commit 2d6c10908b3771216e7ce086af1ee4dc77e698c2) ---- - mesonbuild/scripts/python_info.py | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py -index d17b3a376..a3f3d3535 100755 ---- a/mesonbuild/scripts/python_info.py -+++ b/mesonbuild/scripts/python_info.py -@@ -64,10 +64,19 @@ def get_install_paths(): - paths, install_paths = get_install_paths() - - def links_against_libpython(): -- from distutils.core import Distribution, Extension -- cmd = Distribution().get_command_obj('build_ext') -- cmd.ensure_finalized() -- return bool(cmd.get_libraries(Extension('dummy', []))) -+ # on versions supporting python-embed.pc, this is the non-embed lib -+ # -+ # PyPy is not yet up to 3.12 and work is still pending to export the -+ # relevant information (it doesn't automatically provide arbitrary -+ # Makefile vars) -+ if sys.version_info >= (3, 8) and not is_pypy: -+ variables = sysconfig.get_config_vars() -+ return bool(variables.get('LIBPYTHON', 'yes')) -+ else: -+ from distutils.core import Distribution, Extension -+ cmd = Distribution().get_command_obj('build_ext') -+ cmd.ensure_finalized() -+ return bool(cmd.get_libraries(Extension('dummy', []))) - - variables = sysconfig.get_config_vars() - variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)}) --- -2.42.0 - diff --git a/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch b/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch deleted file mode 100644 index 078e9035e228..000000000000 --- a/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ae44d9a379faca6274db819be44ffca3e0159f56 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Mon, 2 Oct 2023 23:51:57 -0400 -Subject: [PATCH 5/7] tests: fix test case to not import distutils on python - 3.12 - -Testing the correctness of the `modules: ` kwarg can be done with other -guaranteed stdlib modules that are even more guaranteed since they -didn't get deprecated for removal. - -(cherry picked from commit ecf261330c498783760cbde00b613b7469f8d3c0) ---- - test cases/python/5 modules kwarg/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test cases/python/5 modules kwarg/meson.build b/test cases/python/5 modules kwarg/meson.build -index 9751adaab..41a9a4fae 100644 ---- a/test cases/python/5 modules kwarg/meson.build -+++ b/test cases/python/5 modules kwarg/meson.build -@@ -1,7 +1,7 @@ - project('python kwarg') - - py = import('python') --prog_python = py.find_installation('python3', modules : ['distutils']) -+prog_python = py.find_installation('python3', modules : ['os', 'sys', 're']) - assert(prog_python.found() == true, 'python not found when should be') - prog_python = py.find_installation('python3', modules : ['thisbetternotexistmod'], required : false) - assert(prog_python.found() == false, 'python not found but reported as found') --- -2.42.0 - diff --git a/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch b/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch deleted file mode 100644 index 0e1f167b32fb..000000000000 --- a/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d9abf4a97dc182b3c57204a792000d620f9f941e Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Tue, 3 Oct 2023 00:22:25 -0400 -Subject: [PATCH 6/7] mark the PyPI metadata as supporting python 3.12 - -meson itself runs okay on 3.12, and the last issue for *probing* against -3.12 is solved. Tests pass here locally. - -(cherry picked from commit 880f21281ee359e01de659fe7d45549d19e6b84d) ---- - setup.cfg | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.cfg b/setup.cfg -index dfaba76dd..2f2962eed 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -30,6 +30,7 @@ classifiers = - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 -+ Programming Language :: Python :: 3.12 - Topic :: Software Development :: Build Tools - long_description = Meson is a cross-platform build system designed to be both as fast and as user friendly as possible. It supports many languages and compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its build definitions are written in a simple non-Turing complete DSL. - diff --git a/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch deleted file mode 100644 index 4ada76ae909b..000000000000 --- a/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 3 Oct 2023 16:52:56 +0100 -Subject: [PATCH 7/7] Revert "rust: apply global, project, and environment C - args to bindgen" - -This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e. - -This ended up not doing what was intended - see https://github.com/mesonbuild/meson/issues/12065#issuecomment-1742263677. - -Bug: https://bugs.gentoo.org/914989 -Bug: https://bugs.gentoo.org/915014 -Signed-off-by: Sam James <sam@gentoo.org> ---- - mesonbuild/modules/rust.py | 6 ------ - test cases/rust/12 bindgen/meson.build | 18 ------------------ - .../rust/12 bindgen/src/global-project.h | 10 ---------- - test cases/rust/12 bindgen/src/global.c | 5 ----- - test cases/rust/12 bindgen/src/global.rs | 14 -------------- - test cases/rust/12 bindgen/test.json | 5 +---- - 6 files changed, 1 insertion(+), 57 deletions(-) - delete mode 100644 test cases/rust/12 bindgen/src/global-project.h - delete mode 100644 test cases/rust/12 bindgen/src/global.c - delete mode 100644 test cases/rust/12 bindgen/src/global.rs - -diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py -index e6e5c633f..3514412e6 100644 ---- a/mesonbuild/modules/rust.py -+++ b/mesonbuild/modules/rust.py -@@ -232,12 +232,6 @@ class RustModule(ExtensionModule): - elif isinstance(s, CustomTarget): - depends.append(s) - -- clang_args.extend(state.global_args.get('c', [])) -- clang_args.extend(state.project_args.get('c', [])) -- cargs = state.get_option('args', state.subproject, lang='c') -- assert isinstance(cargs, list), 'for mypy' -- clang_args.extend(cargs) -- - if self._bindgen_bin is None: - self._bindgen_bin = state.find_program('bindgen') - -diff --git a/test cases/rust/12 bindgen/meson.build b/test cases/rust/12 bindgen/meson.build -index e7cb5f3db..c05cc0631 100644 ---- a/test cases/rust/12 bindgen/meson.build -+++ b/test cases/rust/12 bindgen/meson.build -@@ -8,9 +8,6 @@ if not prog_bindgen.found() - error('MESON_SKIP_TEST bindgen not found') - endif - --add_project_arguments('-DPROJECT_ARG', language : 'c') --add_global_arguments('-DGLOBAL_ARG', language : 'c') -- - # This seems to happen on windows when libclang.dll is not in path or is not - # valid. We must try to process a header file for this to work. - # -@@ -84,18 +81,3 @@ test('generated header', rust_bin2) - - subdir('sub') - subdir('dependencies') -- --gp = rust.bindgen( -- input : 'src/global-project.h', -- output : 'global-project.rs', --) -- --gp_lib = static_library('gp_lib', 'src/global.c') -- --gp_exe = executable( -- 'gp_exe', -- structured_sources(['src/global.rs', gp]), -- link_with : gp_lib, --) -- --test('global and project arguments', gp_exe) -diff --git a/test cases/rust/12 bindgen/src/global-project.h b/test cases/rust/12 bindgen/src/global-project.h -deleted file mode 100644 -index 6084e8ed6..000000000 ---- a/test cases/rust/12 bindgen/src/global-project.h -+++ /dev/null -@@ -1,10 +0,0 @@ --#ifndef GLOBAL_ARG --char * success(void); --#endif --#ifndef PROJECT_ARG --char * success(void); --#endif --#ifndef CMD_ARG --char * success(void); --#endif --int success(void); -diff --git a/test cases/rust/12 bindgen/src/global.c b/test cases/rust/12 bindgen/src/global.c -deleted file mode 100644 -index 10f6676f7..000000000 ---- a/test cases/rust/12 bindgen/src/global.c -+++ /dev/null -@@ -1,5 +0,0 @@ --#include "src/global-project.h" -- --int success(void) { -- return 0; --} -diff --git a/test cases/rust/12 bindgen/src/global.rs b/test cases/rust/12 bindgen/src/global.rs -deleted file mode 100644 -index 4b70b1ecc..000000000 ---- a/test cases/rust/12 bindgen/src/global.rs -+++ /dev/null -@@ -1,14 +0,0 @@ --// SPDX-license-identifer: Apache-2.0 --// Copyright © 2023 Intel Corporation -- --#![allow(non_upper_case_globals)] --#![allow(non_camel_case_types)] --#![allow(non_snake_case)] -- --include!("global-project.rs"); -- --fn main() { -- unsafe { -- std::process::exit(success()); -- }; --} -diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json -index b3a758562..f94ee85f9 100644 ---- a/test cases/rust/12 bindgen/test.json -+++ b/test cases/rust/12 bindgen/test.json -@@ -1,10 +1,7 @@ - { -- "env": { -- "CFLAGS": "-DCMD_ARG" -- }, - "stdout": [ - { -- "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." -+ "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]." - } - ] - } --- -2.42.0 - diff --git a/dev-build/meson/files/meson-1.3.1-xtools-support.patch b/dev-build/meson/files/meson-1.3.1-xtools-support.patch deleted file mode 100644 index dfb9b3f6be68..000000000000 --- a/dev-build/meson/files/meson-1.3.1-xtools-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 33527630f1bd0e51093044016557cb44e7bb6547 Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <grobian@gentoo.org> -Date: Wed, 17 Jan 2024 17:04:45 +0100 -Subject: [PATCH] linkers_detect: detect xtools (Apple ld64 derivative) - -xtools is in use on Gentoo Prefix x86_64 and ppc based Darwin installs. -Pick it up as a valid linker. - -Since xtools is answering with a version to --version, as opposed to -ld64, detection of xtools in the ld64 handling block is not possible, -since --version already succeeded. - -Bug: https://bugs.gentoo.org/868516 -Bug: https://github.com/mesonbuild/meson/issues/10805 -Signed-off-by: Fabian Groffen <grobian@gentoo.org> -Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> ---- - mesonbuild/linkers/detect.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py -index 918f2e634..1bce413f4 100644 ---- a/mesonbuild/linkers/detect.py -+++ b/mesonbuild/linkers/detect.py -@@ -174,6 +174,11 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty - v = search_version(o) - - linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) -+ # detect xtools first, bug #10805 -+ elif 'xtools-' in o.split('\n', maxsplit=1)[0]: -+ xtools = o.split(' ', maxsplit=1)[0] -+ v = xtools.split('-', maxsplit=2)[1] -+ linker = linkers.AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) - # First might be apple clang, second is for real gcc, the third is icc. - # Note that "ld: unknown option: " sometimes instead is "ld: unknown options:". - elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option' in e: --- -2.43.0 - diff --git a/dev-build/meson/meson-1.3.0-r2.ebuild b/dev-build/meson/meson-1.3.0-r2.ebuild deleted file mode 100644 index 321c8279eb4d..000000000000 --- a/dev-build/meson/meson-1.3.0-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 2016-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} pypy3 ) -DISTUTILS_USE_PEP517=setuptools - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 -else - inherit verify-sig - - MY_PV=${PV/_/} - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - - SRC_URI=" - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz - verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) - " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -inherit bash-completion-r1 distutils-r1 toolchain-funcs - -DESCRIPTION="Open source build system" -HOMEPAGE="https://mesonbuild.com/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - app-alternatives/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) -" -RDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.1-python-path.patch - - # backport fix for broken configure_file() - "${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch - - # backport fix for hiding compiler warnings (such as Modern C) in vala and cython - "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch -) - -python_prepare_all() { - local disable_unittests=( - # ASAN and sandbox both want control over LD_PRELOAD - # https://bugs.gentoo.org/673016 - -e 's/test_generate_gir_with_address_sanitizer/_&/' - - # ASAN is unsupported on some targets - # https://bugs.gentoo.org/692822 - -e 's/test_pch_with_address_sanitizer/_&/' - - # https://github.com/mesonbuild/meson/issues/7203 - -e 's/test_templates/_&/' - - # Broken due to python2 wrapper - -e 's/test_python_module/_&/' - ) - - sed -i "${disable_unittests[@]}" unittests/*.py || die - - # Broken due to python2 script created by python_wrapper_setup - rm -r "test cases/frameworks/1 boost" || die - - distutils-r1_python_prepare_all -} - -src_test() { - tc-export PKG_CONFIG - if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then - ewarn "Found Qt5Core but not Qt5Gui; skipping tests" - else - distutils-r1_src_test - fi -} - -python_test() { - ( - # test_meson_installed - unset PYTHONDONTWRITEBYTECODE - - # https://bugs.gentoo.org/687792 - unset PKG_CONFIG - - # test_cross_file_system_paths - unset XDG_DATA_HOME - - # 'test cases/unit/73 summary' expects 80 columns - export COLUMNS=80 - - # If JAVA_HOME is not set, meson looks for javac in PATH. - # If javac is in /usr/bin, meson assumes /usr/include is a valid - # JDK include path. Setting JAVA_HOME works around this broken - # autodetection. If no JDK is installed, we should end up with an empty - # value in JAVA_HOME, and the tests should get skipped. - export JAVA_HOME=$(java-config -O 2>/dev/null) - - # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. - python3 run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} - - insinto /usr/share/zsh/site-functions - doins data/shell-completions/zsh/_meson - - dobashcomp data/shell-completions/bash/meson -} diff --git a/dev-build/meson/meson-1.4.0-r1.ebuild b/dev-build/meson/meson-1.4.1.ebuild index d30bc90b1103..db2001929162 100644 --- a/dev-build/meson/meson-1.4.0-r1.ebuild +++ b/dev-build/meson/meson-1.4.1.ebuild @@ -82,12 +82,22 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' + + # clippy-driver fails, but only when run via portage. + # + # error[E0463]: can't find crate for `std` + # error: requires `sized` lang_item + -e 's/test_rust_clippy/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all } diff --git a/dev-build/meson/meson-1.3.1-r1.ebuild b/dev-build/meson/meson-1.4.2.ebuild index 8a1bba292f2a..9789efe74960 100644 --- a/dev-build/meson/meson-1.3.1-r1.ebuild +++ b/dev-build/meson/meson-1.4.2.ebuild @@ -6,9 +6,17 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=setuptools +inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs + if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 + inherit ninja-utils git-r3 + + BDEPEND=" + ${NINJA_DEPEND} + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + " + else inherit verify-sig @@ -19,17 +27,16 @@ else SRC_URI=" https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 " BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi -inherit bash-completion-r1 distutils-r1 toolchain-funcs - DESCRIPTION="Open source build system" HOMEPAGE="https://mesonbuild.com/" @@ -49,22 +56,23 @@ DEPEND=" ) " RDEPEND=" + !<dev-build/muon-0.2.0-r2[man(-)] virtual/pkgconfig " PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch - - # backport fix for hiding compiler warnings (such as Modern C) in vala and cython - "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch - - # backport revert for broken rpath changes: https://github.com/mesonbuild/meson/pull/12672 - "${FILESDIR}"/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch - - # backport macos Prefix fix: https://github.com/mesonbuild/meson/pull/12747 - "${FILESDIR}"/meson-1.3.1-xtools-support.patch ) +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + default + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} + fi +} + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD @@ -74,16 +82,55 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' + + # clippy-driver fails, but only when run via portage. + # + # error[E0463]: can't find crate for `std` + # error: requires `sized` lang_item + -e 's/test_rust_clippy/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die + + # The 1.4.2 tarball accidentally contains some untracked files from git master: + # - subprojects/bar-0.1/Cargo.toml + rm -r "test cases/rust/25 cargo lock/" distutils-r1_python_prepare_all } +python_check_deps() { + if [[ ${PV} = *9999* ]]; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +python_configure_all() { + if [[ ${PV} = *9999* ]]; then + # We use the unsafe_yaml loader because strictyaml is not packaged. In + # theory they produce the same results, but pyyaml is faster and + # without safety checks. + edo ./meson.py setup \ + --prefix "${EPREFIX}/usr" \ + -Dhtml=false \ + -Dunsafe_yaml=true \ + docs/ docs/builddir + fi +} + +python_compile_all() { + if [[ ${PV} = *9999* ]]; then + eninja -C docs/builddir + fi +} + src_test() { tc-export PKG_CONFIG if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then @@ -95,6 +142,11 @@ src_test() { python_test() { ( + # meson has its own tests for LTO support. We don't need to verify that + # all tests work when they happen to use it. And in particular, this + # breaks rust. + filter-lto + # remove unwanted python_wrapper_setup contents # We actually do want to non-error if python2 is installed and tested. remove="${T}/${EPYTHON}/bin:" @@ -133,4 +185,10 @@ python_install_all() { doins data/shell-completions/zsh/_meson dobashcomp data/shell-completions/bash/meson + + if [[ ${PV} = *9999* ]]; then + DESTDIR="${ED}" eninja -C docs/builddir install + else + newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + fi } diff --git a/dev-build/meson/meson-1.4.0.ebuild b/dev-build/meson/meson-1.5.1.ebuild index f089b6a869b1..f0a32e526747 100644 --- a/dev-build/meson/meson-1.4.0.ebuild +++ b/dev-build/meson/meson-1.5.1.ebuild @@ -3,12 +3,20 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) DISTUTILS_USE_PEP517=setuptools +inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs + if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit git-r3 + inherit ninja-utils git-r3 + + BDEPEND=" + ${NINJA_DEPEND} + $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + " + else inherit verify-sig @@ -19,17 +27,16 @@ else SRC_URI=" https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) + https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 " BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi -inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs - DESCRIPTION="Open source build system" HOMEPAGE="https://mesonbuild.com/" @@ -49,6 +56,7 @@ DEPEND=" ) " RDEPEND=" + !<dev-build/muon-0.2.0-r2[man(-)] virtual/pkgconfig " @@ -56,6 +64,15 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch ) +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + default + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} + fi +} + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD @@ -65,16 +82,51 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' + + # clippy-driver fails, but only when run via portage. + # + # error[E0463]: can't find crate for `std` + # error: requires `sized` lang_item + -e 's/test_rust_clippy/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all } +python_check_deps() { + if [[ ${PV} = *9999* ]]; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +python_configure_all() { + if [[ ${PV} = *9999* ]]; then + # We use the unsafe_yaml loader because strictyaml is not packaged. In + # theory they produce the same results, but pyyaml is faster and + # without safety checks. + edo ./meson.py setup \ + --prefix "${EPREFIX}/usr" \ + -Dhtml=false \ + -Dunsafe_yaml=true \ + docs/ docs/builddir + fi +} + +python_compile_all() { + if [[ ${PV} = *9999* ]]; then + eninja -C docs/builddir + fi +} + src_test() { tc-export PKG_CONFIG if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then @@ -129,4 +181,10 @@ python_install_all() { doins data/shell-completions/zsh/_meson dobashcomp data/shell-completions/bash/meson + + if [[ ${PV} = *9999* ]]; then + DESTDIR="${ED}" eninja -C docs/builddir install + else + newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 + fi } diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index 027a1fc01853..9cddc1a7a32d 100644 --- a/dev-build/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) DISTUTILS_USE_PEP517=setuptools inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs @@ -82,12 +82,22 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' + + # clippy-driver fails, but only when run via portage. + # + # error[E0463]: can't find crate for `std` + # error: requires `sized` lang_item + -e 's/test_rust_clippy/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all } @@ -175,6 +185,6 @@ python_install_all() { if [[ ${PV} = *9999* ]]; then DESTDIR="${ED}" eninja -C docs/builddir install else - newman "${DISTDIR}"/meson-reference-${PV}.3 meson-reference.3 + newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 fi } diff --git a/dev-build/meson/metadata.xml b/dev-build/meson/metadata.xml index f4b485f0bec2..0bea8119a5b7 100644 --- a/dev-build/meson/metadata.xml +++ b/dev-build/meson/metadata.xml @@ -4,8 +4,8 @@ <maintainer type="project"> <email>base-system@gentoo.org</email> </maintainer> - <maintainer type="person" proxied="yes"> - <email>eschwartz93@gmail.com</email> + <maintainer type="person"> + <email>eschwartz@gentoo.org</email> <name>Eli Schwartz</name> </maintainer> <upstream> diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest index 0d6cefcc7b88..0d180ff8c65d 100644 --- a/dev-build/ninja/Manifest +++ b/dev-build/ninja/Manifest @@ -1,9 +1,9 @@ +AUX ninja-1.12.1-restore-tests-bootstrap.patch 5152 BLAKE2B 133bb641e41b7111a02d13de5d04daa48ad786ed16911cc452c3a44172c425d9f6fc72d52ed5c1bd48750435da083c2e0091d99876180ed328e4d5368887fcc0 SHA512 cb386f2f81aef1bfd7b0d028c8857e5ad474002e90a53ba8469f64c7952e419e7163beb2560ed854f202c44270e4c5c80a101db3903aa04618c018a69e351787 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42 +DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875 DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4 SHA512 d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b321111b806aa7efa1061f031a1319b074391db61b0cbdccf096954c EBUILD ninja-1.11.1-r5.ebuild 2451 BLAKE2B bf0e6fc2f7d09db24ca6b58a4a1e081ef08ee2bb04acc73af3e2f8fe8f77745f99ac8d68d0338b0867a0040555b6eddad61930c7ce7d72d43d0c426511b078a9 SHA512 831f9e6e2800fdf5c466ba0d69a9034b0c329a2d34b80cad723dead14d02a205ee76b398ca6a56b7d16a1ce8249b1be1493ce77bfb7e8e98e86e0a665f797b1b -EBUILD ninja-1.12.0.ebuild 2181 BLAKE2B 176fb48a6cd527f5e04cc0c971f3ddbb2b845cff8199a414b8049768088efe8d54bafcd519f25f04764f58457a3613c267c942143eba6ce21498e1bede645d39 SHA512 ae40c1d845c748da41ba0903f055f42cf401677d14365afddcedb22cf39dd2ed275571873df5b77b64c42ab308a84b9019884e89d68a12dad66f6f8f45ffbacf -EBUILD ninja-1.12.1.ebuild 2181 BLAKE2B 13965a148b8e30d15bd441624b99f05a0f0750c8bf25d403c3de5cea20c78a000a56fdc39de09fc50c020e6f8eb7069160afb806f21ca0dae3db6e9a1a4a3bdf SHA512 117eb46883ca5bb23d4072a2642110da0fbc9c6d4ce4ebd5d315ccbeb1829dd31e98b3cba14c737cf5f3aa098d840850d7ecac468bb72ead8ed21baf1deb9ac3 -EBUILD ninja-9999.ebuild 2181 BLAKE2B 13965a148b8e30d15bd441624b99f05a0f0750c8bf25d403c3de5cea20c78a000a56fdc39de09fc50c020e6f8eb7069160afb806f21ca0dae3db6e9a1a4a3bdf SHA512 117eb46883ca5bb23d4072a2642110da0fbc9c6d4ce4ebd5d315ccbeb1829dd31e98b3cba14c737cf5f3aa098d840850d7ecac468bb72ead8ed21baf1deb9ac3 +EBUILD ninja-1.12.1.ebuild 2717 BLAKE2B c59156279ce7aec352b3456bee0d92f1f5239d8d0d41e71e7052529028da722b06917fbdcb10205c4533944c42fbcd840abf75e89c2fbca43453716e61252197 SHA512 8d6b287dd9c409322f916fa39bb4ff3537e4686ac9bfd9f89590e9ac58eea7e633d3737fff330e9edc5d01de040e1f24db857868c2121ca3d1fb6d9aa51b6f91 +EBUILD ninja-9999.ebuild 2666 BLAKE2B 06f9bfd3cc0ddbc91cf3799c2fbef7a023fe09ed931ca28ec465e9014910793714bf2ab74fb189b0a2b99501a7d893f402890aaf73503b8f9327af6344b9a5f7 SHA512 ca9509ebde94168d5fb6a1974f8a4799ba1b4e8c3bc8b044c10b181e25d72eb327e8b216c66ba33bc7354ac156e8b3b382c8765999c1d013d55bf6941c103c81 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880 diff --git a/dev-build/ninja/files/ninja-1.12.1-restore-tests-bootstrap.patch b/dev-build/ninja/files/ninja-1.12.1-restore-tests-bootstrap.patch new file mode 100644 index 000000000000..94aa8ab5b397 --- /dev/null +++ b/dev-build/ninja/files/ninja-1.12.1-restore-tests-bootstrap.patch @@ -0,0 +1,135 @@ +https://bugs.gentoo.org/929221 +https://github.com/ninja-build/ninja/issues/2447 +https://github.com/ninja-build/ninja/commit/afcd4a146fb82843f6ff695f89504ce4ca65ddfd + +From afcd4a146fb82843f6ff695f89504ce4ca65ddfd Mon Sep 17 00:00:00 2001 +From: David 'Digit' Turner <digit+github@google.com> +Date: Sun, 12 May 2024 23:45:28 +0200 +Subject: [PATCH] configure.py: Support --gtest-source-dir to build tests. + +Allow the Ninja build plan generated by configure.py to +build `ninja_test` by compiling GoogleTest from source if +the path to the library if passed through the new option +`--gtest-source-dir` or the GTEST_SOURCE_DIR environment +variable. + +For simplicity, probing for an installed version of the +library, and linking to it, is not supported (use the +CMake build for this). + +This also removes the obsolete `--gtest-dir` option. + +Fixes #2447 +--- + configure.py | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 95 insertions(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index f9e49f9cdf..2b16618c43 100755 +--- a/configure.py ++++ b/configure.py +@@ -223,7 +223,10 @@ def _run_command(self, cmdline: str) -> None: + parser.add_option('--profile', metavar='TYPE', + choices=profilers, + help='enable profiling (' + '/'.join(profilers) + ')',) +-parser.add_option('--with-gtest', metavar='PATH', help='ignored') ++parser.add_option('--gtest-source-dir', metavar='PATH', ++ help='Path to GoogleTest source directory. If not provided ' + ++ 'GTEST_SOURCE_DIR will be probed in the environment. ' + ++ 'Tests will not be built without a value.') + parser.add_option('--with-python', metavar='EXE', + help='use EXE as the Python interpreter', + default=os.path.basename(sys.executable)) +@@ -435,6 +438,7 @@ def shell_escape(str: str) -> str: + if 'LDFLAGS' in configure_env: + ldflags.append(configure_env['LDFLAGS']) + n.variable('ldflags', ' '.join(shell_escape(flag) for flag in ldflags)) ++ + n.newline() + + if platform.is_msvc(): +@@ -592,6 +596,83 @@ def has_re2c() -> bool: + # build.ninja file. + n = ninja_writer + ++# Build the ninja_test executable only if the GTest source directory ++# is provided explicitly. Either from the environment with GTEST_SOURCE_DIR ++# or with the --gtest-source-dir command-line option. ++# ++# Do not try to look for an installed binary version, and link against it ++# because doing so properly is platform-specific (use the CMake build for ++# this). ++if options.gtest_source_dir: ++ gtest_src_dir = options.gtest_source_dir ++else: ++ gtest_src_dir = os.environ.get('GTEST_SOURCE_DIR') ++ ++if gtest_src_dir: ++ # Verify GoogleTest source directory, and add its include directory ++ # to the global include search path (even for non-test sources) to ++ # keep the build plan generation simple. ++ gtest_all_cc = os.path.join(gtest_src_dir, 'googletest', 'src', 'gtest-all.cc') ++ if not os.path.exists(gtest_all_cc): ++ print('ERROR: Missing GoogleTest source file: %s' % gtest_all_cc) ++ sys.exit(1) ++ ++ n.comment('Tests all build into ninja_test executable.') ++ ++ # Test-specific version of cflags, must include the GoogleTest ++ # include directory. Also GoogleTest can only build with a C++14 compiler. ++ test_cflags = [f.replace('std=c++11', 'std=c++14') for f in cflags] ++ test_cflags.append('-I' + os.path.join(gtest_src_dir, 'googletest', 'include')) ++ ++ test_variables = [('cflags', test_cflags)] ++ if platform.is_msvc(): ++ test_variables += [('pdb', 'ninja_test.pdb')] ++ ++ test_names = [ ++ 'build_log_test', ++ 'build_test', ++ 'clean_test', ++ 'clparser_test', ++ 'depfile_parser_test', ++ 'deps_log_test', ++ 'disk_interface_test', ++ 'dyndep_parser_test', ++ 'edit_distance_test', ++ 'graph_test', ++ 'json_test', ++ 'lexer_test', ++ 'manifest_parser_test', ++ 'ninja_test', ++ 'state_test', ++ 'string_piece_util_test', ++ 'subprocess_test', ++ 'test', ++ 'util_test', ++ ] ++ if platform.is_windows(): ++ test_names += [ ++ 'includes_normalize_test', ++ 'msvc_helper_test', ++ ] ++ ++ objs = [] ++ for name in test_names: ++ objs += cxx(name, variables=test_variables) ++ ++ # Build GTest as a monolithic source file. ++ # This requires one extra include search path, so replace the ++ # value of 'cflags' in our list. ++ gtest_all_variables = test_variables[1:] + [ ++ ('cflags', test_cflags + ['-I' + os.path.join(gtest_src_dir, 'googletest') ]), ++ ] ++ # Do not use cxx() directly to ensure the object file is under $builddir. ++ objs += n.build(built('gtest_all' + objext), 'cxx', gtest_all_cc, variables=gtest_all_variables) ++ ++ ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib, ++ variables=[('libs', libs)]) ++ n.newline() ++ all_targets += ninja_test ++ + n.comment('Ancillary executables.') + + if platform.is_aix() and '-maix64' not in ldflags: + diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild deleted file mode 100644 index 3af9c43f1b06..000000000000 --- a/dev-build/ninja/ninja-1.12.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 2012-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 edo python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) -" -PDEPEND=" - app-alternatives/ninja -" - -pkg_setup() { - : -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/ninja-cflags.patch - ) - default -} - -bootstrap() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64" - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose -} - -src_compile() { - python_setup - - tc-export AR CXX - unset CFLAGS - export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64" - - bootstrap - - if use doc; then - edo ./ninja -v doxygen manual - fi - - if tc-is-cross-compiler; then - edo ${EPYTHON} configure.py --with-python=python - edo ./ninja -v ninja - fi -} - -src_install() { - newbin ninja{,-reference} - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja -} - -pkg_postinst() { - if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then - ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die - fi -} diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild index b387ddf90c06..05b835dcd49c 100644 --- a/dev-build/ninja/ninja-1.12.1.ebuild +++ b/dev-build/ninja/ninja-1.12.1.ebuild @@ -7,6 +7,9 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 edo python-any-r1 toolchain-funcs +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" inherit git-r3 @@ -15,12 +18,13 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" +GTEST_VER=1.14.0 +SRC_URI+=" test? ( https://github.com/google/googletest/archive/refs/tags/v${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz )" LICENSE="Apache-2.0" SLOT="0" -IUSE="doc" +IUSE="doc test" +RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} @@ -36,14 +40,20 @@ PDEPEND=" app-alternatives/ninja " +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch + "${FILESDIR}"/${P}-restore-tests-bootstrap.patch +) + pkg_setup() { : } -src_prepare() { - local PATCHES=( - "${FILESDIR}"/ninja-cflags.patch - ) +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi + default } @@ -55,7 +65,18 @@ bootstrap() { local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64" local -x LDFLAGS=${BUILD_LDFLAGS} fi - edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose + + local args=( + --with-python=python + --bootstrap + --verbose + ) + + if use test; then + args+=( --gtest-source-dir="${WORKDIR}"/googletest-${GTEST_VER} ) + fi + + edo ${EPYTHON} configure.py "${args[@]}" } src_compile() { @@ -77,6 +98,15 @@ src_compile() { fi } +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + edo ./ninja -v ninja_test + edo ./ninja_test + fi +} + src_install() { newbin ninja{,-reference} diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild index b387ddf90c06..0bd7a0f8370e 100644 --- a/dev-build/ninja/ninja-9999.ebuild +++ b/dev-build/ninja/ninja-9999.ebuild @@ -7,6 +7,9 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 edo python-any-r1 toolchain-funcs +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" inherit git-r3 @@ -15,12 +18,13 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" +GTEST_VER=1.14.0 +SRC_URI+=" test? ( https://github.com/google/googletest/archive/refs/tags/v${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz )" LICENSE="Apache-2.0" SLOT="0" -IUSE="doc" +IUSE="doc test" +RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} @@ -36,14 +40,19 @@ PDEPEND=" app-alternatives/ninja " +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch +) + pkg_setup() { : } -src_prepare() { - local PATCHES=( - "${FILESDIR}"/ninja-cflags.patch - ) +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi + default } @@ -55,7 +64,15 @@ bootstrap() { local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64" local -x LDFLAGS=${BUILD_LDFLAGS} fi - edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose + + local bootstrap_args=( + --with-python=python + --bootstrap + --verbose + $(usev test --gtest-source-dir="${WORKDIR}"/googletest-${GTEST_VER}) + ) + + edo ${EPYTHON} configure.py "${bootstrap_args[@]}" } src_compile() { @@ -77,6 +94,15 @@ src_compile() { fi } +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + edo ./ninja -v ninja_test + edo ./ninja_test + fi +} + src_install() { newbin ninja{,-reference} diff --git a/dev-build/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest index 28ece17a7858..8b3c7fe568dc 100644 --- a/dev-build/rocm-cmake/Manifest +++ b/dev-build/rocm-cmake/Manifest @@ -1,4 +1,10 @@ AUX rocm-cmake-5.0.2-license.patch 631 BLAKE2B f3beee352aa6dba1d8b30e9e4193915d8b97d3aac3143f79b12c7b6f438a3557d6ee3eabb7835764cb5b2470f6f6f20ef82757356bd8e2f43eeeb8e20966d4c2 SHA512 818a019b93cfa0712fdb8faba32e7415aafa68b337cc147f3259165ffc028ec2e0353cfb0680053cdc8e8069c75df07356939eb7adb5b1295010e4d501a59546 +AUX rocm-cmake-6.1.1-license.patch 520 BLAKE2B 4a00b068a3bb330ad2a1b981e6f36f8ac700e7d14e234541ede8657f30583c7e16b89f7729d559f36e7909fa9c43bc123a9bfb4a2b3778833b9a2af157b926f8 SHA512 8a4dd0b1035f66c233bec885ea64ceca5c2d8e140fb9de752f09de08c996551123abc45b2a6967b1696aef16924727268521f9c00d99ef9e6e8783d9c1bbf520 +AUX rocm-cmake-6.1.1-no-rocmchecks-warnings.patch 1431 BLAKE2B eedeb63f394ace78c298ac77e920a43616924a475d53154b9e904c44dd0118defc7aa7405963dacbb9d60e49fe1be78533e9896e6f9d92bc9acc48fee6ee806c SHA512 45599dfe29f1800319baf36635a8306b73aac4425797168235be578554e63b43a12b451fc343231d735d1d1bbae073bf1192c4c3292ce1014db8fbb130b5cc7a DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b +DIST rocm-cmake-6.1.1.tar.gz 86888 BLAKE2B 91064e82199ac317c273005b9b6c07e33ab5199b456467e84ac0937036d26d1d5c1286e1e38932b2da11700fb2a7a90795e34d4a7c03ed3bf58959402060091e SHA512 af6d4e124a3ec4d1e810867db69d738ebe7cfea672065bb5279b72a4d4efce8c14305e76173f760044977082c6aa069453d8eef488368a88ac57eb9df20f8b0c +DIST rocm-cmake-6.1.2.tar.gz 86889 BLAKE2B 66e31b629171a5746eefd83e1ff14826a02f5d20a7b3125e20177bf801fa48526f541fcf9be0c832041a237799cd3d38a3daaec8f4dc17a5c048f7d603b7ef30 SHA512 9c83bd0b69a8bf040ddf9508df4ea8fb5daaaf8720f4b60ba3d6e4cc62b00a7dcfeead40cd37a6343b2173f9cf5db2e21f054661dcc2ac0591426e37ba61d3ba EBUILD rocm-cmake-5.7.1.ebuild 775 BLAKE2B 00c9e426dee2cb49d2ec17149f388a8262217c4fe6bfef406bb9bb8c8e2ab2519f28b6043560bea3c0722729fcdebe7b7488ece5780783aaf6ab4a1534061d20 SHA512 90b114853f760f8622b7a1c3a403d81cd555258a41bea56b6ae5bca83d20287a5b314ecbc5413bccede7083e2aa5ae783dd215dda7e4fe954257e3dd927c1423 -MISC metadata.xml 504 BLAKE2B 5b7976e66353bfe9bec6d7c7ebb318d4f3922f4128e0a5f224fb983b876d9fd328c0d3dea68f4d92f3d740555eaaf5ef99de610957f0375076a3e8f5df04eb99 SHA512 32299ceb61b177b44e8117c5e2d249df25f75ddb5398bc1bd62bcb0462347a183fcdac6f9c14d6e2fd076d860dab401d9e6f7714ac3492adea7268edd953421f +EBUILD rocm-cmake-6.1.1.ebuild 912 BLAKE2B e0a965c617856b22bc43b142be1de8a030da43dc5b9c375eabb14de2b2254e6f2badaa80727b2e94e38a85bfff7bb36124a5ec4a9935c6f3c69728be2a5dfb7b SHA512 add66398a09ba709b6b702dd794361202b68e42c1f946ed1d156cf3b7c2dfaea9bbf2c2b94ad1d4b762a0e1ff8b583f1d7a4d1fc4f273f1c8dcbd69199b6a4e9 +EBUILD rocm-cmake-6.1.2.ebuild 912 BLAKE2B e0a965c617856b22bc43b142be1de8a030da43dc5b9c375eabb14de2b2254e6f2badaa80727b2e94e38a85bfff7bb36124a5ec4a9935c6f3c69728be2a5dfb7b SHA512 add66398a09ba709b6b702dd794361202b68e42c1f946ed1d156cf3b7c2dfaea9bbf2c2b94ad1d4b762a0e1ff8b583f1d7a4d1fc4f273f1c8dcbd69199b6a4e9 +MISC metadata.xml 612 BLAKE2B cbab269204bacde90025f8f0575016692e4d7785127fcad21bdac56cd3c6b1e5a8b52b4abfefbdb91cf39db9c0a06ca90b1a37bffdb106319540a899d5c5e896 SHA512 d39324e34a7374dfa1fc43aa93d9f6c439b8d6311605b37919fe18c776d881713cc6b874a43428a607be00ffcc8a0b7c1b8cd62d0f6f039b1ec2d255b17cee1a diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch new file mode 100644 index 000000000000..f8770b345f85 --- /dev/null +++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch @@ -0,0 +1,12 @@ +This is not needed. Gentoo will collect license files into +the documentation directory in ebuild. +--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake ++++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake +@@ -409,7 +409,6 @@ macro(rocm_create_package) + if(PARSE_PTH) + rocm_parse_python_syspath(${LIB_DIR} ${PARSE_NAME}) + endif() +- rocm_setup_license(${PARSE_HEADER_ONLY}) + if(PARSE_COMPONENTS) + rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_COMPONENTS}") + endif() diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch new file mode 100644 index 000000000000..73030e7b9b20 --- /dev/null +++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch @@ -0,0 +1,25 @@ +Gentoo uses cmake -C <...>/gentoo_common_config.cmake approach to set toolchain variables. +There is nothing wrong there, so there is no need to print huge ROCMChecks warnings. +--- a/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake ++++ b/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake +@@ -34,20 +34,6 @@ function(rocm_check_toolchain_var var access value list_file) + elseif("${base}" MATCHES ".*/CMakeFiles/${CMAKE_VERSION}$") + set(cmake_module On) + endif() +- if(NOT cmake_module) +- message( " +-******************************************************************************* +-*------------------------------- ${message_title} --------------------------* +- Options and properties should be set on a cmake target where possible. The +- variable '${var}' may be set by the cmake toolchain, either by +- calling 'cmake -D${var}=\"${value}\"' +- or set in a toolchain file and added with +- 'cmake -DCMAKE_TOOLCHAIN_FILE=<toolchain-file>'. ROCMChecks now calling:") +- message(${message_type} "'${var}' is set at ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt:<line#> shown below:") +- message( "*-----------------------------------------------------------------------------* +-******************************************************************************* +-") +- endif() + endif() + endfunction() + if(UNIX AND (ROCM_WARN_TOOLCHAIN_VAR OR ROCM_ERROR_TOOLCHAIN_VAR)) diff --git a/dev-build/rocm-cmake/metadata.xml b/dev-build/rocm-cmake/metadata.xml index e13f2f7b5728..9b05010ce860 100644 --- a/dev-build/rocm-cmake/metadata.xml +++ b/dev-build/rocm-cmake/metadata.xml @@ -9,7 +9,11 @@ <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> <upstream> - <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id> + <remote-id type="github">ROCm/rocm-cmake</remote-id> </upstream> </pkgmetadata> diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild new file mode 100644 index 000000000000..7d097ae7d18f --- /dev/null +++ b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git" + inherit git-r3 +else + SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocm-cmake-rocm-${PV}" +fi + +DESCRIPTION="Radeon Open Compute CMake Modules" +HOMEPAGE="https://github.com/ROCm/rocm-cmake" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +RESTRICT="test" + +DOCS=( CHANGELOG.md LICENSE README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-license.patch + "${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch +) + +src_prepare() { + sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \ + -i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \ + -i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die + cmake_src_prepare +} diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.2.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.2.ebuild new file mode 100644 index 000000000000..7d097ae7d18f --- /dev/null +++ b/dev-build/rocm-cmake/rocm-cmake-6.1.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git" + inherit git-r3 +else + SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocm-cmake-rocm-${PV}" +fi + +DESCRIPTION="Radeon Open Compute CMake Modules" +HOMEPAGE="https://github.com/ROCm/rocm-cmake" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +RESTRICT="test" + +DOCS=( CHANGELOG.md LICENSE README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-license.patch + "${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch +) + +src_prepare() { + sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \ + -i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \ + -i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die + cmake_src_prepare +} diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest index a8c823eca2e7..816333946d2a 100644 --- a/dev-build/scons/Manifest +++ b/dev-build/scons/Manifest @@ -1,8 +1,13 @@ AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683 AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750afc14650fef564997d250ed63f0d9b1c91361872a8816cab9ba1f0ecae46711414ccac921ded954eff7c51e4161532030e5f SHA512 ce8690a126255047c8efbcad4e75b91fca07b0afac55d818d4f5467a41795394cae8f5d47484519c482bccfdae9c3df1b040689a656098f349629f1f609adbce DIST SCons-4.7.0.tar.gz 3220744 BLAKE2B 0fe8cdbaef46ca6571de35fb6544afe992e8a509cf52a8078133584e3af63919d2e0fb83ad646e042290fc47ca5a8932435946df9d40a099ccb2105b54bfd5cd SHA512 d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77 +DIST SCons-4.8.0.tar.gz 3243387 BLAKE2B 1ab4a63d14ecfd1984e41f6be11c87003413f74a0d6b03eb7d5fd7d7b66ad5cf904b1061b3cd91a33735fd6ea1ffda6aa388dbf42a7085caa900961bcf2340dd SHA512 6f1ab01b25752f1f43a1796fb68fb0508105b372cf082a57477af4685399f8b83372466d65070d5c928d81c9fd4bdf1e8ba357c72537f32c50f77121f52415fb DIST scons-4.7.0-user.html 1683569 BLAKE2B 6c68f34af85fbfaf70f77758321bd0bb86b4f549c5fa05f721df94af0627d030a15db89565910ee6674b514d6b4fac9e624ac0aa6e849bd1224833c0473ed4c6 SHA512 8b0320794775890d898854767cd12bc4da725f6a33ae4496dc41a7b37a6dcb5f812c23083093d17685db9799b230552e19cc5550a108c2cf6787ffd963e649d6 DIST scons-4.7.0-user.pdf 3069908 BLAKE2B 7196a5b247802c9f42914c4de5968862c4a183e5c3ff7e5172ec7bbf58f049362f0b85fdaba47c66fc09dbed79c22ddac8195a78bff2e564eff879b0e6a4f482 SHA512 6d62def8a68c8bf3b6cc269a93272c815e82b46bd6a223d0f7f3848daf9c7212e5f9de8dcdac41d2a6f2d7d70053b97f92e0b99c11f4f5b2b3a69951d474fe3a DIST scons-4.7.0.gh.tar.gz 5896790 BLAKE2B 1ce9041ad1e2891da92a9bd50e07e29a5e23c7c9432adb120d6610956a2ea4a5125fb6bfa1f8b944797d589cfdbe036a1b9b1eae271ae51abb826c6ee5a3ee1c SHA512 8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c +DIST scons-4.8.0-user.html 1695726 BLAKE2B 1c44141dd7d04d738cb9495aa4749f3b44275f2c0808695270bdb0642454eb3b93d599b5c0fa21fd4f1099a95b1dd90583eb2184631bbc14fbef6644faf3f633 SHA512 c69be0e682755bf74f7b9c366e56a69b60962327d2ee5f4c1928edd41e800484bfb43836c575500be4132e90ef78d39f23dda5655dedd05b42b54ca4a65f4766 +DIST scons-4.8.0-user.pdf 3091708 BLAKE2B 430e56d3f0e433eb5c24a2ad1d9cf12b4912a3be9b98682019a071964d9824c55c18147e4c5ffff326c43ce6f232f03ce14386849d112b4fc29e09d0743dfb0f SHA512 8474bfbfeb76cc915f3b8392a7a38901206a264e23d867d5ed4a610debf3c5cd68d812e6b4e730b037eea4de1523aa7afc4e41e636fb3cd315c0fc5797fdb4e9 +DIST scons-4.8.0.gh.tar.gz 5933373 BLAKE2B 6912696f5ffdfa7f54fd00210228f308468bc35be76dda56652f91c1cf301d2df1720715d88d755e1c783360efec79a708cfa7c21514983fec3111db0bb05500 SHA512 056bc7f5308e73e202a96ce6e56efee4df278cd77455dc42278d63470ff2ea05163124c2f971a87416766d098103f85cfc0a0340bd9d0aa9209d200890197af9 EBUILD scons-4.7.0.ebuild 4583 BLAKE2B f4329429d94022e85d8094b8d94a7f7d82d7c4f81791a6a395b2b7368626ed71b7ad74fc4b0ccf99feb44605256358aa4c1e896959186903f24839cb21507ffd SHA512 bb9a6fa13caecd7062afe05512b71279754f44386ceccd559bc4e68ef8bae0c21b15e953bf9c075d3b67fb4137dd97bc546169afd981af548b4518fff3cd926e +EBUILD scons-4.8.0.ebuild 4557 BLAKE2B bf2196cc046e5a0295206e59564c3f4c54d4cd25e8ced0c1341fa96e2d2091bb24378beacbc9af9e4d347e7fad100ffd8f83a3de4ac83e096b46004eb0c96a5a SHA512 9f1c70d1f939fb9f4df86f4ae29b38e37c2e87511a8a68852decce1423785494c1176dabb62487495d06a1e53372b734a30e9eb635afa87f502c063ef8f8a08c MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad diff --git a/dev-build/scons/scons-4.8.0.ebuild b/dev-build/scons/scons-4.8.0.ebuild new file mode 100644 index 000000000000..117d1d2f43a7 --- /dev/null +++ b/dev-build/scons/scons-4.8.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 multiprocessing + +MY_P="SCons-${PV}" +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE=" + https://www.scons.org/ + https://github.com/SCons/scons/ + https://pypi.org/project/SCons/ +" +SRC_URI=" + https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz + doc? ( + https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf + -> ${P}-user.pdf + https://www.scons.org/doc/${PV}/HTML/${PN}-user.html + -> ${P}-user.html + ) + test? ( + https://github.com/SCons/scons/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + ) +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ) +" + +src_unpack() { + # use the git directory structure, then unpack the pypi tarball + # on top of it to make our life easier + if use test; then + unpack "${P}.gh.tar.gz" + else + mkdir -p "${P}" || die + fi + + tar -C "${P}" --strip-components=1 --no-same-owner \ + -xzf "${DISTDIR}/${MY_P}.tar.gz" || die +} + +src_prepare() { + distutils-r1_src_prepare + + # TODO: rebase the patches <4.5.1-r2 is gone + # support env passthrough for Gentoo ebuilds + eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch + + if use test; then + local remove_tests=( + # TODO: does not respect PATH? + test/Clang + # broken + test/DVIPDF/DVIPDFFLAGS.py + test/Java/swig-dependencies.py + test/Java/multi-step.py + test/TEX/newglossary.py + test/TEX/variant_dir_newglossary.py + test/Configure/option--config.py + test/D/HSTeoh/sconstest-linkingProblem_gdc.py + # broken by commas in date, sic! + test/option/option-v.py + test/Interactive/version.py + # warnings from new binutils? + test/AS/as-live.py + test/AS/nasm.py + # hangs + test/KeyboardInterrupt.py + # requires f77 executable + test/Fortran/F77PATH.py + test/Fortran/FORTRANPATH.py + test/Fortran/gfortran.py + # TODO, these seem to be caused by our patches + test/Repository/include.py + test/Repository/multi-dir.py + test/Repository/variants.py + test/virtualenv/activated/option/ignore-virtualenv.py + # broken by CC being set? *facepalm* + test/LINK/applelink.py + test/ToolSurrogate.py + # no clue but why would we care about rpm? + test/packaging/option--package-type.py + test/packaging/rpm/cleanup.py + test/packaging/rpm/internationalization.py + test/packaging/rpm/multipackage.py + test/packaging/rpm/package.py + test/packaging/rpm/tagging.py + # apparently fragile to... limits? + # https://bugs.gentoo.org/908347#c7 + test/builderrors.py + ) + + if ! use amd64 && ! use x86 ; then + # These tests are currently broken on arm and other non-amd64/x86 platforms + # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to + # better plumb up the MSVC tests for alternative arches. + # Try again after 4.2.0. + # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html + # bug #757534 + remove_tests+=( + test/MSVS/vs-7.0-scc-files.py + test/MSVS/vs-7.0-scc-legacy-files.py + test/MSVS/vs-7.1-scc-files.py + test/MSVS/vs-7.1-scc-legacy-files.py + test/MSVS/vs-scc-files.py + test/MSVS/vs-scc-legacy-files.py + ) + fi + + rm -r "${remove_tests[@]}" || die + fi +} + +python_test() { + local -x COLUMNS=80 + # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env + local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 + # unset some env variables to pass appropriate tests + unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + cd "${WORKDIR}/${P}" || die + "${EPYTHON}" runtest.py -a --passed \ + -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" + + # runtest.py script returns "0" if all tests are passed + # and returns "2" if there are any tests with "no result" + # (i.e. in case if some tools are not installed or it's Windows specific tests) + [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" + + # sigh + rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die +} + +python_install_all() { + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} +} diff --git a/dev-build/slibtool/Manifest b/dev-build/slibtool/Manifest index df71d91f465e..c7d8f99efe40 100644 --- a/dev-build/slibtool/Manifest +++ b/dev-build/slibtool/Manifest @@ -2,7 +2,10 @@ DIST slibtool-0.5.35.tar.xz 87964 BLAKE2B cd01e3dc479cde2ffd8b58c51273b6c6f50305 DIST slibtool-0.5.35.tar.xz.sig 833 BLAKE2B 597d5beb51f650643f1ef1c8f576200ccda154e9428e5097c2236e8d71992a4c9c39d44c1325f9f1265e1cfa49f08581546c0b0f8019c7796ce9271219480753 SHA512 2a7333997802ef56a57bf32fbfce17030c1dd732c9066bec94d0719cbda3dc85e896a0221e43065fc3ed35ee852942a5f7c270d56276706b9f0fdb7f4d091ef8 DIST slibtool-0.5.36.tar.xz 119504 BLAKE2B 62c58b291573094d480176c2cbb38e161fe4f9ec5beb27d519eea6ca92191dc4bd5088226e2905393318108631cfcbfd1522af9372da0466932211439cf2081a SHA512 afdbef68f25c2079fb1e900052bb8d8cb3b5db67ca2a43ec144d0b6de76ff3452b09ce380acf58ce3d5a71c597ce6d5a9dbfacb5cb6134a71f7f863760e43cdb DIST slibtool-0.5.36.tar.xz.sig 833 BLAKE2B 0eb52ee00098e7e9e0c31520b0b5fb5d8441fb3aee372b01caa78c6667ee476d6f18d64bfc15980509826ceb275b5a8411ae140f75149c8e13d33d4a89212984 SHA512 6858230c0aa599021ff1cce622f7fd6abba82c5343a798915d4a43a9fa21119f70d38935aed00617930468adc82f7d3291c8c3da42a06f8153102fb188427bc6 +DIST slibtool-0.6.0.tar.xz 128216 BLAKE2B 9b21b73c1d911b11e280040fb8af076a80548b7361e11332b2e13a566e24b641b9a1ab4234b7addfa7405a560697eec39a4f7be4df073dba834223133b01628e SHA512 4615b139bd0f9c4735b7c6082e32e7954c96881f06960cd1aa375820fa0f07f720a43e667228a10b3af88db149a1a03f4e91a5a8ac08b16e3e5564709eec8f7d +DIST slibtool-0.6.0.tar.xz.sig 833 BLAKE2B 7996dc6162d007036ce3a351dfd356dcd0202739448f6d3f9994e193dcd5d1889ef98df60c5a04650d00363741f7cd22f680f91aae9dca46e906d12bb7936dcd SHA512 f4c49d97ccc931ab20b1f51c914155ae7386c72e471329eaa4d544425e683febf78de2772544bbc55f21cdafc16f0ce226df7d47abe87ac5101525b306665a29 EBUILD slibtool-0.5.35.ebuild 1091 BLAKE2B 1cae0fdc89a89a978068929c7bce231501b3449151be39ec45836ddee6eee4f74d7eb677d4d8ba883ba9e7f9f229336a8a921399c194cd154477b0bb45627b3e SHA512 db1baf0c5ae89bab1e863cee5b11a9a5992ed7070005d54651a3f256ba23f84c5814ba9a5dc9401b7e50788fa36069b8a86b93de11067ab085ee28e1981549d8 -EBUILD slibtool-0.5.36.ebuild 1110 BLAKE2B 5f0a44b43720a3ad6c1c304a19fce0afe00df879d27345eb288539cce41b31ab718ee99213f9e7ea816f5b6ca77bd7542a0ca86f3821b8cb17fb4e375cd20c54 SHA512 78ed2d61078c797999015d29246933e4c0a18bf35df71735bcb52a46a9986c017d4b99282c77f5f5538d1b0848ae084028ebe2f5518cf12b1b81d0db8d80ccce +EBUILD slibtool-0.5.36.ebuild 1102 BLAKE2B 20afc1f9f78d110de2f7ce57c1fe0381f687a49102d18b0d604fae1c419e87f48decde7b6b3d04fd593e252ed9d12ff07093382158edf7a0ca1238a11296f7ea SHA512 1004ec5c5d64c275969254aa6ab2761ffa7aeb327a163c5f429533abdd6aaeae264396f135e32f9604cd28bfa0ff52a1b37c5d0173ca891d496e23be6f04bbec +EBUILD slibtool-0.6.0.ebuild 1110 BLAKE2B 5f0a44b43720a3ad6c1c304a19fce0afe00df879d27345eb288539cce41b31ab718ee99213f9e7ea816f5b6ca77bd7542a0ca86f3821b8cb17fb4e375cd20c54 SHA512 78ed2d61078c797999015d29246933e4c0a18bf35df71735bcb52a46a9986c017d4b99282c77f5f5538d1b0848ae084028ebe2f5518cf12b1b81d0db8d80ccce EBUILD slibtool-9999.ebuild 1110 BLAKE2B 5f0a44b43720a3ad6c1c304a19fce0afe00df879d27345eb288539cce41b31ab718ee99213f9e7ea816f5b6ca77bd7542a0ca86f3821b8cb17fb4e375cd20c54 SHA512 78ed2d61078c797999015d29246933e4c0a18bf35df71735bcb52a46a9986c017d4b99282c77f5f5538d1b0848ae084028ebe2f5518cf12b1b81d0db8d80ccce MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5 diff --git a/dev-build/slibtool/slibtool-0.5.36.ebuild b/dev-build/slibtool/slibtool-0.5.36.ebuild index f1551f5cf160..cedee9e5dcb0 100644 --- a/dev-build/slibtool/slibtool-0.5.36.ebuild +++ b/dev-build/slibtool/slibtool-0.5.36.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz" SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" fi BDEPEND="sys-devel/m4" diff --git a/dev-build/slibtool/slibtool-0.6.0.ebuild b/dev-build/slibtool/slibtool-0.6.0.ebuild new file mode 100644 index 000000000000..f1551f5cf160 --- /dev/null +++ b/dev-build/slibtool/slibtool-0.6.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# git.foss21.org is the official repository per upstream +DESCRIPTION="A strong libtool implementation, written in C" +HOMEPAGE="https://git.foss21.org/slibtool" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.foss21.org/slibtool" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/midipix.asc + inherit verify-sig + + SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz" + SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +fi + +BDEPEND="sys-devel/m4" + +if [[ ${PV} != *9999 ]] ; then + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-midipix-20240315 )" +fi + +LICENSE="MIT" +SLOT="0" + +src_configure() { + # Custom configure script (not generated by autoconf) + ./configure \ + --compiler="$(tc-getCC)" \ + --host=${CHOST} \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + || die +} diff --git a/dev-build/xfce4-dev-tools/Manifest b/dev-build/xfce4-dev-tools/Manifest index 8225a41cb1f5..610145cc88d7 100644 --- a/dev-build/xfce4-dev-tools/Manifest +++ b/dev-build/xfce4-dev-tools/Manifest @@ -1,5 +1,7 @@ DIST xfce4-dev-tools-4.18.1.tar.bz2 363652 BLAKE2B f78c39de833353aecd57db6d199a2bdb1a478eff996732653f49199cf8b9c6d54c02c969f823ebc441415fb6376d588e79796bcaa48bb4349c3d54068d86622b SHA512 8fa65aa57450d3e65ef55bf86e8a113c06e64289a9f71875049b422da2a8bdfcdd36c3a3e94a3c0e7c602a3e9577eca14d63318489f81fd88d6743e188636304 DIST xfce4-dev-tools-4.19.0.tar.bz2 368601 BLAKE2B 349e3dcf69c1fc1f0af052546d78b86ffc89ca81b66c27e8b7058f549adb0c6a16e6c462a6f5e00e66dc4b419dd2ea7fa43c210d83153e23254b8b5ae5a77fbf SHA512 7372efcb686fe6c1e42f17564d693cbe24792d00fbf131faff46040c8940ad355067d4a4cc5d5de5ec6b9707943c5db5de84eee4a4ff894ef8c33c3616a26044 +DIST xfce4-dev-tools-4.19.1.tar.bz2 373780 BLAKE2B 9a29d195b63c01bf33235dcaffb28f904e1f7833cca40b0a78439548f4425a0a3d93dd7a885c7060abc96498a05a3b320abbf6d75789f003f74c0804e6c9f5db SHA512 87d36e05f222e05cb9437dde4ca12964aec85ae2766a899e486dd3050df19482cdf4b70b7a5a74389f275e8328e815a72de772f3fae486d48b6f12c9ac2b5de9 EBUILD xfce4-dev-tools-4.18.1.ebuild 666 BLAKE2B 520866f280714c789a29559a72f5a43263725457492b0ef2a8fd7561efb28493a05305b21df7abbbb180bb2cd1282dd910fd9c8bdfc1e45e54a4230f04e9f016 SHA512 22553bcd50e2296f3d36b27f6263c15e165f8488ee9a013ce4645a9454435ddf931469fcd23750e03518153b1bba3e7503f2f4215aa0c47d2cd27b2172dca075 EBUILD xfce4-dev-tools-4.19.0.ebuild 672 BLAKE2B 4dacbafb5a5cbb92fa8358fb2b2408e0a97dc8475bf5b6dc5fbd9ff9fe5eead5ba1c983ce7122de70914e68a06d3aa761d7452aa380eb1b112c831eafbe18f0f SHA512 1023fee5ab09413b836178c626881557172c7607adfb03f2e6fab537729cbd71c0bb243445950b4c4c3e66324a1a523204ea948e71c68c43c4be5c77147c787b +EBUILD xfce4-dev-tools-4.19.1.ebuild 672 BLAKE2B 4dacbafb5a5cbb92fa8358fb2b2408e0a97dc8475bf5b6dc5fbd9ff9fe5eead5ba1c983ce7122de70914e68a06d3aa761d7452aa380eb1b112c831eafbe18f0f SHA512 1023fee5ab09413b836178c626881557172c7607adfb03f2e6fab537729cbd71c0bb243445950b4c4c3e66324a1a523204ea948e71c68c43c4be5c77147c787b MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5 diff --git a/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.19.1.ebuild b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.19.1.ebuild new file mode 100644 index 000000000000..2bdd5084a92f --- /dev/null +++ b/dev-build/xfce4-dev-tools/xfce4-dev-tools-4.19.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance" +HOMEPAGE=" + https://docs.xfce.org/xfce/xfce4-dev-tools/start + https://gitlab.xfce.org/xfce/xfce4-dev-tools/ +" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + +DEPEND=" + >=dev-libs/glib-2.66.0 +" +RDEPEND=" + ${DEPEND} +" +# libxslt for xsltproc +BDEPEND=" + dev-libs/libxslt + virtual/pkgconfig +" |