Fix underlinking problem with ld GNU gold, caused by outdated fontconfig test in configure, bug 462232.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 82 insertions, 22 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 97fe22140345..6180e3044d02 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/motif
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.12 2013/03/16 17:58:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.13 2013/03/18 21:47:00 ulm Exp $
+
+  18 Mar 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4.ebuild,
+  motif-2.3.4-r1.ebuild, +files/motif-2.3.4-fc-config.patch:
+  Fix underlinking problem with ld GNU gold, caused by outdated fontconfig
+  test in configure, bug 462232.
 
   16 Mar 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild:
   Install examples only once. Use default src_install function.
diff --git a/x11-libs/motif/files/motif-2.3.4-fc-config.patch b/x11-libs/motif/files/motif-2.3.4-fc-config.patch
new file mode 100644
index 000000000000..6de250563415
--- /dev/null
+++ b/x11-libs/motif/files/motif-2.3.4-fc-config.patch
@@ -0,0 +1,25 @@
+AC_FIND_XFT looks for the fontconfig-config program which does not
+exist any more. Fall back to "pkg-config fontconfig".
+https://bugs.gentoo.org/462232
+http://bugs.motifzone.net/show_bug.cgi?id=1593
+
+--- motif-2.3.4-orig/ac_find_xft.m4
++++ motif-2.3.4/ac_find_xft.m4
+@@ -189,7 +189,7 @@
+ yes)
+ 	case "$fc_config" in
+ 	no)
+-		FONTCONFIG_CFLAGS=""
++		FONTCONFIG_CFLAGS="`pkg-config fontconfig --cflags`"
+ 		;;
+ 	*)
+ 		FONTCONFIG_CFLAGS="`$fc_config --cflags`"
+@@ -208,7 +208,7 @@
+ yes)
+ 	case "$fc_config" in
+ 	no)
+-		fontconfig_lib=""
++		FONTCONFIG_LIBS="`pkg-config fontconfig --libs`"
+ 		;;
+ 	*)
+ 		FONTCONFIG_LIBS="`$fc_config --libs`"
diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild
index c6bb07481598..1005f1022957 100644
--- a/x11-libs/motif/motif-2.3.4-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.2 2013/03/16 17:58:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.3 2013/03/18 21:47:00 ulm Exp $
 
 EAPI=5
 
@@ -37,6 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	epatch "${FILESDIR}/${P}-install-dirs.patch"
+	epatch "${FILESDIR}/${P}-fc-config.patch"
 	[[ ${CHOST} == *-solaris2.11 ]] \
 		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
 
diff --git a/x11-libs/motif/motif-2.3.4.ebuild b/x11-libs/motif/motif-2.3.4.ebuild
index fc459f8a9a20..8b09dbadec6a 100644
--- a/x11-libs/motif/motif-2.3.4.ebuild
+++ b/x11-libs/motif/motif-2.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.10 2013/01/02 00:05:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.11 2013/03/18 21:47:00 ulm Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils flag-o-matic multilib
+inherit autotools eutils flag-o-matic multilib multilib-minimal
 
 DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="http://sourceforge.net/projects/motif/
@@ -13,15 +13,20 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-s
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg png static-libs unicode xft"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
-RDEPEND="x11-libs/libXmu
-	x11-libs/libXp
+RDEPEND="x11-libs/libXmu[${MULTILIB_USEDEP}]
+	x11-libs/libXp[${MULTILIB_USEDEP}]
 	unicode? ( virtual/libiconv )
-	xft? ( x11-libs/libXft )
+	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
 	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.4 )"
+	png? ( >=media-libs/libpng-1.4 )
+	abi_x86_32? (
+		amd64? ( app-emulation/emul-linux-x86-baselibs )
+		!app-emulation/emul-linux-x86-motif
+	)"
+
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
@@ -30,9 +35,13 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}/${P}-solaris.patch"
 	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-install-dirs.patch"
 	[[ ${CHOST} == *-solaris2.11 ]] \
 		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch"
 
+	epatch_user
+
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
 
@@ -40,9 +49,7 @@ src_prepare() {
 	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
 	AT_M4DIR=. eautoreconf
-}
 
-src_configure() {
 	# get around some LANG problems in make (#15119)
 	LANG=C
 
@@ -63,9 +70,13 @@ src_configure() {
 
 	# "bison -y" causes runtime crashes #355795
 	export YACC=byacc
+}
 
-	econf --with-x \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
 		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
 		$(use_enable unicode utf8) \
 		$(use_enable xft) \
 		$(use_enable jpeg) \
@@ -73,26 +84,44 @@ src_configure() {
 }
 
 src_compile() {
-	make clean			# remove pre-made bison parsers
-	emake MWMRCDIR="${EPREFIX}"/etc/X11/mwm
+	local native_dir
+
+	# Motif has build-time tools in the tools/wml subdirectory that
+	# cannot be built for other ABIs because of missing external libs.
+	# So we build the native ABI first, and then replace the tools
+	# directory in other ABIs by the native one.
+
+	my_best_abi_compile() {
+		native_dir="${BUILD_DIR}"
+		emake -C "${BUILD_DIR}"
+	}
+	multilib_for_best_abi my_best_abi_compile
+
+	my_other_abi_compile() {
+		[[ ${BUILD_DIR} = "${native_dir}" ]] && return
+		rm -rf "${BUILD_DIR}"/tools
+		ln -s "${native_dir}"/tools "${BUILD_DIR}"/ || die
+		emake -C "${BUILD_DIR}"
+	}
+	multilib_foreach_abi my_other_abi_compile
 }
 
-src_install() {
-	emake DESTDIR="${D}" MWMRCDIR="${EPREFIX}"/etc/X11/mwm install
-
+multilib_src_install_all() {
 	# mwm default configs
 	insinto /usr/share/X11/app-defaults
 	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	if use examples; then
-		emake -C demos DESTDIR="${D}" install-data
+		my_install_demos() {
+			emake -C "${BUILD_DIR}"/demos DESTDIR="${D}" install-data
+		}
+		multilib_for_best_abi my_install_demos
 		dodir /usr/share/doc/${PF}/demos
 		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
 	fi
 	rm -rf "${ED}"/usr/share/Xm
 
-	# don't install libtool archives
-	rm -f "${ED}"/usr/$(get_libdir)/*.la
+	prune_libtool_files
 
 	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
 }