From 5eafc18acbca8ecc75a5f483ca19f651684ab3f8 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 20:31:03 +0300 Subject: [PATCH 01/22] media-libs/sge: EAPI 6->8, refactor Closes: https://bugs.gentoo.org/724426 Signed-off-by: Arthur Zamarin --- ...sge-030809.ebuild => sge-030809-r1.ebuild} | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) rename media-libs/sge/{sge-030809.ebuild => sge-030809-r1.ebuild} (63%) diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809-r1.ebuild similarity index 63% rename from media-libs/sge/sge-030809.ebuild rename to media-libs/sge/sge-030809-r1.ebuild index 8847d3d6aa9da..69825f10f625e 100644 --- a/media-libs/sge/sge-030809.ebuild +++ b/media-libs/sge/sge-030809-r1.ebuild @@ -1,28 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -MY_P="sge${PV}" DESCRIPTION="Graphics extensions library for SDL" HOMEPAGE="http://www.etek.chalmers.se/~e8cal1/sge/" -SRC_URI="http://www.etek.chalmers.se/~e8cal1/sge/files/${MY_P}.tar.gz" +SRC_URI="http://www.etek.chalmers.se/~e8cal1/sge/files/sge${PV}.tar.gz" +S=${WORKDIR}/sge${PV} LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~ia64 ppc x86" IUSE="doc examples image truetype" -RDEPEND="media-libs/libsdl +DEPEND=" + media-libs/libsdl image? ( media-libs/sdl-image ) - truetype? ( >=media-libs/freetype-2 )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" + truetype? ( >=media-libs/freetype-2 ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-build.patch @@ -33,18 +32,14 @@ PATCHES=( src_prepare() { default - sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile || die - sed -i \ - -e '/^CC=/d' \ - -e '/^CXX=/d' \ - -e '/^AR=/d' \ - Makefile.conf || die - tc-export CC CXX AR PKG_CONFIG - # make sure the header gets regenerated everytime + sed "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" -i Makefile || die + sed -e '/^CC=/d' -e '/^CXX=/d' -e '/^AR=/d' -i Makefile.conf || die + # make sure the header gets regenerated every time rm -f sge_config.h } src_compile() { + tc-export CC CXX AR PKG_CONFIG emake \ USE_IMG=$(usex image y n) \ USE_FT=$(usex truetype y n) @@ -63,4 +58,6 @@ src_install() { dodoc -r examples docompress -x /usr/share/doc/${PF}/examples fi + + find "${ED}" -type f -name '*.a' -delete || die } From e5a4d03f1a67200bad90d8224a05d64790c69496 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 20:34:55 +0300 Subject: [PATCH 02/22] media-libs/sge: unkeyword 030809-r1 for ppc, ~ia64 Signed-off-by: Arthur Zamarin --- media-libs/sge/sge-030809-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/sge/sge-030809-r1.ebuild b/media-libs/sge/sge-030809-r1.ebuild index 69825f10f625e..3148ce491859c 100644 --- a/media-libs/sge/sge-030809-r1.ebuild +++ b/media-libs/sge/sge-030809-r1.ebuild @@ -12,7 +12,7 @@ S=${WORKDIR}/sge${PV} LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc x86" +KEYWORDS="amd64 x86" IUSE="doc examples image truetype" DEPEND=" From d5b80ba604aa9580f3a5cafc555a1587a56a728f Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 20:37:00 +0300 Subject: [PATCH 03/22] media-gfx/dawn: unkeyword 3.90b-r1 for ppc, ~hppa Signed-off-by: Arthur Zamarin --- media-gfx/dawn/dawn-3.90b-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild index 8a48d386661e6..8b357419a12a4 100644 --- a/media-gfx/dawn/dawn-3.90b-r1.ebuild +++ b/media-gfx/dawn/dawn-3.90b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ~hppa ppc x86" +KEYWORDS="amd64 x86" IUSE="doc opengl X" RDEPEND="dev-lang/tk:* From 6062c2107c062dda19a9b518af33f2807298f1c3 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Thu, 20 Jun 2024 12:38:24 -0500 Subject: [PATCH 04/22] app-admin/ansible-core: drop 2.16.5 Signed-off-by: Matthew Thode --- app-admin/ansible-core/Manifest | 1 - .../ansible-core/ansible-core-2.16.5.ebuild | 54 ------------------- 2 files changed, 55 deletions(-) delete mode 100644 app-admin/ansible-core/ansible-core-2.16.5.ebuild diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest index 6817e3bf783e0..7e221604ba61f 100644 --- a/app-admin/ansible-core/Manifest +++ b/app-admin/ansible-core/Manifest @@ -1,4 +1,3 @@ DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f -DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8 DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 diff --git a/app-admin/ansible-core/ansible-core-2.16.5.ebuild b/app-admin/ansible-core/ansible-core-2.16.5.ebuild deleted file mode 100644 index 51f3b5d36db1e..0000000000000 --- a/app-admin/ansible-core/ansible-core-2.16.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ansible/ansible.git" - EGIT_BRANCH="devel" -else - inherit pypi - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - Date: Thu, 20 Jun 2024 12:38:48 -0500 Subject: [PATCH 05/22] app-admin/ansible: drop 9.3.0 Signed-off-by: Matthew Thode --- app-admin/ansible/Manifest | 1 - app-admin/ansible/ansible-9.3.0.ebuild | 29 -------------------------- 2 files changed, 30 deletions(-) delete mode 100644 app-admin/ansible/ansible-9.3.0.ebuild diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index c196639894541..ce75636054e74 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,4 +1,3 @@ DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983 -DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2 diff --git a/app-admin/ansible/ansible-9.3.0.ebuild b/app-admin/ansible/ansible-9.3.0.ebuild deleted file mode 100644 index 51baea072b8f9..0000000000000 --- a/app-admin/ansible/ansible-9.3.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# 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..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -RESTRICT="test" - -RDEPEND=">=app-admin/ansible-core-2.16.0 - Date: Thu, 20 Jun 2024 17:40:48 +0000 Subject: [PATCH 06/22] dev-java/guava-testlib: Stabilize 33.2.0 arm64, #934613 Signed-off-by: Arthur Zamarin --- dev-java/guava-testlib/guava-testlib-33.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild index 7d4920654c607..455a698a2b3a0 100644 --- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" CP_DEPEND=" >=dev-java/error-prone-annotations-2.27.1:0 From 7a0aa2f5f12ff743766039a57d8eb83f322be555 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:40:49 +0000 Subject: [PATCH 07/22] dev-java/error-prone-annotations: Stabilize 2.27.1-r1 arm64, #934613 Signed-off-by: Arthur Zamarin --- .../error-prone-annotations-2.27.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild index 2847cfeb66de5..c47d401ba014b 100644 --- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" From 58bbf0b3b40ebb94a4ce97df937dd4633ddecbb7 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:40:49 +0000 Subject: [PATCH 08/22] dev-java/guava: Stabilize 33.2.0 arm64, #934613 Signed-off-by: Arthur Zamarin --- dev-java/guava/guava-33.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/guava/guava-33.2.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild index 60d46995dfd45..b07cb4afebe13 100644 --- a/dev-java/guava/guava-33.2.0.ebuild +++ b/dev-java/guava/guava-33.2.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" CP_DEPEND=" >=dev-java/error-prone-annotations-2.27.1:0 From aa2b093229339f50ce47e0bbc7b3efe5bad0b49f Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:40:50 +0000 Subject: [PATCH 09/22] dev-java/checker-framework-qual: Stabilize 3.43.0 arm64, #934613 Signed-off-by: Arthur Zamarin --- .../checker-framework-qual/checker-framework-qual-3.43.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild index 0aad1b2bb14ad..46bc7ba222526 100644 --- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" From 2eecc8427981f281659d631fe5725ab0eb72e60f Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:40:50 +0000 Subject: [PATCH 10/22] dev-java/j2objc-annotations: Stabilize 3.0.0-r1 arm64, #934613 Signed-off-by: Arthur Zamarin --- dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild index 65139f002b2dc..8a0a0a4e73ddb 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/j2objc-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" From 44d46e2703d097c49ebfeb48ce753936734d5f66 Mon Sep 17 00:00:00 2001 From: Violet Purcell Date: Wed, 19 Jun 2024 00:07:30 -0400 Subject: [PATCH 11/22] profiles: only mask clang-runtime[sanitize] on 32-bit musl profiles The issue in the bug is only an issue on 32-bit musl platforms, not on 64-bit. The original mask was overzealous, narrow the mask to arm, ppc, and x86. Bug: https://bugs.gentoo.org/928936 Signed-off-by: Violet Purcell Closes: https://github.com/gentoo/gentoo/pull/37212 Signed-off-by: Sam James --- .../default/linux/arm/23.0/musl/package.use.stable.mask | 5 +++++ profiles/default/linux/ppc/23.0/musl/package.use.mask | 7 ++++++- profiles/default/linux/x86/23.0/i486/musl/package.use.mask | 6 +++++- profiles/default/linux/x86/23.0/i686/musl/package.use.mask | 5 +++++ profiles/features/musl/package.use.mask | 5 ----- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask index c021f45d85089..785b52ceb864c 100644 --- a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask +++ b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask @@ -1,6 +1,11 @@ # Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 +# Sam James (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Andreas K. Hüttel (2024-03-20) # Does not compile with musl-1.2.4 sys-devel/gcc sanitize diff --git a/profiles/default/linux/ppc/23.0/musl/package.use.mask b/profiles/default/linux/ppc/23.0/musl/package.use.mask index 80fbaf3654a78..c7d54156ade07 100644 --- a/profiles/default/linux/ppc/23.0/musl/package.use.mask +++ b/profiles/default/linux/ppc/23.0/musl/package.use.mask @@ -1,6 +1,11 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Sam James (2023-01-29) # Fails to build on combination of ppc* + musl because of mcontext. # libsanitizer needs adapting, bug #892079. diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask index 3ced25c302358..0f0f54b0e2d28 100644 --- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask +++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 +# Sam James (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Ian Jordan (2024-05-20) # Does not compile with musl-1.2.4+ sys-devel/gcc sanitize @@ -10,4 +15,3 @@ sys-devel/gcc sanitize # file-5.39-seccomp_sandbox.patch is okay # file-5.39-portage_sandbox.patch is broken sys-apps/file seccomp - diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask index d3fa26567c1df..0f0f54b0e2d28 100644 --- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask +++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 +# Sam James (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Ian Jordan (2024-05-20) # Does not compile with musl-1.2.4+ sys-devel/gcc sanitize diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index d20c7dd9c843b..9cb4b9e5ab7b1 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -1,11 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Sam james (2024-06-16) -# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build -# See bug #928936. -sys-devel/clang-runtime sanitize - # Sam James (2024-06-03) # Poor rendering performance otherwise (bug #931215) but it doesn't # work on musl. From 3f871788d99f01fadd15dc84c11b84fc903e8c51 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 18:42:30 +0100 Subject: [PATCH 12/22] dev-python/pygit2: Stabilize 1.15.0 amd64, #933565 Signed-off-by: Sam James --- dev-python/pygit2/pygit2-1.15.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pygit2/pygit2-1.15.0.ebuild b/dev-python/pygit2/pygit2-1.15.0.ebuild index 3f7c79d5cfbcd..35a884a0357af 100644 --- a/dev-python/pygit2/pygit2-1.15.0.ebuild +++ b/dev-python/pygit2/pygit2-1.15.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="~amd64 ~riscv x86" +KEYWORDS="amd64 ~riscv x86" DEPEND=" Date: Thu, 20 Jun 2024 18:42:31 +0100 Subject: [PATCH 13/22] dev-java/guava-testlib: Stabilize 33.2.0 x86, #934613 Signed-off-by: Sam James --- dev-java/guava-testlib/guava-testlib-33.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild index 455a698a2b3a0..36e9f33bc7c0d 100644 --- a/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild +++ b/dev-java/guava-testlib/guava-testlib-33.2.0.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/guava-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" CP_DEPEND=" >=dev-java/error-prone-annotations-2.27.1:0 From c32e0ac5d8f6977adc490ed1d35d9a4fe21e8864 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 18:42:32 +0100 Subject: [PATCH 14/22] dev-java/error-prone-annotations: Stabilize 2.27.1-r1 x86, #934613 Signed-off-by: Sam James --- .../error-prone-annotations-2.27.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild index c47d401ba014b..3eb662a19275d 100644 --- a/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild +++ b/dev-java/error-prone-annotations/error-prone-annotations-2.27.1-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/error-prone-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" From eb375e3dc813cc96b2227ef2553f6019d0d4e3e9 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 18:42:33 +0100 Subject: [PATCH 15/22] dev-java/guava: Stabilize 33.2.0 x86, #934613 Signed-off-by: Sam James --- dev-java/guava/guava-33.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/guava/guava-33.2.0.ebuild b/dev-java/guava/guava-33.2.0.ebuild index b07cb4afebe13..1ab9233201a27 100644 --- a/dev-java/guava/guava-33.2.0.ebuild +++ b/dev-java/guava/guava-33.2.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" CP_DEPEND=" >=dev-java/error-prone-annotations-2.27.1:0 From 5e4a003c60134d8d8284392db852982713ec87a4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 18:42:33 +0100 Subject: [PATCH 16/22] dev-java/checker-framework-qual: Stabilize 3.43.0 x86, #934613 Signed-off-by: Sam James --- .../checker-framework-qual/checker-framework-qual-3.43.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild index 46bc7ba222526..1aacb874087d6 100644 --- a/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild +++ b/dev-java/checker-framework-qual/checker-framework-qual-3.43.0.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/checker-framework-checker-framework-${PV}/checker-qual" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" From fbcd5c7537ac1c486a6e48c3460d7eb6f119b0a5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Jun 2024 18:42:34 +0100 Subject: [PATCH 17/22] dev-java/j2objc-annotations: Stabilize 3.0.0-r1 x86, #934613 Signed-off-by: Sam James --- dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild index 8a0a0a4e73ddb..73377205fbddd 100644 --- a/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild +++ b/dev-java/j2objc-annotations/j2objc-annotations-3.0.0-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/j2objc-${PV}/annotations" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" From 68a3e6fa099c54e2cb1bb3c74aa62199d5849785 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 20:40:23 +0300 Subject: [PATCH 18/22] media-gfx/dawn: last-rite Bug: https://bugs.gentoo.org/934619 Signed-off-by: Arthur Zamarin --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index f061b91f537cf..74c1ceda86daf 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,11 @@ #--- END OF EXAMPLES --- +# Arthur Zamarin (2024-06-20) +# EAPI=6, no reverse dependencies, waiting for a version bump. +# Removal on 2024-07-20. Bugs #934619, #730758, #713760. +media-gfx/dawn + # Jakov Smolić (2024-06-18) # Outdated by several versions, very difficult to package due to the # complicated Cargo dependency management. From f3dc015771448bdf8756b3b97876be00c58ebee7 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:43:31 +0000 Subject: [PATCH 19/22] dev-php/PEAR-Net_Socket: Stabilize 1.2.2-r1 arm, #934614 Signed-off-by: Arthur Zamarin --- dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2-r1.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2-r1.ebuild index 74c922beabfc6..153096132e147 100644 --- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2-r1.ebuild +++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2-r1.ebuild @@ -9,6 +9,6 @@ DESCRIPTION="PHP class interface to TCP sockets" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~amd64 arm ~hppa ~ppc64 ~s390 ~sparc ~x86" RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" From dd2559722a2dacff93d718324914c424d365ccb6 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:43:31 +0000 Subject: [PATCH 20/22] dev-php/pear: Stabilize 1.10.3-r1 ALLARCHES, #934616 Signed-off-by: Arthur Zamarin --- dev-php/pear/pear-1.10.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pear/pear-1.10.3-r1.ebuild b/dev-php/pear/pear-1.10.3-r1.ebuild index 38f129c3618ee..5518945658854 100644 --- a/dev-php/pear/pear-1.10.3-r1.ebuild +++ b/dev-php/pear/pear-1.10.3-r1.ebuild @@ -8,6 +8,6 @@ HOMEPAGE="https://pear.php.net/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc64 ~s390 sparc x86" RDEPEND=">=dev-php/PEAR-PEAR-${PVR}" From 647324ec09e2bc6347966aaf0c49b9ef45aaa7b5 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:43:32 +0000 Subject: [PATCH 21/22] dev-php/PEAR-Auth_SASL: Stabilize 1.2.0 arm, #934618 Signed-off-by: Arthur Zamarin --- dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild index 363344d6e784c..bc10fbc3d4fe5 100644 --- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild +++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.2.0.ebuild @@ -9,5 +9,5 @@ DESCRIPTION="Abstraction of various SASL mechanism responses" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~amd64 arm ~hppa ~ppc64 ~s390 ~sparc ~x86" RDEPEND="dev-php/PEAR-PEAR" From b5c312ba7d00aa72d8a1ba829135a4cd82388e3a Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Thu, 20 Jun 2024 17:43:44 +0000 Subject: [PATCH 22/22] dev-php/PEAR-Structures_Graph: Stabilize 1.2.0 arm, #934617 Signed-off-by: Arthur Zamarin --- .../PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild index f4f914046d5a5..61e763f84c3c1 100644 --- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild +++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.2.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://pear.php.net/get/${MY_P}.tgz" S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~hppa ~ppc64 ~s390 ~sparc ~x86" RDEPEND="dev-lang/php:*" PDEPEND="dev-php/PEAR-PEAR"