gentoo auto-resync : 10:10:2024 - 04:03:57

6 files changed, 17 insertions, 133 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index a4e0046c765c..2b75ee8177b6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 3ac5ef9a17f3..53d4a7534f56 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -4,8 +4,7 @@ AUX fox-1.7.84-pthread_rwlock_prefer_writer_np-musl.patch 937 BLAKE2B 2fa49b1218
 DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
 DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
 DIST fox-1.7.84.tar.gz 5879987 BLAKE2B 803a698eb5d976a04dd30b03a3c65f840d09e173292b8448dc02905b37ea352d0fe71b4a35f806f7ee2a8b6e6436b0c1dc9185ac3a17ecda3fb63a1b583e7348 SHA512 5590f16272a0630cb49e74e0f591e65886dd81ba1b0121d403fa3689ca8b23a727c75b645b417eb87e67fd0ece465b493146c8bb51d117a6559bb19b1b2b4297
-EBUILD fox-1.6.57-r3.ebuild 2710 BLAKE2B c57f579094a26412b90b359af0a15a1eff510f01b4d814f5eb8c3252607f2d9e50ca94332ac3848d6a6d3a55f407520faddd3a7fc6796660d10c7854722bc37e SHA512 f87be188db38e918f2fbb270baae7bf2fdffa1dc752a6b8984fa04633392b051da23bee86b24073a81bc89a73bf826098589775ef9e81576a0288b121be1af19
-EBUILD fox-1.7.67-r1.ebuild 2927 BLAKE2B bda42aaae44fea018a79d0a12e4d0e5588f24b52861b7b7b2fa0e098c6f9fb6bba3c7417297f3fdd28c51c4dd68bb60633dcc77ce5351e68989c9be426537470 SHA512 6cfa87181a4f6b3365ee6eb8b51684d4774c05189f1c39eab5cefeb9e63323f1131d952d9d501b96aeee5ec5af6ab97ba91ba2e6f25433291e3e6487100ceed6
-EBUILD fox-1.7.67-r2.ebuild 3590 BLAKE2B 674805fedbbaa9158d4c20a267a618f5d402b38bd15f2ad7f4ff2655ab7d14557ca4b3c4e44ea5dbbfbf35a0116c03baae2083b80e61e6b3bb7700439153552e SHA512 35635d778f9460626062ba18728acea39517de1507a58c3e3223ede3c00538b9ac9e0df609075adc518ef825d6e64eed6c3b9ce251ead3ad90c955f6e9c7e4f5
-EBUILD fox-1.7.84.ebuild 2829 BLAKE2B 42810ba250d98d84e674d5bb6e109ca797d82497e344ff9bafa065a211390ed4aa16bd33f0233e4585efde01707dba933973eeabb6b9bcf288b0eeb5b7558ff4 SHA512 72a5380bd86a5cc92209dd0009b5d5378a55f441b03cea903acf87bf96b0fdf6bda7b9a55d01bbda4a76713097ec3946777bf80b93e3b4e7d83099c965fcc00c
+EBUILD fox-1.6.57-r4.ebuild 2777 BLAKE2B 0d4e4e4d3010ebd8039eebf6c0818328eeaf04ea2633dd22d05f49144caac0ead87a9570c06c0833940349b78fb45b64c0d907669867e809175cbc054b84a848 SHA512 1ee7125e378bc9ea964215a25bd0ac1d7ca2f91ab23ee2455d7a8a4fbdad61b418b3354ddf91d7ee614d9f657f678b7dd599b934248e1484c2e085f3cd4ae988
+EBUILD fox-1.7.67-r3.ebuild 3655 BLAKE2B 4eec8cd4c5b4fe9a7da723fed8d50842cd68cf13d8b33ffe9b2ef048566fd2d4fcf73bd6b69e3af67d26f7c45105ac7fb2d4b71f2d8aad864b1b9e15b7afe194 SHA512 1187e83b4ee7a8d29ae89020015171b43e62ab0bf324e4ed1c8c0215dcfc9fbed373aa605ced058c72273e7faed64007c0a9aa2731694d5e3b533dc9d118e102
+EBUILD fox-1.7.84.ebuild 2953 BLAKE2B b9adbfcdf47b455ec5b8a8f468a8833b61475ed6ef18c45af246ac82e1d8b383cdba56518ab152777d70ff06d62b51b082df765bc27b27622759003bf774b289 SHA512 5420a0a7094a8497d7e1169bbe0f18c1067522331746635efafd416d6269b78bc17fc14123c8e86c6a84706e5668dc102d8f2b339798606f54f329218a268741
 MISC metadata.xml 353 BLAKE2B e9db8b14c07f63f450153af626408d7007471113ba54acad5aa97aac5258d02fe6702db354cce45ceca20444756f5ceb0c46dbacb6fae28fb06320f24221cbbb SHA512 26adab0c5f6876716fa0c87398e9d4009d162d4d202d0455d987837617316aecf8096b10c2a99a5529f7b9d5a324f9aa386d11d0f22c574114acebd15e30fdaa
