gentoo auto-resync : 21:11:2024 - 03:03:00

5 files changed, 5 insertions, 128 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6f1217c3b79f..573d84e3b1bd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index f53a4a9d84d9..456a82e3bd69 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,6 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r5.ebuild 3383 BLAKE2B fbf3d4af331fc3fe7f215c46cb3bfd53e0baf23765baf8b303f6c768a59c5e4dfb762ecd42a58fdea8e7a5398524c9ad0dd05d39b41db6ecfed5ea201f7422db SHA512 46dc51528ede57c1edb4ba6f19c2f493372430651fddc21a4095a9799507b3e9afb1a34f8348ea6db98de0283ebe60215beb702232cdbf1faa532a4448a97495
-EBUILD motif-2.3.8-r6.ebuild 3292 BLAKE2B 2c1e4eab6a47e8764e1f437f9458c52140384162bb5f71ecd15431f1c07c6e4826690fab312aff67fd326edbbbaff6a0778357b44a7800a11aa2cb406567180a SHA512 9802dd53af06b58cf22b331de6d5d25649da5a64ef1f825653ccd3f25814d0a1c436b8298ecb8bef7ae4b78d1df5cd4ba0c602725747414f689225af46c86d8f
-MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
+EBUILD motif-2.3.8-r6.ebuild 3275 BLAKE2B 85b22f14de02101d2898631b0924264476c4127fdc75f9c28fbd91c2aa8825133ddf8d3bb1228dc78d22f21f702724e338b8c0f9257d0aed92c697e80f7ab915 SHA512 9f895ca483f22ecf474787bde17e79aae7061e70023bd829f176d066def6ecd0bd158beef0df7e1e859aa90f9584b8ed71fb9b05dbbc3b70fa03303a6385a9ed
+MISC metadata.xml 348 BLAKE2B 9f7c6446994d6c52e57d404fcdae5722f5134ad69b1d24f5afbfa2001d4a99297c6953a2bc058ce66072916f612ec71ef6e95d033ad0c8938a92b359de20024d SHA512 8735b3780729b4b2d5592df51b668a8bc9798974c46368cf5cab38dc758bd6ace9374342a294783a3a8c32fd7cc943dc2402e99fd902c2588988db7332884d3b
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
index 8b80f7d45e98..70dfd4d5d257 100644
--- a/x11-libs/motif/metadata.xml
+++ b/x11-libs/motif/metadata.xml
@@ -4,9 +4,6 @@
   <maintainer type="person">
     <email>ulm@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag>
-  </use>
   <upstream>
     <bugs-to>http://bugs.motifzone.net/</bugs-to>
     <remote-id type="sourceforge">motif</remote-id>
diff --git a/x11-libs/motif/motif-2.3.8-r5.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild
deleted file mode 100644
index d6dce29b8b90..000000000000
--- a/x11-libs/motif/motif-2.3.8-r5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
-	https://motif.ics.com/"
-SRC_URI="https://downloads.sourceforge.net/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	xft? (
-		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/xbitmaps"
-
-BDEPEND="sys-devel/flex
-	dev-util/byacc"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# remove files generated by flex #864533
-	rm tools/wml/{wmllex,wmluiltok}.c || die
-
-	AT_M4DIR=. eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	LANG=C
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	# for Solaris Xos_r.h :(
-	[[ ${CHOST} == *-solaris2.11 ]] \
-		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
-	if use !elibc_glibc && use !elibc_musl && use unicode; then
-		# libiconv detection in configure script doesn't always work
-		# http://bugs.motifzone.net/show_bug.cgi?id=1423
-		export LIBS="${LIBS} -liconv"
-	fi
-
-	# "bison -y" causes runtime crashes #355795
-	export YACC=byacc
-
-	# remember the name of the C compiler for the native ABI
-	MY_NATIVE_CC=$(tc-getCC)
-
-	# -Werror=lto-type-mismatch
-	#
-	# Helpfully, the motif bugtracker is entirely down. They are also
-	# on sourceforge but only for merge requests? The project is a
-	# fascinating kind of ghostly haunting. Punting on reporting... for now.
-	filter-lto
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
-		--disable-printing \
-		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-}
-
-multilib_src_compile() {
-	# The wmluiltok build tool is linked with libfl.a, so always
-	# compile it for the native ABI
-	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
-	emake
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use examples; then
-		emake -C demos DESTDIR="${D}" install-data
-		dodir /usr/share/doc/${PF}/demos
-		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
-	fi
-}
-
-multilib_src_install_all() {
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	# cleanup
-	rm -rf "${ED}"/usr/share/Xm || die
-	find "${D}" -type f -name "*.la" -delete || die
-
-	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-libs/motif/motif-2.3.8-r6.ebuild b/x11-libs/motif/motif-2.3.8-r6.ebuild
index 44fb11fda8b4..b48da0a32d4d 100644
--- a/x11-libs/motif/motif-2.3.8-r6.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/motif/Motif%20${PV}%20Source%
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+IUSE="examples jpeg png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -54,7 +54,7 @@ src_prepare() {
 	filter-lto
 
 	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
+	append-flags -std=gnu17 -fno-strict-aliasing
 
 	# for Solaris Xos_r.h :(
 	[[ ${CHOST} == *-solaris2.11 ]] \
@@ -78,9 +78,9 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--with-x \
+		--enable-motif22-compatibility \
 		--disable-printing \
 		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
 		$(use_enable unicode utf8) \
 		$(use_enable xft) \
 		$(use_enable jpeg) \