[gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/files/, sys-devel/gdb/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     b5cbad35c3944243711a32c2924a95f4dcb7bd4e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 11:50:31 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 11:50:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cbad35

sys-devel/gdb: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-devel/gdb/Manifest                             |   1 -
 sys-devel/gdb/files/gdb-9.1-ia64.patch             |  15 --
 .../gdb/files/gdb-9.2-sim-ppc-fno-common.patch     |  97 -------
 sys-devel/gdb/gdb-9.2.ebuild                       | 282 ---------------------
 4 files changed, 395 deletions(-)

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 1bb96388c40..8fa3bb78990 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,2 +1 @@
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
-DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274

diff --git a/sys-devel/gdb/files/gdb-9.1-ia64.patch b/sys-devel/gdb/files/gdb-9.1-ia64.patch
deleted file mode 100644
index 49a21e4cdd2..00000000000
--- a/sys-devel/gdb/files/gdb-9.1-ia64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://sourceware.org/pipermail/gdb-patches/2020-May/168808.html
-
---- a/gdb/ia64-linux-nat.c
-+++ b/gdb/ia64-linux-nat.c
-@@ -21,6 +21,7 @@
- #include "defs.h"
- #include "inferior.h"
- #include "target.h"
-+#include "gdbarch.h"
- #include "gdbcore.h"
- #include "regcache.h"
- #include "ia64-tdep.h"
--- 
-2.26.2
-

diff --git a/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch b/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch
deleted file mode 100644
index 76b29649ad2..00000000000
--- a/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://bugs.gentoo.org/738272
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0
-
-From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001
-From: Sebastian Huber <sebastian.huber@embedded-brains.de>
-Date: Wed, 1 Jul 2020 19:29:55 +0200
-Subject: [PATCH] sim/ppc: Fix linker error with -fno-common
-
-GCC 10 enables -fno-common by default.  This resulted in a multiple
-definition linker error since global variables were declared and defined
-in a header file:
-
-  ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of
-  `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here
-
-sim/ppc
-
-	* ld-insn.h (last_model, last_model_data, last_model_function,
-	last_model_internal, last_model_macro, last_model_static):
-	Delete.
-	(max_model_fields_len, model_data, model_functions,
-	model_internal, model_macros, model_static, models): Declare, but do not
-	define.
-	* ld-insn.c (last_model, last_model_data, last_model_function,
-	last_model_internal, last_model_macro, last_model_static,
-	max_model_fields_len, model_data, model_functions,
-	model_internal, model_macros, model_static, models): Define.
----
- sim/ppc/ld-insn.c | 18 ++++++++++++++++++
- sim/ppc/ld-insn.h | 24 +++++++-----------------
- 3 files changed, 38 insertions(+), 17 deletions(-)
-
---- a/sim/ppc/ld-insn.c
-+++ b/sim/ppc/ld-insn.c
-@@ -28,6 +28,24 @@
- 
- #include "igen.h"
- 
-+static model *last_model;
-+
-+static insn *last_model_macro;
-+static insn *last_model_function;
-+static insn *last_model_internal;
-+static insn *last_model_static;
-+static insn *last_model_data;
-+
-+model *models;
-+
-+insn *model_macros;
-+insn *model_functions;
-+insn *model_internal;
-+insn *model_static;
-+insn *model_data;
-+
-+int max_model_fields_len;
-+
- static void
- update_depth(insn_table *entry,
- 	     lf *file,
---- a/sim/ppc/ld-insn.h
-+++ b/sim/ppc/ld-insn.h
-@@ -200,25 +200,15 @@ extern insn_table *load_insn_table
-  table_include *includes,
-  cache_table **cache_rules);
- 
--model *models;
--model *last_model;
-+extern model *models;
- 
--insn *model_macros;
--insn *last_model_macro;
-+extern insn *model_macros;
-+extern insn *model_functions;
-+extern insn *model_internal;
-+extern insn *model_static;
-+extern insn *model_data;
- 
--insn *model_functions;
--insn *last_model_function;
--
--insn *model_internal;
--insn *last_model_internal;
--
--insn *model_static;
--insn *last_model_static;
--
--insn *model_data;
--insn *last_model_data;
--
--int max_model_fields_len;
-+extern int max_model_fields_len;
- 
- extern void insn_table_insert_insn
- (insn_table *table,
--- 
-2.28.0
-

diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
deleted file mode 100644
index 78740b7e1b6..00000000000
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-# ia64 kernel crashes when gdb testsuite is running
-# hppa kernel crashes when gdb testsuite is running
-RESTRICT="
-	hppa? ( test )
-	ia64? ( test )
-
-	!test? ( test )
-"
-
-RDEPEND="
-	client? (
-		dev-libs/mpfr:0=
-		>=sys-libs/ncurses-5.2-r2:0=
-		>=sys-libs/readline-7:0=
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		xml? ( dev-libs/expat )
-		sys-libs/zlib
-	)
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-9.1-ia64.patch
-	"${FILESDIR}"/${P}-sim-ppc-fno-common.patch
-)
-
-GDB_BUILD_DIR="${WORKDIR}"/${P}-build
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with xml expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use_enable source-highlight)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-			$(use_with xxhash)
-		)
-	fi
-	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	mkdir "${GDB_BUILD_DIR}" || die
-	pushd "${GDB_BUILD_DIR}" || die
-		ECONF_SOURCE=${S}
-		econf "${myconf[@]}"
-	popd
-}
-
-src_compile() {
-	emake -C "${GDB_BUILD_DIR}"
-}
-
-src_test() {
-	emake -C "${GDB_BUILD_DIR}" check
-}
-
-src_install() {
-	if use server && ! use client; then
-		emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
-	else
-		emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
-	fi
-
-	if use client; then
-		find "${ED}"/usr -name libiberty.a -delete || die
-	fi
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-
-	# gcore is part of ubin on freebsd
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		rm "${ED}"/usr/bin/gcore || die
-	fi
-
-	if use python; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}