diff --git a/x11-libs/fox/fox-1.6.57-r3.ebuild b/x11-libs/fox/fox-1.6.57-r4.ebuild
index ef39c33ba8c9..ac28fe40a67c 100644
--- a/x11-libs/fox/fox-1.6.57-r3.ebuild
+++ b/x11-libs/fox/fox-1.6.57-r4.ebuild
@@ -51,18 +51,18 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/864412
-	# Fixed in 1.7.84
-	#
+	# -Werror=strict-aliasing (bug #864412, bug #940648)
 	# Do not trust it for LTO either.
 	append-flags -fno-strict-aliasing
 	filter-lto
 
+	use debug || append-cppflags -DNDEBUG
+
+	# Not using --enable-release because of the options it sets like no SSP
 	econf \
 		--disable-static \
-		--enable-$(usex debug debug release) \
 		$(use_enable bzip2 bz2lib) \
+		$(use_enable debug) \
 		$(use_enable jpeg) \
 		$(use_with opengl) \
 		$(use_enable png) \
diff --git a/x11-libs/fox/fox-1.7.67-r1.ebuild b/x11-libs/fox/fox-1.7.67-r1.ebuild
deleted file mode 100644
index 00cdfbd54909..000000000000
--- a/x11-libs/fox/fox-1.7.67-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
-HOMEPAGE="http://www.fox-toolkit.org/"
-SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
-
-RDEPEND="
-	x11-libs/fox-wrapper
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	bzip2? ( app-arch/bzip2 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? ( virtual/glu virtual/opengl )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )
-	truetype? (
-		media-libs/freetype:2
-		x11-libs/libXft
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=( "${FILESDIR}"/"${PN}"-1.7.67-no-truetype.patch )
-
-src_prepare() {
-	default
-
-	sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
-	sed -i -e "s:windows::" Makefile.am || die
-	if ! use tools; then
-		local d
-		for d in adie calculator pathfinder shutterbug; do
-			sed -i -e "s:${d}::" Makefile.am || die
-		done
-	fi
-
-	# Respect system CXXFLAGS
-	sed -i -e 's:CXXFLAGS=""::' configure.ac || die "Unable to force cxxflags."
-
-	# don't strip binaries
-	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' configure.ac || die "Unable to prevent stripping."
-
-	eautoreconf
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/864412
-	# Fixed in 1.7.84
-	#
-	# Do not trust it for LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	econf \
-		--disable-static \
-		--enable-$(usex debug debug release) \
-		$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib) \
-		$(use_with profile profiling)
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc docs
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		artdir="${EPREFIX}"/usr/share/doc/${PF}/html/art \
-		screenshotsdir="${EPREFIX}"/usr/share/doc/${PF}/html/screenshots
-
-	local CP="${ED}"/usr/bin/ControlPanel
-	if [[ -f ${CP} ]]; then
-		mv "${CP}" "${ED}"/usr/bin/fox-ControlPanel-${SLOT} || \
-			die "Failed to install ControlPanel"
-	fi
-
-	dodoc ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING
-
-	if use doc; then
-		# install class reference docs if USE=doc
-		docinto html
-		dodoc -r doc/ref
-	else
-		# remove documentation if USE=-doc
-		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	# slot fox-config
-	if [[ -f ${ED}/usr/bin/fox-config ]] ; then
-		mv "${ED}"/usr/bin/fox-config "${ED}"/usr/bin/fox-${SLOT}-config \
-		|| die "failed to install fox-config"
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/fox/fox-1.7.67-r2.ebuild b/x11-libs/fox/fox-1.7.67-r3.ebuild
index 7b1a6adf3eb3..63caa1950d13 100644
--- a/x11-libs/fox/fox-1.7.67-r2.ebuild
+++ b/x11-libs/fox/fox-1.7.67-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
 
 RDEPEND="
@@ -65,18 +65,18 @@ src_prepare() {
 }
 
 src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/864412
-	# Fixed in 1.7.84
-	#
+	# -Werror=strict-aliasing (bug #864412, bug #940648)
 	# Do not trust it for LTO either.
 	append-flags -fno-strict-aliasing
 	filter-lto
 
+	use debug || append-cppflags -DNDEBUG
+
+	# Not using --enable-release because of the options it sets like no SSP
 	econf \
 		--disable-static \
-		--enable-$(usex debug debug release) \
 		$(use_enable bzip2 bz2lib) \
+		$(use_enable debug) \
 		$(use_enable jpeg) \
 		$(use_with opengl) \
 		$(use_enable png) \
diff --git a/x11-libs/fox/fox-1.7.84.ebuild b/x11-libs/fox/fox-1.7.84.ebuild
index 9ab1aee4523a..ac39a16ca295 100644
--- a/x11-libs/fox/fox-1.7.84.ebuild
+++ b/x11-libs/fox/fox-1.7.84.ebuild
@@ -65,6 +65,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=strict-aliasing (bug #864412, bug #940648)
+	# Do not trust it for LTO either.
+	append-flags -fno-strict-aliasing
 	filter-lto
 
 	use debug || append-cppflags -DNDEBUG