more virtual/motif work

Package-Manager: portage-2.0.51-r15

11 files changed, 252 insertions, 54 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index c07a4a871682..b1a720a63dec 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.72 2005/02/09 02:16:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.73 2005/02/14 14:52:23 lanius Exp $
+
+*openmotif-2.2.3-r1 (14 Feb 2005)
+
+  14 Feb 2005; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
+  -files/CAN-2004-0914.patch,
+  +files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2,
+  +files/openmotif-2.1.30-CAN-2004-0914.patch.bz2,
+  +files/openmotif-2.1.30-CAN-2004-0914_sec8.patch,
+  +files/openmotif-2.1.30-xpm2.diff, openmotif-2.1.30-r7.ebuild,
+  +openmotif-2.2.3-r1.ebuild, openmotif-2.2.3.ebuild:
+  work on virtual/motif ebuilds
 
   08 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org>
   +files/openmotif-2.2.3-automake.patch, openmotif-2.2.3.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 795a18cdd965..e649a8ce88a3 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,32 +1,37 @@
-MD5 a71b9ba9a36c7017eb2242b822daed43 ChangeLog 10618
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 84da30838fedca094e625631fd6dbbaa openmotif-2.1.30-r4.ebuild 3288
-MD5 b385c61765918c22c7effa1cb7c70076 openmotif-2.1.30-r5.ebuild 3705
 MD5 d2301173afe23e789e219313e9238bde openmotif-2.1.30-r6.ebuild 3863
-MD5 f8dc4e0e78b91ce183afb172e90dcd02 openmotif-2.1.30-r7.ebuild 3921
-MD5 4b5d6d4aac1042bc0e73cb4dd1deac91 openmotif-2.2.3.ebuild 3363
+MD5 6fff264c20ad6310193b795730887894 openmotif-2.2.3.ebuild 3251
+MD5 b385c61765918c22c7effa1cb7c70076 openmotif-2.1.30-r5.ebuild 3705
+MD5 28a527d2cc4fd68e3c0d7e7f2a79e8cf openmotif-2.1.30-r7.ebuild 4701
+MD5 81c59d7888bd2cb460b519ba6867453d ChangeLog 11059
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 d841299fd27845c9337aab463f5dd37d openmotif-2.2.3-r1.ebuild 3702
+MD5 84da30838fedca094e625631fd6dbbaa openmotif-2.1.30-r4.ebuild 3288
+MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r1 68
+MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
+MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
+MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3 68
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r4 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r5 79
-MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
-MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
-MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
-MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
-MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
-MD5 ee3a092a933a6393bf14d5d7e6231934 files/CAN-2004-0914.patch 47085
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r6 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r7 79
-MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3 68
+MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
 MD5 e408518ff6768e58a409938c473d23ce files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
-MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
-MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
-MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
 MD5 5f3081ba56f381a6c667c4677258d1c0 files/openmotif-2.2.3-XmResizeHashTable.patch 183
-MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
-MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
+MD5 d5f7bbd57d8951fec70fac481f00a83e files/openmotif-2.2.3-automake.patch 275
+MD5 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
+MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
 MD5 ae018b1d050619b521ce52cf1a822ef9 files/openmotif-2.2.3-no_demos.patch 3803
-MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
 MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 359
+MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
+MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
+MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
+MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
+MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
 MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
-MD5 d5f7bbd57d8951fec70fac481f00a83e files/openmotif-2.2.3-automake.patch 275
+MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1
new file mode 100644
index 000000000000..a6451299c75a
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r1
@@ -0,0 +1 @@
+MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2
new file mode 100644
index 000000000000..74b5f57de2b6
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914.patch.bz2
new file mode 100644
index 000000000000..7a41cf2ca6b0
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914.patch.bz2
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914_sec8.patch b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914_sec8.patch
new file mode 100644
index 000000000000..bf95bf1fd2ea
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-CAN-2004-0914_sec8.patch
@@ -0,0 +1,14 @@
+--- motif/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8	2004-11-29 14:56:12.848706139 +0100
++++ motif/lib/Xm/XpmWrFFrI.c	2004-11-29 14:56:12.872702854 +0100
+@@ -317,10 +317,7 @@
+ #ifndef NO_ZPIPE
+ 	size_t len = strlen(filename);
+ 
+-	if(len == 0                        ||
+-	   filename[0] == '/'              ||
+-	   strstr(filename, "../") != NULL ||
+-	   filename[len-1] == '/')
++	if(len == 0)
+ 		return(XpmOpenFailed);
+ 
+ 	if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
diff --git a/x11-libs/openmotif/files/CAN-2004-0914.patch b/x11-libs/openmotif/files/openmotif-2.1.30-xpm2.diff
index 1876ad76f126..1876ad76f126 100644
--- a/x11-libs/openmotif/files/CAN-2004-0914.patch
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-xpm2.diff
diff --git a/x11-libs/openmotif/metadata.xml b/x11-libs/openmotif/metadata.xml
index 20ce219711a2..c3504b40c506 100644
--- a/x11-libs/openmotif/metadata.xml
+++ b/x11-libs/openmotif/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+  <email>lanius@gentoo.org</email>
+  <name>Heinrich Wendel</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
index f5d6929d3e3d..d84ada14bac3 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild,v 1.3 2005/02/01 18:27:16 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r7.ebuild,v 1.4 2005/02/14 14:52:23 lanius Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -12,8 +12,7 @@ SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
 
 LICENSE="MOTIF"
 SLOT="0"
