reverted include changes, it makes more sense to change the include path

4 files changed, 33 insertions, 22 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index ad358fbf3052..5f9a720175ea 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2003/12/01 15:25:03 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.24 2003/12/02 15:55:11 lanius Exp $
+
+  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
 
   01 Dec 2003; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r3.ebuild,
   openmotif-2.2.2-r3.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index a3b60ebf1051..a7b9031b9d1c 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,10 +1,10 @@
 MD5 e07f6b89edd5ffa4a803816b7ce33336 openmotif-2.1.30-r1.ebuild 864
 MD5 55e52e621e48d9824ff551f2c48f8d82 openmotif-2.2.2-r1.ebuild 1051
-MD5 a0dc296e40846436664ee9d86ed5ba22 openmotif-2.1.30-r3.ebuild 4247
-MD5 978d3c2a8f8c97b105082b6e1ec4c375 openmotif-2.2.2-r3.ebuild 5026
+MD5 ec58237a5621dc5bfde928131ce482ee openmotif-2.1.30-r3.ebuild 4314
+MD5 c17655cfa2311d5dec401f64700ba02e openmotif-2.2.2-r3.ebuild 5066
 MD5 b766188f8d5455c19fd57875392b2e23 openmotif-2.1.30-r2.ebuild 2743
 MD5 2de6a2239e5ddfff902676aedaefb56c openmotif-2.2.2-r2.ebuild 4804
-MD5 fb039533dd551fbb0ee5989209e7ad52 ChangeLog 3951
+MD5 d9a0b99961c2a01eee97f44d0d6d45dd ChangeLog 4135
 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
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
index 091786fc718c..e6cf38ae8354 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild
@@ -1,6 +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.4 2003/12/01 15:26:57 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r3.ebuild,v 1.5 2003/12/02 15:55:11 lanius Exp $
 
 inherit motif
 
@@ -69,7 +69,7 @@ src_install() {
 	local NOINSTBIN="imake lndir makedepend makeg mergelib mkdirhier xmkmf"
 	local NOINSTMAN1="imake lndir makedepend makeg mkdirhier xmkmf"
 
-	# cleanups
+	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"
@@ -79,7 +79,8 @@ src_install() {
 	done
 	rm -rf "${D}usr/X11R6/lib/X11/config" || die "rm config"
 
-	# move includes
+
+	einfo "Fixing includes"
 	dodir /usr/include/Mrm/2.1/Mrm
 	dodir /usr/include/Xm/2.1/Xm
 	dodir /usr/include/uil/2.1/uil
@@ -88,17 +89,16 @@ src_install() {
 	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
 
-	cd ${D}/usr/include
-	motif_fix_headers 2.1
 
-	# bin
+	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
 
-	# libs
+
+	einfo "Fixing libraries"
 	dodir /usr/lib/motif/2.1
 	mv ${D}/usr/X11R6/lib/lib* ${D}/usr/lib/motif/2.1
 
@@ -113,7 +113,8 @@ src_install() {
 	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
 
-	# man pages
+
+	einfo "Fixing man pages"
 	dodir /usr/share/man/man1
 	dodir /usr/share/man/man3
 	dodir /usr/share/man/man5
@@ -140,9 +141,12 @@ src_install() {
 		mv ${D}/usr/X11R6/man/man7/${file}.7x ${D}/usr/share/man/man7/${file}-21.7
 	done
 
-	# cleanups
+
+	einfo "Cleaning up"
 	rm -fR ${D}/usr/X11R6/
 
+
+	einfo "Fixing docs"
 	dodoc README COPYRIGHT.MOTIF RELEASE RELNOTES
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS
 }
diff --git a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
index 4fa4cb3f4858..96f269a8f44a 100644
--- a/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild
@@ -1,6 +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.2.2-r3.ebuild,v 1.7 2003/12/01 15:28:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2-r3.ebuild,v 1.8 2003/12/02 15:55:11 lanius Exp $
 
 inherit libtool motif
 
@@ -114,7 +114,8 @@ src_install() {
 		DESTDIR=${D} \
 		VARDIR=${D}/var/X11/ install || die "make install failed"
 
-	# move includes
+
+	einfo "Fixing includes"
 	dodir /usr/include/Mrm/2.2/Mrm
 	dodir /usr/include/Xm/2.2/Xm
 	dodir /usr/include/uil/2.2/uil
@@ -123,17 +124,16 @@ src_install() {
 	mv ${D}/usr/X11R6/include/Xm/*.h ${D}/usr/include/Xm/2.2/Xm
 	mv ${D}/usr/X11R6/include/uil/*.h ${D}/usr/include/uil/2.2/uil
 
-	cd ${D}/usr/include
-	motif_fix_headers 2.2
 
-	# bin
+	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.2
 	done
 
-	# libs
+
+	einfo "Fixing libraries"
 	dodir /usr/lib/motif/2.2
 	mv ${D}/usr/X11R6/lib/lib* ${D}/usr/lib/motif/2.2
 
@@ -145,7 +145,8 @@ src_install() {
 			"/usr/lib/${lib}"
 	done
 
-	# man pages
+
+	einfo "Fixing man pages"
 	dodir /usr/share/man/man1
 	dodir /usr/share/man/man3
 	dodir /usr/share/man/man4
@@ -172,10 +173,12 @@ src_install() {
 		mv ${D}/usr/X11R6/man/man5/${file}.5 ${D}/usr/share/man/man5/${file}-22.5
 	done
 
-	# cleanups
+
+	einfo "Cleaning up"
 	rm -fR ${D}/usr/X11R6/
 
-	# docs
+
+	einfo "Fixing docs"
 	dodoc COPYRIGHT.MOTIF LICENSE
 	dodoc README RELEASE RELNOTES
 	dodoc BUGREPORT OPENBUGS CLOSEDBUGS