put lesstif files in /usr/X11R6/{lib,include/bin}/lesstif

3 files changed, 27 insertions, 24 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index b407885944ce..4c9fd9019ef5 100644
--- a/x11-libs/lesstif/ChangeLog
+++ b/x11-libs/lesstif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/lesstif
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.19 2003/12/06 18:00:57 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.20 2003/12/23 14:21:34 lanius Exp $
+
+  23 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.91.ebuild:
+  put lesstif files in /usr/X11R6/{lib,include/bin}/lesstif
 
   06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.91.ebuild:
   added ~amd64
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index d7f6bddb3c14..4eaa4fca3cec 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,8 +1,8 @@
 MD5 538f14f4c9a506a96c2342d3074f3240 lesstif-0.93.40.ebuild 1671
 MD5 d0af95bace88edd90d0e683c09779274 lesstif-0.93.36.ebuild 1266
-MD5 eb20076a16459ca5ccd583fcdf0958a3 lesstif-0.93.91.ebuild 2065
+MD5 7c83bb1b2bfb70563fcfb8d34a219ff0 lesstif-0.93.91.ebuild 2093
 MD5 a823819c9b28bf2cbde83727d091fcc1 lesstif-0.93.36-r3.ebuild 1736
-MD5 08f83a76a9287ff0c619f98c497789f3 ChangeLog 3108
+MD5 80179decc0c64df6d040074ba5b2e99a ChangeLog 3244
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36-r3 69
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36 69
 MD5 d9f21def21c6d7a280a7a40d0d8ff377 files/digest-lesstif-0.93.40 69
diff --git a/x11-libs/lesstif/lesstif-0.93.91.ebuild b/x11-libs/lesstif/lesstif-0.93.91.ebuild
index 6bd41b7809d4..3f548a63e1a0 100644
--- a/x11-libs/lesstif/lesstif-0.93.91.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.91.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.lesstif.org/"
 LICENSE="LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-SLOT="1.2"
+SLOT="0"
 
 DEPEND="virtual/glibc
 	virtual/x11"
@@ -35,59 +35,59 @@ src_install() {
 
 
 	einfo "Fixing binaries"
+	dodir /usr/X11R6/bin/lesstif
 	for file in `ls ${D}/usr/bin`
 	do
-		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-1.2
+		mv ${D}/usr/bin/${file} ${D}/usr/X11R6/bin/lesstif/${file}
 	done
+	rm -f ${D}/usr/X11R6/bin/lesstif/mxmkmf
+	rm -fR ${D}/usr/bin
 
 
 	einfo "Fixing docs"
 	dodir /usr/share/doc/
 	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
+	rm -fR ${D}/usr/lib/LessTif
 
 
 	einfo "Fixing libraries"
-	dodir /usr/lib/motif/1.2
-	mv ${D}/usr/lib/lib* ${D}/usr/lib/motif/1.2
+	dodir /usr/X11R6/lib/lesstif
+	mv ${D}/usr/lib/lib* ${D}/usr/X11R6/lib/lesstif
 
 	for lib in libMrm.so.1 libMrm.so.1.0.2 \
 		libUil.so.1 libUil.so.1.0.2 \
 		libXm.so.1  libXm.so.1.0.2
 	do
-		dosym "/usr/lib/motif/1.2/${lib}"\
-			"/usr/lib/${lib}"
+		dosym "/usr/X11R6/lib/lesstif/${lib}"\
+			"/usr/X11R6/lib/${lib}"
 	done
+	rm -fR ${D}/usr/lib
 
 
 	einfo "Fixing includes"
-	dodir /usr/include/Mrm/1.2/Mrm
-	dodir /usr/include/Xm/1.2/Xm
-	dodir /usr/include/uil/1.2/uil
-
-	mv ${D}/usr/include/Mrm/*.h ${D}/usr/include/Mrm/1.2/Mrm
-	mv ${D}/usr/include/Xm/*.h ${D}/usr/include/Xm/1.2/Xm
-	mv ${D}/usr/include/uil/*.{h,uil} ${D}/usr/include/uil/1.2/uil
+	dodir /usr/X11R6/include/lesstif/
+	mv ${D}/usr/include/* ${D}/usr/X11R6/include/lesstif
+	rm -fR ${D}/usr/include
 
 
 	einfo "Fixing man pages"
+	dodir /usr/X11R6/share/man/{man1,man3,man5}
 	for file in `ls ${D}/usr/share/man/man1`
 	do
 		file=${file/.1/}
-		mv ${D}/usr/share/man/man1/${file}.1 ${D}/usr/share/man/man1/${file}-12.1
+		mv ${D}/usr/share/man/man1/${file}.1 ${D}/usr/X11R6/share/man/man1/${file}-12.1
 	done
 	for file in `ls ${D}/usr/share/man/man3`
 	do
 		file=${file/.3/}
-		mv ${D}/usr/share/man/man3/${file}.3 ${D}/usr/share/man/man3/${file}-12.3
+		mv ${D}/usr/share/man/man3/${file}.3 ${D}/usr/X11R6/share/man/man3/${file}-12.3
 	done
-	for file in `ls ${D}/usr/share/man/man5`
+	for file in `ls ${D}/usr/share/man/man6`
 	do
 		file=${file/.5/}
-		mv ${D}/usr/share/man/man5/${file}.5 ${D}/usr/share/man/man5/${file}-12.5
+		mv ${D}/usr/share/man/man3/${file}.5 ${D}/usr/X11R6/share/man/man3/${file}-12.5
 	done
+	rm -fR ${D}/usr/share/man
 
-	einfo "Cleaning up"
-	rm -fR ${D}/usr/lib/LessTif
-	rm -fR ${D}/usr/lib/X11
-	rm -f  ${D}/bin/mxmkmf-1.2
+	rm -fR ${D}/usr/share/aclocal
 }