hopefully final ebuild for motif conflicts

1 files changed, 5 insertions, 72 deletions

diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
index 6ceda9141c76..efd9bf6f8f13 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.6 2003/12/16 12:33:16 gmsoft Exp $
-
-inherit motif
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.7 2003/12/23 13:39:32 lanius Exp $
 
 MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
@@ -10,12 +8,12 @@ DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
 SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
 HOMEPAGE="http://www.metrolink.com/openmotif/"
 LICENSE="MOTIF"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 
 DEPEND="virtual/glibc
 	virtual/x11"
 
-SLOT="2.1"
+SLOT="0"
 
 # glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking
 # in nedit triggers DPMS monitor standby instead of popping up the 
@@ -78,73 +76,8 @@ src_install() {
 		f="${D}usr/X11R6/man/man1/${nim}.1x"; rm "$f" || die "rm $f"
 	done
 	rm -rf "${D}usr/X11R6/lib/X11/config" || die "rm config"
-
-
-	einfo "Fixing includes"
-	dodir /usr/include/Mrm/2.1/Mrm
-	dodir /usr/include/Xm/2.1/Xm
-	dodir /usr/include/uil/2.1/uil
-
-	mv ${D}/usr/X11R6/include/Mrm/*.h ${D}/usr/include/Mrm/2.1/Mrm
-	mv ${D}/usr/X11R6/include/Xm/*.h ${D}/usr/include/Xm/2.1/Xm
-	mv ${D}/usr/X11R6/include/uil/*.h ${D}/usr/include/uil/2.1/uil
-
-
-	einfo "Fixing binaries"
-	dodir /usr/bin
-	for file in `ls ${D}/usr/X11R6/bin`
-	do
-		mv ${D}/usr/X11R6/bin/${file} ${D}/usr/bin/${file}-2.1
-	done
-
-
-	einfo "Fixing libraries"
-	dodir /usr/lib/motif/2.1
-	mv ${D}/usr/X11R6/lib/lib* ${D}/usr/lib/motif/2.1
-
-	for lib in libMrm.so.2 libMrm.so.2.1 \
-		libXm.so.2 libXm.so.2.1 \
-		libUil.so.2 libUil.so.2.1
-	do
-		dosym "/usr/lib/motif/2.1/${lib}"\
-			"/usr/lib/${lib}"
-	done
-	dosym /usr/lib/motif/2.1/libMrm.so.2.1 /usr/lib/libMrm.so
-	dosym /usr/lib/motif/2.1/libXm.so.2.1 /usr/lib/libXm.so
-	dosym /usr/lib/motif/2.1/libUil.so.2.1 /usr/lib/libUil.so
-
-
-	einfo "Fixing man pages"
-	dodir /usr/share/man/man1
-	dodir /usr/share/man/man3
-	dodir /usr/share/man/man5
-	dodir /usr/share/man/man7
-
-	for file in `ls ${D}/usr/X11R6/man/man1`
-	do
-		file=${file/.1x/}
-		mv ${D}/usr/X11R6/man/man1/${file}.1x ${D}/usr/share/man/man1/${file}-21.1
-	done
-	for file in `ls ${D}/usr/X11R6/man/man3`
-	do
-		file=${file/.3x/}
-		mv ${D}/usr/X11R6/man/man3/${file}.3x ${D}/usr/share/man/man3/${file}-21.3
-	done
-	for file in `ls ${D}/usr/X11R6/man/man5`
-	do
-		file=${file/.5x/}
-		mv ${D}/usr/X11R6/man/man5/${file}.5x ${D}/usr/share/man/man5/${file}-21.5
-	done
-	for file in `ls ${D}/usr/X11R6/man/man7`
-	do
-		file=${file/.7x/}
-		mv ${D}/usr/X11R6/man/man7/${file}.7x ${D}/usr/share/man/man7/${file}-21.7
-	done
-
-
-	einfo "Cleaning up"
-	rm -fR ${D}/usr/X11R6/
-
+	rm -rf "${D}usr/X11R6/lib/X11/app-defaults" || die "rm app-defaults"
+	rm -rf "${D}usr/X11R6/lib/X11/binding" || die "rm bindings"
 
 	einfo "Fixing docs"
 	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES