From b9e81d26ec7c66a065c39cf8e0f5ea22f57095ca Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:49:17 -0400 Subject: [PATCH] gcc-arm-none-eabi: pkgcheck fixes, allow use of 12 and 13 --- profiles/pentoo/base/package.mask | 3 --- .../gcc-arm-none-eabi-10.3_p202110.ebuild | 4 ++-- ...1.ebuild => gcc-arm-none-eabi-12.2_p1-r1.ebuild} | 13 ++++++++----- ...1.ebuild => gcc-arm-none-eabi-13.2_p1-r1.ebuild} | 13 ++++++++----- sys-devel/gcc-arm-none-eabi/metadata.xml | 1 - 5 files changed, 18 insertions(+), 16 deletions(-) rename sys-devel/gcc-arm-none-eabi/{gcc-arm-none-eabi-12.2_p1.ebuild => gcc-arm-none-eabi-12.2_p1-r1.ebuild} (88%) rename sys-devel/gcc-arm-none-eabi/{gcc-arm-none-eabi-13.2_p1.ebuild => gcc-arm-none-eabi-13.2_p1-r1.ebuild} (88%) diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index dc099d61f..7068ef7f1 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -144,9 +144,6 @@ dev-lang/lua:0 #https://bugs.gentoo.org/816453 ~media-libs/codec2-1.0.1 -#okay so this still doesn't work and seems to be riddled with Internal Compiler Errors ->=sys-devel/gcc-arm-none-eabi-11.2_p202202-r2 - #https://github.com/intoolswetrust/jd-cli/issues/81 >dev-java/jcommander-1.32 diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild index 24a8cd713..d5b32e3c3 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 #https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild similarity index 88% rename from sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild rename to sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild index d7158568b..199743cad 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{11..12} ) +inherit python-r1 # https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update @@ -32,19 +34,20 @@ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi" LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB" SLOT="0" KEYWORDS="amd64" -IUSE="python3" +IUSE="python" RESTRICT="strip" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" QA_PREBUILT="*" -RDEPEND="sys-libs/ncurses-compat +RDEPEND="sys-libs/ncurses-compat:5 virtual/libcrypt dev-libs/expat - python3? ( =dev-lang/python-3* )" + python? ( ${PYTHON_DEPS} )" src_install() { dodir /opt/${PN} \cp -r "${S}"/* "${ED}"/opt/${PN} - use python3 || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py + use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py fowners -R root:0 /opt/${PN} local DEST="${EPREFIX}/opt/${PN}" diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild similarity index 88% rename from sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild rename to sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild index 242871e8f..d757b8702 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{11..12} ) +inherit python-r1 # https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update @@ -32,19 +34,20 @@ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi" LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB" SLOT="0" KEYWORDS="amd64" -IUSE="python3" +IUSE="python" RESTRICT="strip" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" QA_PREBUILT="*" -RDEPEND="sys-libs/ncurses-compat +RDEPEND="sys-libs/ncurses-compat:5 virtual/libcrypt dev-libs/expat - python3? ( =dev-lang/python-3* )" + python? ( ${PYTHON_DEPS} )" src_install() { dodir /opt/${PN} \cp -r "${S}"/* "${ED}"/opt/${PN} - use python3 || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py + use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py fowners -R root:0 /opt/${PN} local DEST="${EPREFIX}/opt/${PN}" diff --git a/sys-devel/gcc-arm-none-eabi/metadata.xml b/sys-devel/gcc-arm-none-eabi/metadata.xml index d49d58dcc..e0af71015 100644 --- a/sys-devel/gcc-arm-none-eabi/metadata.xml +++ b/sys-devel/gcc-arm-none-eabi/metadata.xml @@ -7,6 +7,5 @@ Include python 2 support - Include python 3 support