commit:     51d20db15ce6db81dac0e361802115c31044f1c0
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 17:22:58 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May  5 17:22:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d20db1

sys-devel/binutils-hppa64: drop 2.39-r4, 2.40, 2.40-r2

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-devel/binutils-hppa64/Manifest                 |   3 -
 .../binutils-hppa64/binutils-hppa64-2.39-r4.ebuild | 503 ---------------------
 .../binutils-hppa64/binutils-hppa64-2.40-r2.ebuild | 503 ---------------------
 .../binutils-hppa64/binutils-hppa64-2.40.ebuild    | 503 ---------------------
 4 files changed, 1512 deletions(-)

diff --git a/sys-devel/binutils-hppa64/Manifest 
b/sys-devel/binutils-hppa64/Manifest
index e75789b93199..f444f463e3c5 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -2,11 +2,8 @@ DIST binutils-2.37_p1-patches-2.tar.xz 31956 BLAKE2B 
39c48628d0e2d7f3a8cf11be391
 DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B 
a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621
 SHA512 
46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 
5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096
 SHA512 
6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 
19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba
 SHA512 
8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
-DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 
2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7
 SHA512 
4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd
 DIST binutils-2.39-patches-6.tar.xz 92380 BLAKE2B 
39f490f1134fb0e7dc80924a280d3113efe0ed094ee15de97c42ab751c83d2f5aa7448966d8cbbcde722b2af4999a36c1e5aa2f37ca6d2e3942b97b6d90ff152
 SHA512 
213cd7a86da83987966675f3195e843d898ca4ff412dfc29fd33ed80adb7bbf80a0b2919cd8e7dd49208c73a621ab7b720970f2259418bdc82ed2a568ff62064
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B 
ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f
 SHA512 
68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
-DIST binutils-2.40-patches-1.tar.xz 12260 BLAKE2B 
d525502e08012080417634fd41981550362d4d799952e89f388af2a6e5db5b80e88bfdb0b5b1d2a1bcf8ebda529eefbced8fa2ae84c7fe3ddb10184e98d4b369
 SHA512 
140f80be786511f63651e67bf25c2992de6a21bac00a3252dcf98becc3f9379c8070ef1380d5542bbf2e1908c50dab2c7ebb651d13bb97609594fe9fd9f1f079
-DIST binutils-2.40-patches-2.tar.xz 183760 BLAKE2B 
447f1c40ac8212b1e91f6f2137f87958c3f4e2366b11b9979d9d09d52e9fcde9a9d74f0c1871616157e001f505849fceb2097a512f434b9c848885e367a07c35
 SHA512 
30efbfcbd2d936c74d9480e4f2f4b8dcd30abcd0f1b22d21d20558002fdb8c90bd2fe97e3f27c2905714dcfd1297cac2646ede1e2c3d9fbf159f93c8cf01a290
 DIST binutils-2.40-patches-3.tar.xz 259432 BLAKE2B 
03b9024e658a5860d54b9087f3e1cc4b417a2501d6a1744c44759bbc99cabd5938058ba2909b16cc999208187998094aa6ab5464e5ed54b87ea0b1eef007e85c
 SHA512 
f2f3e38f5c0c2928ed0588ee42be74d43486d209b43249f73ae133c4c1f81491c86b14df2ddecbc37df6fe80b27b0eab6c3f319e44854e91596dfbd3ec37b8aa
 DIST binutils-2.40-patches-4.tar.xz 264420 BLAKE2B 
70acdc15f64a45cda49ebd7c252d909db2fe659f5c2c0866c50fd710415fd34bd88f9c5cd5ba07beef1e7de7fe827bb40f835fb79ff10e00fc50451e3a8cab33
 SHA512 
5f0a080841cb3a032cbe7b135ba38bebeae0b0e444623887bdcb92a3adcf804701524eff840f108a9544293f5ac307b4a8d9509176abfeaea6c461b2ea5c0886
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 
8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2
 SHA512 
a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925

diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild 
b/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild
deleted file mode 100644
index 5076d24dc8fc..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.39-r4.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/";
-
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=5
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       SLOT=${PV}
-else
-       PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-       PATCH_DEV=${PATCH_DEV:-dilfridge}
-       SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz";
-       [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-               
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
-       SLOT=$(ver_cut 1-2)
-       KEYWORDS="-* hppa"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-       >=sys-devel/binutils-config-3
-       sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       doc? ( sys-apps/texinfo )
-       test? (
-               dev-util/dejagnu
-               sys-devel/bc
-       )
-       nls? ( sys-devel/gettext )
-       sys-devel/flex
-       app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR="${WORKDIR}"/build
-S="${WORKDIR}"/${P/-hppa64/}
-
-src_unpack() {
-       if [[ ${PV} == 9999* ]] ; then
-               
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git";
-               EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
-               git-r3_src_unpack
-               mv patches-git/9999 patch || die
-
-               S="${WORKDIR}"/binutils
-               EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git";
-               EGIT_CHECKOUT_DIR="${S}"
-               git-r3_src_unpack
-       else
-               unpack ${P/-hppa64/}.tar.xz
-
-               cd "${WORKDIR}" || die
-               unpack 
binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-               # _p patch versions are Gentoo specific tarballs ...
-               local dir=${P%_p?}
-               dir=${dir/-hppa64/}
-
-               S=${WORKDIR}/${dir}
-       fi
-
-       cd "${WORKDIR}" || die
-       mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-       local patchsetname
-       if [[ ${PV} == 9999* ]] ; then
-               patchsetname="from git master"
-       else
-               patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-       fi
-
-       if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-               if ! use vanilla; then
-                       einfo "Applying binutils patchset ${patchsetname}"
-                       eapply "${WORKDIR}/patch"
-                       einfo "Done."
-               fi
-       fi
-
-       # Make sure our explicit libdir paths don't get clobbered, bug #562460
-       sed -i \
-               -e 's:@bfdlibdir@:@libdir@:g' \
-               -e 's:@bfdincludedir@:@includedir@:g' \
-               {bfd,opcodes}/Makefile.in || die
-
-       # Fix locale issues if possible, bug #122216
-       if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-               einfo "Fixing misc issues in configure files"
-               for f in $(find "${S}" -name configure -exec grep -l 'autoconf 
version 2.13' {} +) ; do
-                       ebegin "  Updating ${f/${S}\/}"
-                       patch "${f}" 
"${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-                               || eerror "Please file a bug about this"
-                       eend $?
-               done
-       fi
-
-       # Apply things from PATCHES and user dirs
-       default
-
-       # Run misc portage update scripts
-       gnuconfig_update
-       elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-       printf "https://bugs.gentoo.org/";
-}
-toolchain-binutils_pkgversion() {
-       printf "Gentoo ${PV}"
-       [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-       # See 
https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-       # Avoid really confusing logs from subconfigure spam, makes logs far
-       # more legible.
-       MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-       # Setup some paths
-       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-       INCPATH=${LIBPATH}/include
-       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-       if is_cross ; then
-               TOOLPATH=/usr/${CHOST}/${CTARGET}
-       else
-               TOOLPATH=/usr/${CTARGET}
-       fi
-       BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-       # Make sure we filter $LINGUAS so that only ones that
-       # actually work make it through, bug #42033
-       strip-linguas -u */po
-
-       # Keep things sane
-       strip-flags
-
-       use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-       local x
-       echo
-       for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-               einfo "$(printf '%10s' ${x}:) ${!x}"
-       done
-       echo
-
-       cd "${MY_BUILDDIR}" || die
-       local myconf=()
-
-       if use plugins ; then
-               myconf+=( --enable-plugins )
-       fi
-       # enable gold (installed as ld.gold) and ld's plugin architecture
-       if use gold ; then
-               myconf+=( --enable-gold )
-               if use default-gold; then
-                       myconf+=( --enable-gold=default )
-               fi
-       fi
-
-       if use nls ; then
-               myconf+=( --without-included-gettext )
-       else
-               myconf+=( --disable-nls )
-       fi
-
-       myconf+=( --with-system-zlib )
-
-       # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-       # logic in toolchain.eclass. bug #446946
-       #
-       # We used to do it for everyone, but it's slow on 32bit arches. bug 
#438522
-       case $(tc-arch) in
-               ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-       esac
-
-       use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-       [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-       is_cross && myconf+=(
-               --with-sysroot="${EPREFIX}"/usr/${CTARGET}
-               --enable-poison-system-directories
-       )
-
-       myconf+=( --enable-secureplt )
-
-       # mips can't do hash-style=gnu ...
-       if [[ $(tc-arch) != mips ]] ; then
-               myconf+=( --enable-default-hash-style=gnu )
-       fi
-
-       myconf+=(
-               --prefix="${EPREFIX}"/usr
-               --host=${CHOST}
-               --target=${CTARGET}
-               --datadir="${EPREFIX}"${DATAPATH}
-               --datarootdir="${EPREFIX}"${DATAPATH}
-               --infodir="${EPREFIX}"${DATAPATH}/info
-               --mandir="${EPREFIX}"${DATAPATH}/man
-               --bindir="${EPREFIX}"${BINPATH}
-               --libdir="${EPREFIX}"${LIBPATH}
-               --libexecdir="${EPREFIX}"${LIBPATH}
-               --includedir="${EPREFIX}"${INCPATH}
-               --enable-obsolete
-               --enable-shared
-               --enable-threads
-               # Newer versions (>=2.27) offer a configure flag now.
-               --enable-relro
-               # Newer versions (>=2.24) make this an explicit option, bug 
#497268
-               --enable-install-libiberty
-               # Available from 2.35 on
-               --enable-textrel-check=warning
-
-               # These hardening options are available from 2.39+ but
-               # they unconditionally enable the behaviour even on arches
-               # where e.g. execstacks can't be avoided.
-               # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-               #--enable-warn-execstack
-               #--enable-warn-rwx-segments
-               #--disable-default-execstack (or is it 
--enable-default-execstack=no? docs are confusing)
-
-               # Things to think about
-               #--enable-deterministic-archives
-
-               # Works better than vapier's patch, bug #808787
-               --enable-new-dtags
-
-               --disable-jansson
-               --disable-werror
-               --with-bugurl="$(toolchain-binutils_bugurl)"
-               --with-pkgversion="$(toolchain-binutils_pkgversion)"
-               $(use_enable static-libs static)
-               # Disable modules that are in a combined binutils/gdb tree, bug 
#490566
-               --disable-{gdb,libdecnumber,readline,sim}
-               # Strip out broken static link flags.
-               # https://gcc.gnu.org/PR56750
-               --without-stage1-ldflags
-               # Change SONAME to avoid conflict across
-               # {native,cross}/binutils, binutils-libs. bug #666100
-               --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex 
multitarget mt st)
-
-               # Avoid automagic dependency on (currently prefix) systems
-               # systems with debuginfod library, bug #754753
-               --without-debuginfod
-
-               # Avoid automagic dev-libs/msgpack dep, bug #865875
-               --without-msgpack
-
-               # Allow user to opt into CET for host libraries.
-               # Ideally we would like automagic-or-disabled here.
-               # But the check does not quite work on i686: bug #760926.
-               $(use_enable cet)
-
-               # We can enable this by default in future, but it's brand new
-               # in 2.39 with several bugs:
-               # - Doesn't build on musl 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-               # - No man pages 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-               # - Broken at runtime without Java 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-               # - binutils-config (and this ebuild?) needs adaptation first 
(https://bugs.gentoo.org/865113)
-               $(use_enable gprofng)
-       )
-
-       if ! is_cross ; then
-               # No LTO for HPPA64 right now as we don't build kgcc64 with LTO 
support.
-               myconf+=( $(use_enable pgo pgo-build) )
-
-               if use pgo ; then
-                       export BUILD_CFLAGS="${CFLAGS}"
-               fi
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
-
-       # Prevent makeinfo from running if doc is unset.
-       if ! use doc ; then
-               sed -i \
-                       -e '/^MAKEINFO/s:=.*:= true:' \
-                       Makefile || die
-       fi
-}
-
-src_compile() {
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-
-       # only build info pages if the user wants them
-       if use doc ; then
-               emake V=1 info
-       fi
-
-       # we nuke the manpages when we're left with junk
-       # (like when we bootstrap, no perl -> no manpages)
-       find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-       cd "${MY_BUILDDIR}" || die
-
-       # bug #637066
-       filter-flags -Wall -Wreturn-type
-
-       emake -k V=1 check
-}
-
-src_install() {
-       local x d
-
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-       rm -rf "${ED}"/${LIBPATH}/bin || die
-       use static-libs || find "${ED}" -name '*.la' -delete
-
-       # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-       cd "${ED}"/${LIBPATH} || die
-       for d in ../* ; do
-               [[ ${d} == ../${PV} ]] && continue
-               mv ${d}/* . || die
-               rmdir ${d} || die
-       done
-
-       # Now we collect everything intp the proper SLOT-ed dirs
-       # When something is built to cross-compile, it installs into
-       # /usr/$CHOST/ by default ... we have to 'fix' that :)
-       if is_cross ; then
-               cd "${ED}"/${BINPATH} || die
-               for x in * ; do
-                       mv ${x} ${x/${CTARGET}-} || die
-               done
-
-               if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-                       # No die for now, dies on hppa?
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/include 
"${ED}"/${INCPATH}
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* 
"${ED}"/${LIBPATH}/
-                       rm -r "${ED}"/usr/${CHOST}/{include,lib}
-               fi
-       fi
-
-       insinto ${INCPATH}
-       local libiberty_headers=(
-               # Not all the libiberty headers.  See 
libiberty/Makefile.in:install_to_libdir.
-               demangle.h
-               dyn-string.h
-               fibheap.h
-               hashtab.h
-               libiberty.h
-               objalloc.h
-               splay-tree.h
-       )
-       doins "${libiberty_headers[@]/#/${S}/include/}"
-       if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-               # TODO: add || die here, fails on hppa?
-               mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-               rm -r "${ED}"/${LIBPATH}/lib
-       fi
-
-       # Generate an env.d entry for this binutils
-       insinto /etc/env.d/binutils
-       cat <<-EOF > "${T}"/env.d
-               TARGET="${CTARGET}"
-               VER="${PV}"
-               LIBPATH="${EPREFIX}${LIBPATH}"
-       EOF
-       newins "${T}"/env.d ${CTARGET}-${PV}
-
-       # Handle documentation
-       if ! is_cross ; then
-               cd "${S}" || die
-               dodoc README
-
-               docinto bfd
-               dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-               docinto binutils
-               dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-               docinto gas
-               dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-               docinto gprof
-               dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-               docinto ld
-               dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-               docinto libiberty
-               dodoc libiberty/ChangeLog* libiberty/README
-
-               docinto opcodes
-               dodoc opcodes/ChangeLog*
-       fi
-
-       # Remove shared info pages
-       rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} || 
die
-
-       # Trim all empty dirs
-       find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-       # the hppa64 hack; this should go into 9999 as a PN-conditional
-       # tweak the default fake list a little bit
-       cd "${D}"/etc/env.d/binutils
-       sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-       # Make sure this ${CTARGET} has a binutils version selected
-       [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-       binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-       local current_profile=$(binutils-config -c ${CTARGET})
-
-       # If no other versions exist, then uninstall for this
-       # target ... otherwise, switch to the newest version
-       # Note: only do this if this version is unmerged.  We
-       #       rerun binutils-config if this is a remerge, as
-       #       we want the mtimes on the symlinks updated (if
-       #       it is the same as the current selected profile)
-       if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == 
${CTARGET}-${PV} ]] ; then
-               local choice=$(binutils-config -l | grep ${CTARGET} | awk 
'{print $2}')
-               choice=${choice//$'\n'/ }
-               choice=${choice/* }
-               if [[ -z ${choice} ]] ; then
-                       binutils-config -u ${CTARGET}
-               else
-                       binutils-config ${choice}
-               fi
-       elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; 
then
-               binutils-config ${CTARGET}-${PV}
-       fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}

diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.40-r2.ebuild 
b/sys-devel/binutils-hppa64/binutils-hppa64-2.40-r2.ebuild
deleted file mode 100644
index 8e05e6ac617e..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.40-r2.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/";
-
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=2
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       SLOT=${PV}
-else
-       PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-       PATCH_DEV=${PATCH_DEV:-dilfridge}
-       SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz";
-       [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-               
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
-       SLOT=$(ver_cut 1-2)
-       KEYWORDS="-* ~hppa"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-       >=sys-devel/binutils-config-3
-       sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       doc? ( sys-apps/texinfo )
-       test? (
-               dev-util/dejagnu
-               sys-devel/bc
-       )
-       nls? ( sys-devel/gettext )
-       sys-devel/flex
-       app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR="${WORKDIR}"/build
-S="${WORKDIR}"/${P/-hppa64/}
-
-src_unpack() {
-       if [[ ${PV} == 9999* ]] ; then
-               
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git";
-               EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
-               git-r3_src_unpack
-               mv patches-git/9999 patch || die
-
-               S="${WORKDIR}"/binutils
-               EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git";
-               EGIT_CHECKOUT_DIR="${S}"
-               git-r3_src_unpack
-       else
-               unpack ${P/-hppa64/}.tar.xz
-
-               cd "${WORKDIR}" || die
-               unpack 
binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-               # _p patch versions are Gentoo specific tarballs ...
-               local dir=${P%_p?}
-               dir=${dir/-hppa64/}
-
-               S=${WORKDIR}/${dir}
-       fi
-
-       cd "${WORKDIR}" || die
-       mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-       local patchsetname
-       if [[ ${PV} == 9999* ]] ; then
-               patchsetname="from git master"
-       else
-               patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-       fi
-
-       if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-               if ! use vanilla; then
-                       einfo "Applying binutils patchset ${patchsetname}"
-                       eapply "${WORKDIR}/patch"
-                       einfo "Done."
-               fi
-       fi
-
-       # Make sure our explicit libdir paths don't get clobbered, bug #562460
-       sed -i \
-               -e 's:@bfdlibdir@:@libdir@:g' \
-               -e 's:@bfdincludedir@:@includedir@:g' \
-               {bfd,opcodes}/Makefile.in || die
-
-       # Fix locale issues if possible, bug #122216
-       if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-               einfo "Fixing misc issues in configure files"
-               for f in $(find "${S}" -name configure -exec grep -l 'autoconf 
version 2.13' {} +) ; do
-                       ebegin "  Updating ${f/${S}\/}"
-                       patch "${f}" 
"${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-                               || eerror "Please file a bug about this"
-                       eend $?
-               done
-       fi
-
-       # Apply things from PATCHES and user dirs
-       default
-
-       # Run misc portage update scripts
-       gnuconfig_update
-       elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-       printf "https://bugs.gentoo.org/";
-}
-toolchain-binutils_pkgversion() {
-       printf "Gentoo ${PV}"
-       [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-       # See 
https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-       # Avoid really confusing logs from subconfigure spam, makes logs far
-       # more legible.
-       MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-       # Setup some paths
-       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-       INCPATH=${LIBPATH}/include
-       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-       if is_cross ; then
-               TOOLPATH=/usr/${CHOST}/${CTARGET}
-       else
-               TOOLPATH=/usr/${CTARGET}
-       fi
-       BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-       # Make sure we filter $LINGUAS so that only ones that
-       # actually work make it through, bug #42033
-       strip-linguas -u */po
-
-       # Keep things sane
-       strip-flags
-
-       use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-       local x
-       echo
-       for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-               einfo "$(printf '%10s' ${x}:) ${!x}"
-       done
-       echo
-
-       cd "${MY_BUILDDIR}" || die
-       local myconf=()
-
-       if use plugins ; then
-               myconf+=( --enable-plugins )
-       fi
-       # enable gold (installed as ld.gold) and ld's plugin architecture
-       if use gold ; then
-               myconf+=( --enable-gold )
-               if use default-gold; then
-                       myconf+=( --enable-gold=default )
-               fi
-       fi
-
-       if use nls ; then
-               myconf+=( --without-included-gettext )
-       else
-               myconf+=( --disable-nls )
-       fi
-
-       myconf+=( --with-system-zlib )
-
-       # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-       # logic in toolchain.eclass. bug #446946
-       #
-       # We used to do it for everyone, but it's slow on 32bit arches. bug 
#438522
-       case $(tc-arch) in
-               ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-       esac
-
-       use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-       [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-       is_cross && myconf+=(
-               --with-sysroot="${EPREFIX}"/usr/${CTARGET}
-               --enable-poison-system-directories
-       )
-
-       myconf+=( --enable-secureplt )
-
-       # mips can't do hash-style=gnu ...
-       if [[ $(tc-arch) != mips ]] ; then
-               myconf+=( --enable-default-hash-style=gnu )
-       fi
-
-       myconf+=(
-               --prefix="${EPREFIX}"/usr
-               --host=${CHOST}
-               --target=${CTARGET}
-               --datadir="${EPREFIX}"${DATAPATH}
-               --datarootdir="${EPREFIX}"${DATAPATH}
-               --infodir="${EPREFIX}"${DATAPATH}/info
-               --mandir="${EPREFIX}"${DATAPATH}/man
-               --bindir="${EPREFIX}"${BINPATH}
-               --libdir="${EPREFIX}"${LIBPATH}
-               --libexecdir="${EPREFIX}"${LIBPATH}
-               --includedir="${EPREFIX}"${INCPATH}
-               --enable-obsolete
-               --enable-shared
-               --enable-threads
-               # Newer versions (>=2.27) offer a configure flag now.
-               --enable-relro
-               # Newer versions (>=2.24) make this an explicit option, bug 
#497268
-               --enable-install-libiberty
-               # Available from 2.35 on
-               --enable-textrel-check=warning
-
-               # These hardening options are available from 2.39+ but
-               # they unconditionally enable the behaviour even on arches
-               # where e.g. execstacks can't be avoided.
-               # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-               #--enable-warn-execstack
-               #--enable-warn-rwx-segments
-               #--disable-default-execstack (or is it 
--enable-default-execstack=no? docs are confusing)
-
-               # Things to think about
-               #--enable-deterministic-archives
-
-               # Works better than vapier's patch, bug #808787
-               --enable-new-dtags
-
-               --disable-jansson
-               --disable-werror
-               --with-bugurl="$(toolchain-binutils_bugurl)"
-               --with-pkgversion="$(toolchain-binutils_pkgversion)"
-               $(use_enable static-libs static)
-               # Disable modules that are in a combined binutils/gdb tree, bug 
#490566
-               --disable-{gdb,libdecnumber,readline,sim}
-               # Strip out broken static link flags.
-               # https://gcc.gnu.org/PR56750
-               --without-stage1-ldflags
-               # Change SONAME to avoid conflict across
-               # {native,cross}/binutils, binutils-libs. bug #666100
-               --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex 
multitarget mt st)
-
-               # Avoid automagic dependency on (currently prefix) systems
-               # systems with debuginfod library, bug #754753
-               --without-debuginfod
-
-               # Avoid automagic dev-libs/msgpack dep, bug #865875
-               --without-msgpack
-
-               # Allow user to opt into CET for host libraries.
-               # Ideally we would like automagic-or-disabled here.
-               # But the check does not quite work on i686: bug #760926.
-               $(use_enable cet)
-
-               # We can enable this by default in future, but it's brand new
-               # in 2.39 with several bugs:
-               # - Doesn't build on musl 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-               # - No man pages 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-               # - Broken at runtime without Java 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-               # - binutils-config (and this ebuild?) needs adaptation first 
(https://bugs.gentoo.org/865113)
-               $(use_enable gprofng)
-       )
-
-       if ! is_cross ; then
-               # No LTO for HPPA64 right now as we don't build kgcc64 with LTO 
support.
-               myconf+=( $(use_enable pgo pgo-build) )
-
-               if use pgo ; then
-                       export BUILD_CFLAGS="${CFLAGS}"
-               fi
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
-
-       # Prevent makeinfo from running if doc is unset.
-       if ! use doc ; then
-               sed -i \
-                       -e '/^MAKEINFO/s:=.*:= true:' \
-                       Makefile || die
-       fi
-}
-
-src_compile() {
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-
-       # only build info pages if the user wants them
-       if use doc ; then
-               emake V=1 info
-       fi
-
-       # we nuke the manpages when we're left with junk
-       # (like when we bootstrap, no perl -> no manpages)
-       find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-       cd "${MY_BUILDDIR}" || die
-
-       # bug #637066
-       filter-flags -Wall -Wreturn-type
-
-       emake -k V=1 check
-}
-
-src_install() {
-       local x d
-
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-       rm -rf "${ED}"/${LIBPATH}/bin || die
-       use static-libs || find "${ED}" -name '*.la' -delete
-
-       # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-       cd "${ED}"/${LIBPATH} || die
-       for d in ../* ; do
-               [[ ${d} == ../${PV} ]] && continue
-               mv ${d}/* . || die
-               rmdir ${d} || die
-       done
-
-       # Now we collect everything intp the proper SLOT-ed dirs
-       # When something is built to cross-compile, it installs into
-       # /usr/$CHOST/ by default ... we have to 'fix' that :)
-       if is_cross ; then
-               cd "${ED}"/${BINPATH} || die
-               for x in * ; do
-                       mv ${x} ${x/${CTARGET}-} || die
-               done
-
-               if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-                       # No die for now, dies on hppa?
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/include 
"${ED}"/${INCPATH}
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* 
"${ED}"/${LIBPATH}/
-                       rm -r "${ED}"/usr/${CHOST}/{include,lib}
-               fi
-       fi
-
-       insinto ${INCPATH}
-       local libiberty_headers=(
-               # Not all the libiberty headers.  See 
libiberty/Makefile.in:install_to_libdir.
-               demangle.h
-               dyn-string.h
-               fibheap.h
-               hashtab.h
-               libiberty.h
-               objalloc.h
-               splay-tree.h
-       )
-       doins "${libiberty_headers[@]/#/${S}/include/}"
-       if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-               # TODO: add || die here, fails on hppa?
-               mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-               rm -r "${ED}"/${LIBPATH}/lib
-       fi
-
-       # Generate an env.d entry for this binutils
-       insinto /etc/env.d/binutils
-       cat <<-EOF > "${T}"/env.d
-               TARGET="${CTARGET}"
-               VER="${PV}"
-               LIBPATH="${EPREFIX}${LIBPATH}"
-       EOF
-       newins "${T}"/env.d ${CTARGET}-${PV}
-
-       # Handle documentation
-       if ! is_cross ; then
-               cd "${S}" || die
-               dodoc README
-
-               docinto bfd
-               dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-               docinto binutils
-               dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-               docinto gas
-               dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-               docinto gprof
-               dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-               docinto ld
-               dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-               docinto libiberty
-               dodoc libiberty/ChangeLog* libiberty/README
-
-               docinto opcodes
-               dodoc opcodes/ChangeLog*
-       fi
-
-       # Remove shared info pages
-       rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} || 
die
-
-       # Trim all empty dirs
-       find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-       # the hppa64 hack; this should go into 9999 as a PN-conditional
-       # tweak the default fake list a little bit
-       cd "${D}"/etc/env.d/binutils
-       sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-       # Make sure this ${CTARGET} has a binutils version selected
-       [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-       binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-       local current_profile=$(binutils-config -c ${CTARGET})
-
-       # If no other versions exist, then uninstall for this
-       # target ... otherwise, switch to the newest version
-       # Note: only do this if this version is unmerged.  We
-       #       rerun binutils-config if this is a remerge, as
-       #       we want the mtimes on the symlinks updated (if
-       #       it is the same as the current selected profile)
-       if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == 
${CTARGET}-${PV} ]] ; then
-               local choice=$(binutils-config -l | grep ${CTARGET} | awk 
'{print $2}')
-               choice=${choice//$'\n'/ }
-               choice=${choice/* }
-               if [[ -z ${choice} ]] ; then
-                       binutils-config -u ${CTARGET}
-               else
-                       binutils-config ${choice}
-               fi
-       elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; 
then
-               binutils-config ${CTARGET}-${PV}
-       fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}

diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.40.ebuild 
b/sys-devel/binutils-hppa64/binutils-hppa64-2.40.ebuild
deleted file mode 100644
index a02cbef8641b..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.40.ebuild
+++ /dev/null
@@ -1,503 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/";
-
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins 
static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-       inherit git-r3
-       SLOT=${PV}
-else
-       PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-       PATCH_DEV=${PATCH_DEV:-dilfridge}
-       SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz";
-       [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-               
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
-       SLOT=$(ver_cut 1-2)
-       KEYWORDS="-* ~hppa"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-       if [[ ${CATEGORY} == cross-* ]] ; then
-               export CTARGET=${CATEGORY#cross-}
-       fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-       >=sys-devel/binutils-config-3
-       sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       doc? ( sys-apps/texinfo )
-       test? (
-               dev-util/dejagnu
-               sys-devel/bc
-       )
-       nls? ( sys-devel/gettext )
-       sys-devel/flex
-       app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR="${WORKDIR}"/build
-S="${WORKDIR}"/${P/-hppa64/}
-
-src_unpack() {
-       if [[ ${PV} == 9999* ]] ; then
-               
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git";
-               EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
-               git-r3_src_unpack
-               mv patches-git/9999 patch || die
-
-               S="${WORKDIR}"/binutils
-               EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git";
-               EGIT_CHECKOUT_DIR="${S}"
-               git-r3_src_unpack
-       else
-               unpack ${P/-hppa64/}.tar.xz
-
-               cd "${WORKDIR}" || die
-               unpack 
binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-               # _p patch versions are Gentoo specific tarballs ...
-               local dir=${P%_p?}
-               dir=${dir/-hppa64/}
-
-               S=${WORKDIR}/${dir}
-       fi
-
-       cd "${WORKDIR}" || die
-       mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-       local patchsetname
-       if [[ ${PV} == 9999* ]] ; then
-               patchsetname="from git master"
-       else
-               patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-       fi
-
-       if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-               if ! use vanilla; then
-                       einfo "Applying binutils patchset ${patchsetname}"
-                       eapply "${WORKDIR}/patch"
-                       einfo "Done."
-               fi
-       fi
-
-       # Make sure our explicit libdir paths don't get clobbered, bug #562460
-       sed -i \
-               -e 's:@bfdlibdir@:@libdir@:g' \
-               -e 's:@bfdincludedir@:@includedir@:g' \
-               {bfd,opcodes}/Makefile.in || die
-
-       # Fix locale issues if possible, bug #122216
-       if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-               einfo "Fixing misc issues in configure files"
-               for f in $(find "${S}" -name configure -exec grep -l 'autoconf 
version 2.13' {} +) ; do
-                       ebegin "  Updating ${f/${S}\/}"
-                       patch "${f}" 
"${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-                               || eerror "Please file a bug about this"
-                       eend $?
-               done
-       fi
-
-       # Apply things from PATCHES and user dirs
-       default
-
-       # Run misc portage update scripts
-       gnuconfig_update
-       elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-       printf "https://bugs.gentoo.org/";
-}
-toolchain-binutils_pkgversion() {
-       printf "Gentoo ${PV}"
-       [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-       # See 
https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-       # Avoid really confusing logs from subconfigure spam, makes logs far
-       # more legible.
-       MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-       # Setup some paths
-       LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-       INCPATH=${LIBPATH}/include
-       DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-       if is_cross ; then
-               TOOLPATH=/usr/${CHOST}/${CTARGET}
-       else
-               TOOLPATH=/usr/${CTARGET}
-       fi
-       BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-       # Make sure we filter $LINGUAS so that only ones that
-       # actually work make it through, bug #42033
-       strip-linguas -u */po
-
-       # Keep things sane
-       strip-flags
-
-       use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-       local x
-       echo
-       for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-               einfo "$(printf '%10s' ${x}:) ${!x}"
-       done
-       echo
-
-       cd "${MY_BUILDDIR}" || die
-       local myconf=()
-
-       if use plugins ; then
-               myconf+=( --enable-plugins )
-       fi
-       # enable gold (installed as ld.gold) and ld's plugin architecture
-       if use gold ; then
-               myconf+=( --enable-gold )
-               if use default-gold; then
-                       myconf+=( --enable-gold=default )
-               fi
-       fi
-
-       if use nls ; then
-               myconf+=( --without-included-gettext )
-       else
-               myconf+=( --disable-nls )
-       fi
-
-       myconf+=( --with-system-zlib )
-
-       # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-       # logic in toolchain.eclass. bug #446946
-       #
-       # We used to do it for everyone, but it's slow on 32bit arches. bug 
#438522
-       case $(tc-arch) in
-               ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-       esac
-
-       use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-       [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-       is_cross && myconf+=(
-               --with-sysroot="${EPREFIX}"/usr/${CTARGET}
-               --enable-poison-system-directories
-       )
-
-       myconf+=( --enable-secureplt )
-
-       # mips can't do hash-style=gnu ...
-       if [[ $(tc-arch) != mips ]] ; then
-               myconf+=( --enable-default-hash-style=gnu )
-       fi
-
-       myconf+=(
-               --prefix="${EPREFIX}"/usr
-               --host=${CHOST}
-               --target=${CTARGET}
-               --datadir="${EPREFIX}"${DATAPATH}
-               --datarootdir="${EPREFIX}"${DATAPATH}
-               --infodir="${EPREFIX}"${DATAPATH}/info
-               --mandir="${EPREFIX}"${DATAPATH}/man
-               --bindir="${EPREFIX}"${BINPATH}
-               --libdir="${EPREFIX}"${LIBPATH}
-               --libexecdir="${EPREFIX}"${LIBPATH}
-               --includedir="${EPREFIX}"${INCPATH}
-               --enable-obsolete
-               --enable-shared
-               --enable-threads
-               # Newer versions (>=2.27) offer a configure flag now.
-               --enable-relro
-               # Newer versions (>=2.24) make this an explicit option, bug 
#497268
-               --enable-install-libiberty
-               # Available from 2.35 on
-               --enable-textrel-check=warning
-
-               # These hardening options are available from 2.39+ but
-               # they unconditionally enable the behaviour even on arches
-               # where e.g. execstacks can't be avoided.
-               # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-               #--enable-warn-execstack
-               #--enable-warn-rwx-segments
-               #--disable-default-execstack (or is it 
--enable-default-execstack=no? docs are confusing)
-
-               # Things to think about
-               #--enable-deterministic-archives
-
-               # Works better than vapier's patch, bug #808787
-               --enable-new-dtags
-
-               --disable-jansson
-               --disable-werror
-               --with-bugurl="$(toolchain-binutils_bugurl)"
-               --with-pkgversion="$(toolchain-binutils_pkgversion)"
-               $(use_enable static-libs static)
-               # Disable modules that are in a combined binutils/gdb tree, bug 
#490566
-               --disable-{gdb,libdecnumber,readline,sim}
-               # Strip out broken static link flags.
-               # https://gcc.gnu.org/PR56750
-               --without-stage1-ldflags
-               # Change SONAME to avoid conflict across
-               # {native,cross}/binutils, binutils-libs. bug #666100
-               --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex 
multitarget mt st)
-
-               # Avoid automagic dependency on (currently prefix) systems
-               # systems with debuginfod library, bug #754753
-               --without-debuginfod
-
-               # Avoid automagic dev-libs/msgpack dep, bug #865875
-               --without-msgpack
-
-               # Allow user to opt into CET for host libraries.
-               # Ideally we would like automagic-or-disabled here.
-               # But the check does not quite work on i686: bug #760926.
-               $(use_enable cet)
-
-               # We can enable this by default in future, but it's brand new
-               # in 2.39 with several bugs:
-               # - Doesn't build on musl 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-               # - No man pages 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-               # - Broken at runtime without Java 
(https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-               # - binutils-config (and this ebuild?) needs adaptation first 
(https://bugs.gentoo.org/865113)
-               $(use_enable gprofng)
-       )
-
-       if ! is_cross ; then
-               # No LTO for HPPA64 right now as we don't build kgcc64 with LTO 
support.
-               myconf+=( $(use_enable pgo pgo-build) )
-
-               if use pgo ; then
-                       export BUILD_CFLAGS="${CFLAGS}"
-               fi
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
-
-       # Prevent makeinfo from running if doc is unset.
-       if ! use doc ; then
-               sed -i \
-                       -e '/^MAKEINFO/s:=.*:= true:' \
-                       Makefile || die
-       fi
-}
-
-src_compile() {
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-
-       # only build info pages if the user wants them
-       if use doc ; then
-               emake V=1 info
-       fi
-
-       # we nuke the manpages when we're left with junk
-       # (like when we bootstrap, no perl -> no manpages)
-       find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-       cd "${MY_BUILDDIR}" || die
-
-       # bug #637066
-       filter-flags -Wall -Wreturn-type
-
-       emake -k V=1 check
-}
-
-src_install() {
-       local x d
-
-       cd "${MY_BUILDDIR}" || die
-
-       # see Note [tooldir hack for ldscripts]
-       emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-       rm -rf "${ED}"/${LIBPATH}/bin || die
-       use static-libs || find "${ED}" -name '*.la' -delete
-
-       # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-       cd "${ED}"/${LIBPATH} || die
-       for d in ../* ; do
-               [[ ${d} == ../${PV} ]] && continue
-               mv ${d}/* . || die
-               rmdir ${d} || die
-       done
-
-       # Now we collect everything intp the proper SLOT-ed dirs
-       # When something is built to cross-compile, it installs into
-       # /usr/$CHOST/ by default ... we have to 'fix' that :)
-       if is_cross ; then
-               cd "${ED}"/${BINPATH} || die
-               for x in * ; do
-                       mv ${x} ${x/${CTARGET}-} || die
-               done
-
-               if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-                       # No die for now, dies on hppa?
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/include 
"${ED}"/${INCPATH}
-                       mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* 
"${ED}"/${LIBPATH}/
-                       rm -r "${ED}"/usr/${CHOST}/{include,lib}
-               fi
-       fi
-
-       insinto ${INCPATH}
-       local libiberty_headers=(
-               # Not all the libiberty headers.  See 
libiberty/Makefile.in:install_to_libdir.
-               demangle.h
-               dyn-string.h
-               fibheap.h
-               hashtab.h
-               libiberty.h
-               objalloc.h
-               splay-tree.h
-       )
-       doins "${libiberty_headers[@]/#/${S}/include/}"
-       if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-               # TODO: add || die here, fails on hppa?
-               mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-               rm -r "${ED}"/${LIBPATH}/lib
-       fi
-
-       # Generate an env.d entry for this binutils
-       insinto /etc/env.d/binutils
-       cat <<-EOF > "${T}"/env.d
-               TARGET="${CTARGET}"
-               VER="${PV}"
-               LIBPATH="${EPREFIX}${LIBPATH}"
-       EOF
-       newins "${T}"/env.d ${CTARGET}-${PV}
-
-       # Handle documentation
-       if ! is_cross ; then
-               cd "${S}" || die
-               dodoc README
-
-               docinto bfd
-               dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-               docinto binutils
-               dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-               docinto gas
-               dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-               docinto gprof
-               dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-               docinto ld
-               dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-               docinto libiberty
-               dodoc libiberty/ChangeLog* libiberty/README
-
-               docinto opcodes
-               dodoc opcodes/ChangeLog*
-       fi
-
-       # Remove shared info pages
-       rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} || 
die
-
-       # Trim all empty dirs
-       find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-       # the hppa64 hack; this should go into 9999 as a PN-conditional
-       # tweak the default fake list a little bit
-       cd "${D}"/etc/env.d/binutils
-       sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-       # Make sure this ${CTARGET} has a binutils version selected
-       [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-       binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-       local current_profile=$(binutils-config -c ${CTARGET})
-
-       # If no other versions exist, then uninstall for this
-       # target ... otherwise, switch to the newest version
-       # Note: only do this if this version is unmerged.  We
-       #       rerun binutils-config if this is a remerge, as
-       #       we want the mtimes on the symlinks updated (if
-       #       it is the same as the current selected profile)
-       if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == 
${CTARGET}-${PV} ]] ; then
-               local choice=$(binutils-config -l | grep ${CTARGET} | awk 
'{print $2}')
-               choice=${choice//$'\n'/ }
-               choice=${choice/* }
-               if [[ -z ${choice} ]] ; then
-                       binutils-config -u ${CTARGET}
-               else
-                       binutils-config ${choice}
-               fi
-       elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; 
then
-               binutils-config ${CTARGET}-${PV}
-       fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}

Reply via email to