3 files changed, 123 insertions, 2 deletions
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index aeff0c0fae55..0f22fd9c500b 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,6 @@
 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 3389 BLAKE2B 3d05d0064452bec7fac76d034a8cd7bd24f8e2822a0afca73b3eeb6a571cdc008afed4fe128d856fd7454ce16ee8508b14ab86bd194f79c77675204d50e42e95 SHA512 1ab9d512185faddd3319248f07d60c241af08311c1d516ab74be6b6a00d7d0f726b30653f93f79051b80330cc7ec6be1f10226c356854d16ad5db1c82870fb86
+EBUILD motif-2.3.8-r5.ebuild 3383 BLAKE2B fbf3d4af331fc3fe7f215c46cb3bfd53e0baf23765baf8b303f6c768a59c5e4dfb762ecd42a58fdea8e7a5398524c9ad0dd05d39b41db6ecfed5ea201f7422db SHA512 46dc51528ede57c1edb4ba6f19c2f493372430651fddc21a4095a9799507b3e9afb1a34f8348ea6db98de0283ebe60215beb702232cdbf1faa532a4448a97495
+EBUILD motif-2.3.8-r6.ebuild 3299 BLAKE2B 614d929708625819fe05920032b5aca130cc079e83cb2fdba95ce772b7f69d6a54fe53d7900e9acfeabc0b98c8bc8c15109223521c51bdb4b709021156d9bc47 SHA512 9314cd6673cb228bf4b58ddcd978abd62fbe5ce822b9e2f777f58e5411fea11c1cbb40e6c7eceb3c4d7b69aeffb71e6dc138602d206a33dab00585887c9d58e0
 MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
diff --git a/x11-libs/motif/motif-2.3.8-r5.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild
index b2b9a073828f..d6dce29b8b90 100644
--- a/x11-libs/motif/motif-2.3.8-r5.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r5.ebuild
@@ -13,7 +13,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 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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}]
diff --git a/x11-libs/motif/motif-2.3.8-r6.ebuild b/x11-libs/motif/motif-2.3.8-r6.ebuild
new file mode 100644
index 000000000000..1a0ec91fb94d
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8-r6.ebuild
@@ -0,0 +1,120 @@
+# 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
+
+	# -Werror=lto-type-mismatch
+	filter-lto
+
+	# 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
+
+	# avoid mismatch of lex variants #936172
+	export LEX=flex
+	# "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)
+}
+
+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() {
+	if ! multilib_is_native_abi; then
+		# 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}" \
+			wmluiltok_LDADD="-lfl" wmluiltok
+	fi
+	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
+}