hopefully final ebuild for motif conflicts

3 files changed, 20 insertions, 84 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index c2a3cdcd9a3d..332e98da2d51 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.28 2003/12/16 23:13:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.29 2003/12/23 13:39:32 lanius Exp $
 
   16 Dec 2003; <agriffis@gentoo.org> openmotif-2.2.2-r3.ebuild:
   stable on ia64
@@ -8,6 +8,9 @@
   16 Dec 2003; Guy Martin <gmsoft@gentoo.org> openmotif-2.1.30-r1.ebuild:
   Marked stable on hppa.
 
+  23 Dec 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild:
+  hopefully final ebuild for motif conflicts
+
   02 Dec 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild,
   openmotif-2.2.2-r3.ebuild:
   reverted include changes, it makes more sense to change the include path
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index ad6e8d8d4e7f..e8269eaba944 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,19 +1,19 @@
 MD5 9939ef9e24d2968ac1467e6f8e0119a1 openmotif-2.1.30-r1.ebuild 867
-MD5 b766188f8d5455c19fd57875392b2e23 openmotif-2.1.30-r2.ebuild 2743
-MD5 7372a44803aa448581895d87e4994428 openmotif-2.1.30-r3.ebuild 4308
 MD5 62e82cf326fc67b7873f6182d3f5188d openmotif-2.2.2-r1.ebuild 1049
-MD5 2de6a2239e5ddfff902676aedaefb56c openmotif-2.2.2-r2.ebuild 4804
+MD5 357150b44c257fa9d7770343f8da1521 openmotif-2.1.30-r3.ebuild 2750
 MD5 c083f3c3c28bc67fb4e752f19e1a8d76 openmotif-2.2.2-r3.ebuild 5073
-MD5 4d626154183e3794eca169133add911a ChangeLog 4319
-MD5 aaf04376f7011a2f68b7961100f611fb files/Mwm.defaults 536
-MD5 d9fb88b149d0eb40279440b75183c850 files/animate-demo.diff 498
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r1 79
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r2 79
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r3 79
+MD5 b766188f8d5455c19fd57875392b2e23 openmotif-2.1.30-r2.ebuild 2743
+MD5 2de6a2239e5ddfff902676aedaefb56c openmotif-2.2.2-r2.ebuild 4804
+MD5 c15de46ccfdd6d11072a084985b1c33f ChangeLog 4442
+MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
 MD5 009fd49058dd31057e2cbdc0c5cbb6a5 files/digest-openmotif-2.2.2-r1 136
 MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2-r2 68
 MD5 e0b6cf2385221247e7204f63a199c6c3 files/digest-openmotif-2.2.2-r3 68
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r1 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r2 79
+MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r3 79
 MD5 de211ad75fe5ccc5bfb4794dec54157f files/include-order.diff 597
-MD5 216193f922fae0747195fd851696b580 files/mwm-configdir.patch 1549
-MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
 MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+MD5 d9fb88b149d0eb40279440b75183c850 files/animate-demo.diff 498
+MD5 aaf04376f7011a2f68b7961100f611fb files/Mwm.defaults 536
+MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
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