Fix previous commit, restore stable motif-2.3.4.ebuild.

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

2 files changed, 23 insertions, 52 deletions

diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog
index 6180e3044d02..366b2028c8f9 100644
--- a/x11-libs/motif/ChangeLog
+++ b/x11-libs/motif/ChangeLog
@@ -1,9 +1,9 @@
 # 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.13 2013/03/18 21:47:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.14 2013/03/18 22:45:04 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:
+  18 Mar 2013; Ulrich Müller <ulm@gentoo.org> 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.
 
diff --git a/x11-libs/motif/motif-2.3.4.ebuild b/x11-libs/motif/motif-2.3.4.ebuild
index 8b09dbadec6a..d26e8ece3dcb 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.11 2013/03/18 21:47:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4.ebuild,v 1.12 2013/03/18 22:45:04 ulm Exp $
 
-EAPI=5
+EAPI=4
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal
+inherit autotools eutils flag-o-matic multilib
 
 DESCRIPTION="The Motif user interface component toolkit"
 HOMEPAGE="http://sourceforge.net/projects/motif/
@@ -13,20 +13,15 @@ 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 +motif22-compatibility 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 png static-libs unicode xft"
 
-RDEPEND="x11-libs/libXmu[${MULTILIB_USEDEP}]
-	x11-libs/libXp[${MULTILIB_USEDEP}]
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXp
 	unicode? ( virtual/libiconv )
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+	xft? ( x11-libs/libXft )
 	jpeg? ( virtual/jpeg )
-	png? ( >=media-libs/libpng-1.4 )
-	abi_x86_32? (
-		amd64? ( app-emulation/emul-linux-x86-baselibs )
-		!app-emulation/emul-linux-x86-motif
-	)"
-
+	png? ( >=media-libs/libpng-1.4 )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
@@ -35,13 +30,9 @@ 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
 
@@ -49,7 +40,9 @@ 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
 
@@ -70,13 +63,9 @@ src_prepare() {
 
 	# "bison -y" causes runtime crashes #355795
 	export YACC=byacc
-}
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-x \
+	econf --with-x \
 		$(use_enable static-libs static) \
-		$(use_enable motif22-compatibility) \
 		$(use_enable unicode utf8) \
 		$(use_enable xft) \
 		$(use_enable jpeg) \
@@ -84,44 +73,26 @@ multilib_src_configure() {
 }
 
 src_compile() {
-	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
+	make clean			# remove pre-made bison parsers
+	emake MWMRCDIR="${EPREFIX}"/etc/X11/mwm
 }
 
-multilib_src_install_all() {
+src_install() {
+	emake DESTDIR="${D}" MWMRCDIR="${EPREFIX}"/etc/X11/mwm install
+
 	# mwm default configs
 	insinto /usr/share/X11/app-defaults
 	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	if use examples; then
-		my_install_demos() {
-			emake -C "${BUILD_DIR}"/demos DESTDIR="${D}" install-data
-		}
-		multilib_for_best_abi my_install_demos
+		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
 	rm -rf "${ED}"/usr/share/Xm
 
-	prune_libtool_files
+	# don't install libtool archives
+	rm -f "${ED}"/usr/$(get_libdir)/*.la
 
 	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
 }