diff --git a/sys-devel/gcc-arm-none-eabi/Manifest b/sys-devel/gcc-arm-none-eabi/Manifest
index 3f3e92124..13ac340f9 100644
--- a/sys-devel/gcc-arm-none-eabi/Manifest
+++ b/sys-devel/gcc-arm-none-eabi/Manifest
@@ -2,5 +2,3 @@ DIST arm-gnu-toolchain-12.2.rel1-aarch64-arm-none-eabi.tar.xz 147612960 BLAKE2B
DIST arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz 155407328 BLAKE2B 8efcbbc93c630bfe8a9ec380b555d4b2a2444a525477ee827cfc6a07dacb0b504058a1ea3786601d8996a2d1abb5e42c3c2f1d6d28fdb4a15998053ca9e63a45 SHA512 2f6756c1c5de0bf800faaff9de5bb95254ff8634c0c0cfa417865823bd9df1f25af186d6fbc381f89ee60bcb4ed055339f9500c04cbe2537ac640679d2680336
DIST arm-gnu-toolchain-13.2.Rel1-aarch64-arm-none-eabi.tar.xz 176409124 BLAKE2B cfd2d00fb7a8ab43e9bb91cb29727e1528468acefb04495ebe729692375bf3bac08b16a844b040e77140862291c7ef7186ecd5e96e109b95db362af1a2c287a2 SHA512 ce2645690887ffbd50b823ccfea114dad389352b02075d7376568528b0949914b09d99df578a3666ad771d77055d2426f3a0319543fe279a716e2b813e4b6063
DIST arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi.tar.xz 179347712 BLAKE2B 1582ebccb3a554b14bd3b44279b09ce67aed47697fe5c53c611efa594d84e0e1d50bddd1ec4cdb06e5474edf1e8cf56bb1e2972e726cbdb2a7e2ebde005c9e37 SHA512 12f189b910ec6212a1905212d9ed403ffe912831de448da942a736cd040e039af0489f7c99b469571ffc09fd2cb8b61870037434af29925ab08ef1f672aff42c
-DIST gcc-arm-none-eabi-10.3-2021.10-aarch64-linux.tar.bz2 168772350 BLAKE2B 2b62821e07ded92f18575085b8e43baeed941191df3fbe8483c63d0e109c29ce18e528cea5a8208d585e122f2032a511ff11d6a2b4be0e93d64b57e76a7426a2 SHA512 3bf11934cf47935a659c8d69d38a6c01b86ba3097101e3fd2d11118ab239c7a083d612845cc3db81ae10ce83a17039024a7150d6db2792d5b84f4da4a7b67309
-DIST gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 157089706 BLAKE2B 52b1747b3a9ef8a608c4f235821d221719fdc9bfe1ad47cc56a8807a16e50113809cd7dc937ba17caee8a6bdb57bbcab472c74e6656cf54fbbbc9c93a4f02b53 SHA512 34f23fe41a82cdeebe866ebd91d7d6e579e82b3dd4e653f49eb814a2d7d83f9f6c8ea2ccdef709428072bd65c8f259a3a38def31338fbab43d05f308b71a8df7
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
deleted file mode 100644
index d5b32e3c3..000000000
--- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.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
-
-#https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004
-#major/update
-#MY_PV1="$(ver_cut 1)-$(ver_cut 2)-q$(ver_cut 3)-major"
-#MY_PV2="$(ver_cut 1)-$(ver_cut 2)q$(ver_cut 3)"
-AVC=( $(ver_rs 1- ' ') )
-MY_PV="${AVC[0]}.${AVC[1]}-${AVC[3]:0:4}.${AVC[3]:4:5}"
-
-DESCRIPTION="GNU Arm Embedded Toolchain"
-HOMEPAGE="https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"
-
-#SRC_SUFFIX="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm"
-#SRC_URI="amd64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi--x86_64-linux.tar.bz2 )
-# arm64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi-${MY_PV1}-aarch64-linux.tar.bz2 )"
-SRC_URI="amd64? ( https://developer.arm.com/-/media/Files/downloads/gnu-rm/${MY_PV}/gcc-arm-none-eabi-${MY_PV}-x86_64-linux.tar.bz2 )
- arm64? ( https://developer.arm.com/-/media/Files/downloads/gnu-rm/${MY_PV}/gcc-arm-none-eabi-${MY_PV}-aarch64-linux.tar.bz2 )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="python2"
-RESTRICT="strip"
-QA_PREBUILT="*"
-
-RDEPEND="sys-libs/ncurses-compat
- python2? ( dev-lang/python:2.7 )"
-
-src_install() {
- dodir /opt/${PN}
- \cp -r "${S}"/* "${ED}"/opt/${PN}
- use python2 || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py
- fowners -R root:0 /opt/${PN}
-
- local DEST="${EPREFIX}/opt/${PN}"
- cat > "${T}/env" << EOF
-PATH=${DEST}/bin
-ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/lib
-MANPATH=${DEST}/share/doc/arm-arm-none-eabi/man
-EOF
- newenvd "${T}/env" 99gcc-arm-embedded-bin
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- elog "Before use you should run 'env-update' and '. /etc/profile'"
- elog "otherwise you may be missing important environmental variables."
- fi
-}
diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild
index 199743cad..b3cf61822 100644
--- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild
+++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild
@@ -5,32 +5,20 @@ EAPI=8
PYTHON_COMPAT=( python3_{11..12} )
inherit python-r1
-# https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004
-#major/update
-#MY_PV1="$(ver_cut 1)-$(ver_cut 2)-q$(ver_cut 3)-major"
-#MY_PV2="$(ver_cut 1)-$(ver_cut 2)q$(ver_cut 3)"
-
-#AVC=( $(ver_rs 1- ' ') )
-#MY_PV="${AVC[0]}.${AVC[1]}-${AVC[3]:0:4}.${AVC[3]:4:5}"
-
MY_PV="${PV/_p/.rel}"
-#MY_PN="${PN/-bin}"
DESCRIPTION="GNU Arm Embedded Toolchain"
HOMEPAGE="https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"
-#SRC_SUFFIX="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm"
-#SRC_URI="amd64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi--x86_64-linux.tar.bz2 )
-# arm64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi-${MY_PV1}-aarch64-linux.tar.bz2 )"
SRC_URI="amd64? ( https://developer.arm.com/-/media/Files/downloads/gnu/${MY_PV}/binrel/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi.tar.xz )
arm64? ( https://developer.arm.com/-/media/Files/downloads/gnu/${MY_PV}/binrel/arm-gnu-toolchain-${MY_PV}-aarch64-arm-none-eabi.tar.xz )"
-#need:
-# https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz?rev=95edb5e17b9d43f28c74ce824f9c6f10&hash=176C4D884DBABB657ADC2AC886C8C095409547C4
-#actual:
-# https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/gcc-arm-11.3.rel1-x86_64-arm-none-eabi.tar.xz'
+if [[ "${ARCH}" = "amd64" ]]; then
+ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi"
+elif [[ "${ARCH}" = "arm64" ]]; then
+ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-aarch64-arm-none-eabi"
+fi
-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"
@@ -46,7 +34,7 @@ RDEPEND="sys-libs/ncurses-compat:5
src_install() {
dodir /opt/${PN}
- \cp -r "${S}"/* "${ED}"/opt/${PN}
+ cp -r "${S}"/* "${ED}"/opt/${PN}
use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py
fowners -R root:0 /opt/${PN}
diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild
index d757b8702..da8e47ced 100644
--- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild
+++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild
@@ -6,31 +6,21 @@ PYTHON_COMPAT=( python3_{11..12} )
inherit python-r1
# https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004
-#major/update
-#MY_PV1="$(ver_cut 1)-$(ver_cut 2)-q$(ver_cut 3)-major"
-#MY_PV2="$(ver_cut 1)-$(ver_cut 2)q$(ver_cut 3)"
-
-#AVC=( $(ver_rs 1- ' ') )
-#MY_PV="${AVC[0]}.${AVC[1]}-${AVC[3]:0:4}.${AVC[3]:4:5}"
-
MY_PV="${PV/_p/.Rel}"
-#MY_PN="${PN/-bin}"
DESCRIPTION="GNU Arm Embedded Toolchain"
HOMEPAGE="https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"
-#SRC_SUFFIX="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm"
-#SRC_URI="amd64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi--x86_64-linux.tar.bz2 )
-# arm64? ( ${SRC_SUFFIX}/${MY_PV2}/gcc-arm-none-eabi-${MY_PV1}-aarch64-linux.tar.bz2 )"
+# https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
SRC_URI="amd64? ( https://developer.arm.com/-/media/Files/downloads/gnu/${MY_PV}/binrel/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi.tar.xz )
arm64? ( https://developer.arm.com/-/media/Files/downloads/gnu/${MY_PV}/binrel/arm-gnu-toolchain-${MY_PV}-aarch64-arm-none-eabi.tar.xz )"
-#need:
-# https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz?rev=95edb5e17b9d43f28c74ce824f9c6f10&hash=176C4D884DBABB657ADC2AC886C8C095409547C4
-#actual:
-# https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/gcc-arm-11.3.rel1-x86_64-arm-none-eabi.tar.xz'
+if [[ "${ARCH}" = "amd64" ]]; then
+ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi"
+elif [[ "${ARCH}" = "arm64" ]]; then
+ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-aarch64-arm-none-eabi"
+fi
-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"
@@ -46,7 +36,7 @@ RDEPEND="sys-libs/ncurses-compat:5
src_install() {
dodir /opt/${PN}
- \cp -r "${S}"/* "${ED}"/opt/${PN}
+ cp -r "${S}"/* "${ED}"/opt/${PN}
use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py
fowners -R root:0 /opt/${PN}
@@ -55,7 +45,7 @@ src_install() {
PATH=${DEST}/bin
ROOTPATH=${DEST}/bin
LDPATH=${DEST}/lib
-MANPATH=${DEST}/share/doc/arm-arm-none-eabi/man
+MANPATH=${DEST}/share/man
EOF
newenvd "${T}/env" 99gcc-arm-embedded-bin
diff --git a/sys-devel/gcc-arm-none-eabi/metadata.xml b/sys-devel/gcc-arm-none-eabi/metadata.xml
index e0af71015..d55b26a58 100644
--- a/sys-devel/gcc-arm-none-eabi/metadata.xml
+++ b/sys-devel/gcc-arm-none-eabi/metadata.xml
@@ -5,7 +5,4 @@
noone@pentoo.org
No one
-