-KEYWORDS="-*"
-#KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 IUSE=""
 
 PROVIDE="virtual/motif"
@@ -21,6 +20,9 @@ PROVIDE="virtual/motif"
 DEPEND="virtual/libc
 	virtual/x11
 	>=sys-apps/sed-4"
+# x11-libs/motif-config
+
+SLOT="2.1"
 
 pkg_setup() {
 	# multilib includes don't work right in this package...
@@ -33,8 +35,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-xpm.diff
-	epatch ${FILESDIR}/CAN-2004-0914.patch
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 
 	ebegin "adjusting file permissions"
 	chmod -R ug+w .
@@ -51,23 +54,20 @@ src_unpack() {
 	echo >>$cfg "#define  LinuxCLibMajorVersion 6"
 	eend $? || die
 
-	sed -i -e "s:#define USE_BYACC               YES:#undef USE_BYACC:" config/cf/host.def
 
-	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm' (but install into
-	# `/etc/X11/mwm')
+	# move `system.mwmrc' from `lib/X11' to `lib/X11/mwm'
 	ebegin "patching 'clients/mwm/Imakefile' (mwm confdir)"
 	LC_ALL="C" sed -i \
 	  -e 's:\(SpecialObjectRule.*WmResParse\.o.*/lib/X11\)\(.*\):\1/mwm\2:'\
 	  -e 's:\(InstallNonExecFile.system\.mwmrc,\).*/lib/X11\(.*\):\1/etc/X11/mwm\2:'\
 	    "${S}/clients/mwm/Imakefile"
 	eend $? || die
-	#
 
-	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	epatch ${FILESDIR}/${PN}-2.1.30-imake-tmpdir.patch
 	# compile on gcc 2.9x
-	epatch ${FILESDIR}/${P}-imake-ansi.patch
-	epatch ${FILESDIR}/${P}-uil-bad_grammar_fix.diff
-	use ppc-macos && epatch ${FILESDIR}/${P}-darwin-netbsd.diff
+	epatch ${FILESDIR}/${PN}-2.1.30-imake-ansi.patch
+	epatch ${FILESDIR}/${PN}-2.1.30-uil-bad_grammar_fix.diff
+	use ppc-macos && epatch ${FILESDIR}/${PN}-2.1.30-darwin-netbsd.diff
 }
 
 src_compile() {
@@ -91,20 +91,19 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die "make install"
+	make DESTDIR=${D} VARDIR=${D}/var install || die "make install"
 	make DESTDIR=${D} install.man || die "make install.man"
 
-	# these overlap with X11
+	# cleanups
 	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
 	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
 
-	einfo "Cleaning up X11 stuff"
 	rm -fR ${D}/etc
 	for nib in ${NOINSTBIN}; do
 		f="${D}/usr/X11R6/bin/${nib}"; rm "$f" || die "rm $f"
 	done
 	for nim in ${NOINSTMAN1}; do
-		if useq ppc-macos || useq macos ; then
+		if useq ppc-macos ; then
 			f="${D}/usr/X11R6/man/man1/${nim}.1"
 		else
 			f="${D}/usr/X11R6/man/man1/${nim}.1x"
@@ -112,19 +111,48 @@ src_install() {
 		 rm "$f" || die "rm $f"
 	done
 	rm -rf "${D}/usr/X11R6/lib/X11" || die "rm config"
+	rm -rf "${D}/usr/X11R6/include/X11" || die "rm config"
 	rm -rf "${D}/usr/X11R6/lib/bindings" || die "rm bindings"
 
-	# Install in /usr/lib
-	mv ${D}/usr/X11R6/lib ${D}usr/$(get_libdir)
+	dodir /usr/share/man
+	mv ${D}/usr/X11R6/man/* ${D}/usr/share/man/
+	dodir /usr/bin
+	mv ${D}/usr/X11R6/bin/* ${D}/usr/bin/
+	dodir /usr/include
+	mv ${D}/usr/X11R6/include/* ${D}/usr/include/
+	dodir /usr/$(get_libdir)
+	mv ${D}/usr/X11R6/lib/* ${D}/usr/$(get_libdir)/
+	rm -fR ${D}/usr/X11R6
+
+
+	einfo "Fixing binaries"
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-openmotif-2.1
+	done
 
-	dodir /usr/share
-	mv ${D}/usr/X11R6/man ${D}/usr/share
+	einfo "Fixing libraries"
+	dodir /usr/$(get_libdir)/openmotif-2.1
+	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.1/
+
+	einfo "Fixing includes"
+	dodir /usr/include/openmotif-2.1/
+	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.1
+
+	einfo "Fixing man pages"
+	mans="1 3 5 7"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}x/}
+			mv ${D}/usr/share/man/man$man/${file}.${man}x ${D}/usr/share/man/man${man}/${file}-openmotif-2.1.${man}
+		done
+	done
 
 	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
-}
 
-pkg_postinst() {
-	ewarn "This might break applications linked against libXm.so.3"
-	ewarn "Just rebuild these applications."
+	# insinto /et/env.d/motif openmotif-2.2
+	# motif-config openmotif-2.2
 }
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..38680bc140ea
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r1.ebuild,v 1.1 2005/02/14 14:52:23 lanius Exp $
+
+inherit eutils libtool flag-o-matic multilib
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.org/"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="MOTIF"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=sys-apps/sed-4
+	!ppc-macos? ( =sys-devel/automake-1.4* )
+	=sys-devel/autoconf-2.5*"
+RDEPEND="virtual/libc
+	virtual/x11"
+#x11-libs/motif-config
+
+PROVIDE="virtual/motif"
+SLOT="2.2"
+
+pkg_setup() {
+	# multilib includes don't work right in this package...
+	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# various patches
+	epatch ${FILESDIR}/${P}-mwm-configdir.patch
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
+	epatch ${FILESDIR}/${P}-char_not_supported.patch
+	epatch ${FILESDIR}/${P}-pixel_length.patch
+	epatch ${FILESDIR}/${P}-popup_timeout.patch
+	epatch ${FILESDIR}/${P}-XmResizeHashTable.patch
+	epatch ${FILESDIR}/${P}-utf8.patch
+	epatch ${FILESDIR}/${P}-no_demos.patch
+	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
+
+	# autotool stuff
+	export WANT_AUTOCONF=2.5
+
+	# Patched Makefile.am to work with version 1.6 on ppc-macos.
+	# Untested elsewhere
+	use ppc-macos || export WANT_AUTOMAKE=1.4
+
+	libtoolize --force --copy
+	aclocal || die
+	AUTOMAKE_OPTS="--foreign"
+	# For some reason ppc-macos complains about missing depcomp and compile
+	# files
+	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
+	automake ${AUTOMAKE_OPTS} || die
+	autoconf || die
+}
+
+
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# fails to copmile with -jx
+	export MAKEOPTS="${MAKEOPTS} -j1"
+
+	# bug #80421
+	filter-flags -ftracer
+
+	econf --with-x || die "configuration failed"
+
+	emake || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# cleanups
+	rm -fR ${D}/usr/$(get_libdir)/X11
+	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
+	rm -fR ${D}/usr/include/X11/bitmaps/
+
+	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
+	for f in $list; do
+		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
+		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
+	done
+
+
+	einfo "Fixing binaries"
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-openmotif-2.2
+	done
+
+	einfo "Fixing libraries"
+	dodir /usr/$(get_libdir)/openmotif-2.2
+	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.2/
+
+	einfo "Fixing includes"
+	dodir /usr/include/openmotif-2.2/
+	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.2
+
+	einfo "Fixing man pages"
+	mans="1 3 4 5"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}/}
+			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-2.2.${man}
+		done
+	done
+
+
+	# install docs
+	dodoc COPYRIGHT.MOTIF LICENSE
+	dodoc README RELEASE RELNOTES
+	dodoc BUGREPORT TODO
+
+	# insinto /et/env.d/motif openmotif-2.2
+	# motif-config openmotif-2.2
+}
+
+pkg_postinst() {
+	ewarn "This breaks applications linked against libXm.so.2."
+	ewarn "You have to rebuild these applications with revdep-rebuild."
+}
diff --git a/x11-libs/openmotif/openmotif-2.2.3.ebuild b/x11-libs/openmotif/openmotif-2.2.3.ebuild
index b01da3cb1163..45bc6e1d107a 100644
--- a/x11-libs/openmotif/openmotif-2.2.3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3.ebuild,v 1.11 2005/02/09 02:16:39 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3.ebuild,v 1.12 2005/02/14 14:52:23 lanius Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -102,11 +102,7 @@ src_install() {
 
 	# remove unneeded files
 	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
-
-	# remove files provided by Apple's X11
-	if ( use ppc-macos && hasq collision-protect ${FEATURES} ); then
-		rm -fR ${D}/usr/include/X11/bitmaps/
-	fi
+	rm -fR ${D}/usr/include/X11/bitmaps/
 
 	# install docs
 	dodoc COPYRIGHT.MOTIF LICENSE