6 files changed, 7 insertions, 121 deletions
diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
index b750de54db26..c8d7019c5d80 100644
--- a/dev-util/android-tools/android-tools-34.0.1.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
-inherit cmake python-r1
+inherit flag-o-matic cmake python-r1
 
 DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
 HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
@@ -61,6 +61,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug 905713
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
 	local mycmakeargs=(
 		# Statically link the bundled boringssl
 		-DBUILD_SHARED_LIBS=OFF
diff --git a/dev-util/byacc/byacc-20240109.ebuild b/dev-util/byacc/byacc-20240109.ebuild
index 7c8aaefb2de4..ce2195e45385 100644
--- a/dev-util/byacc/byacc-20240109.ebuild
+++ b/dev-util/byacc/byacc-20240109.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/dev-util/dialog/dialog-1.3.20240101.ebuild b/dev-util/dialog/dialog-1.3.20240101.ebuild
index c2dde201aa7a..ecb4141439cc 100644
--- a/dev-util/dialog/dialog-1.3.20240101.ebuild
+++ b/dev-util/dialog/dialog-1.3.20240101.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index d7f8811fa9f0..33e95605bf86 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,3 +1,2 @@
 DIST gperftools-2.10.tar.gz 926512 BLAKE2B e92fb751f9e695d21edf5fce443f3d3641fcff15cbd6b5d868bc77fbe622594be824b75c8d45513c7f82b9e574c690133b8502d4574162948a77886d5166b92d SHA512 4400711723be9401f519d85b3b69c026e4715473cbed48ab0573df17abdf895fb971ee969875fe5127a2e8b9aba90d858285e50c8e012384c2c36d5a76b1f0c4
 DIST gperftools-2.15.tar.gz 888271 BLAKE2B 0fb627e36d6677d01081b1d566ad42eee8b87ab94a07cbbc4536a1671b539354bc0d27f6eab249e94317f0d57a9801551aa3b2cceae784231ac69528b61d4d6e SHA512 04551bdfac50812dd8305e0fe6f6ae5b8603f18a5f9cde56657daa634982bfb5eb5303721ea6a8e02f4177aa012535216f1c99b9eda4ce92f046982df41fbcd1
-DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab
diff --git a/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild b/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
deleted file mode 100644
index 4d38c0c6b9c4..000000000000
--- a/dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="gperftools-${PV}"
-inherit flag-o-matic autotools vcs-snapshot multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux amd64/arm/arm64/ppc/ppc64/riscv/x86
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-IUSE="largepages largepages64k +debug minimal optimisememory test static-libs"
-
-RESTRICT="!test? ( test )"
-
-# TODO: remove the riscv special case once either libunwind has begun supporting this arch
-# or this package allows using llvm-libunwind for other arches
-DEPEND="!ppc64? (
-	riscv? ( sys-libs/llvm-libunwind:= )
-	!riscv? ( sys-libs/libunwind:= )
-)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Please keep this if possible on bumps, check Fedora if needs rebasing
-	# Allows correct functionality on e.g. arm64, bug #818871
-	"${FILESDIR}"/${PN}-2.9.1-disable-generic-dynamic-tls.patch
-)
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug debugalloc)
-	)
-
-	if [[ ${ABI} == x32 ]]; then
-		myeconfargs+=( --enable-minimal )
-	else
-		myeconfargs+=( $(use_enable minimal) )
-	fi
-
-	if use arm64 || use s390; then
-		# Use the same arches for disabling TLS (thread local storage)
-		# as Fedora, but we might need to expand this list if we get
-		# more odd segfaults in consumers like in bug #818871.
-		myeconfargs+=( --disable-general-dynamic-tls )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "Unable to run tests when sandbox is enabled."
-		ewarn "See https://bugs.gentoo.org/290249"
-		return 0
-	fi
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild
index 83971567f2c6..c010548e4abc 100644
--- a/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.182.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 src_compile() {
 	emake build