more cleanups

3 files changed, 59 insertions, 23 deletions

diff --git a/x11-libs/lesstif/ChangeLog b/x11-libs/lesstif/ChangeLog
index 12b65de8bbee..b57d973c7f1b 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.14 2003/10/31 14:45:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/ChangeLog,v 1.15 2003/11/19 16:54:44 lanius Exp $
+
+  19 Nov 2003; Heinrich Wendel <lanius@gentoo.org> lesstif-0.93.91.ebuild:
+  next attemp to cleanup
 
   31 Oct 2003; Heinrich Wendel <lanius@gentoo.org> :
   new release of motif cleanups
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 2648fbcd2345..270278aecb07 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 1523e99fdefc3220d329ed5884f2828b lesstif-0.93.91.ebuild 1329
+MD5 d25e5fe8ae5e3427ec952daf311811de lesstif-0.93.91.ebuild 1944
 MD5 a823819c9b28bf2cbde83727d091fcc1 lesstif-0.93.36-r3.ebuild 1736
-MD5 ee2e6f4692cb0dbc160f617ffc735c22 ChangeLog 2566
+MD5 60dc546963e0cb3ab6d765eefe4acb4d ChangeLog 2667
 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 98676aa52a95..11884fc7b6d9 100644
--- a/x11-libs/lesstif/lesstif-0.93.91.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.91.ebuild
@@ -14,21 +14,10 @@ SLOT="0"
 DEPEND="virtual/glibc
 	virtual/x11"
 
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/scripts/autoconf
-	sed -e "/^aclocaldir =/ a DESTDIR = ${D}" \
-	       Makefile.in > Makefile.in.hacked
-	mv Makefile.in.hacked Makefile.in || die
-}
-
 src_compile() {
 	elibtoolize
 
 	econf \
-	  --prefix=/usr/LessTif \
-	  --mandir=/usr/LessTif/man \
 	  --enable-build-12 \
 	  --disable-build-20 \
 	  --disable-build-21 \
@@ -43,18 +32,62 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die "make install"
-	prepman "/usr/LessTif"
 
-	dodir /usr/X11R6/lib
+
+	# bin
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-1.2
+	done
+
+
+	# docs
+	dodir /usr/share/doc/
+	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
+
+
+	# garbage
+	rm -fR ${D}/usr/lib/LessTif
+	rm -fR ${D}/usr/lib/X11
+
+
+	# libs
+	dodir /usr/lib/motif/1.2
+	mv ${D}/usr/lib/lib* ${D}/usr/lib/motif/1.2
+
 	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
+		libUil.so.1 libUil.so.1.0.2 \
+		libXm.so.1  libXm.so.1.0.2
 	do
-		dosym "/usr/LessTif/lib/${lib}"\
-		      "/usr/X11R6/lib/${lib}" || die "symlinking ${lib}"
+		dosym "/usr/lib/motif/1.2/${lib}"\
+			"/usr/lib/${lib}"
 	done
 
-	dodir "/usr/share/doc"
-	dosym "/usr/LessTif/LessTif"\
-	      "/usr/share/doc/${PF}" || die "linking docs"
+
+	# 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
+
+
+	# man pages
+	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
+	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
+	done
+	for file in `ls ${D}/usr/share/man/man5`
+	do
+		file=${file/.5/}
+		mv ${D}/usr/share/man/man5/${file}.5 ${D}/usr/share/man/man5/${file}-12.5
+	done
 }