cleanups

2 files changed, 33 insertions, 12 deletions

diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index 8c0e511deba6..2648fbcd2345 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,11 +1,9 @@
 MD5 538f14f4c9a506a96c2342d3074f3240 lesstif-0.93.40.ebuild 1671
 MD5 d0af95bace88edd90d0e683c09779274 lesstif-0.93.36.ebuild 1266
-MD5 be04659b02e5762c579fabeb503ba46b lesstif-0.93.91-r1.ebuild 1331
-MD5 2684dd1df2ce30b5de4787b6c674aaba lesstif-0.93.91.ebuild 780
+MD5 1523e99fdefc3220d329ed5884f2828b lesstif-0.93.91.ebuild 1329
 MD5 a823819c9b28bf2cbde83727d091fcc1 lesstif-0.93.36-r3.ebuild 1736
-MD5 775d512fe35dccdc3da2d056cfbdb32e ChangeLog 2480
+MD5 ee2e6f4692cb0dbc160f617ffc735c22 ChangeLog 2566
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36-r3 69
-MD5 68634aa34d141564480f544d35c01785 files/digest-lesstif-0.93.91-r1 69
 MD5 caf61eda01cd0774b43a4b748b7406d6 files/digest-lesstif-0.93.36 69
 MD5 d9f21def21c6d7a280a7a40d0d8ff377 files/digest-lesstif-0.93.40 69
 MD5 68634aa34d141564480f544d35c01785 files/digest-lesstif-0.93.91 69
diff --git a/x11-libs/lesstif/lesstif-0.93.91.ebuild b/x11-libs/lesstif/lesstif-0.93.91.ebuild
index 1146c08a0a73..98676aa52a95 100644
--- a/x11-libs/lesstif/lesstif-0.93.91.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.91.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
+inherit libtool
+
 DESCRIPTION="An OSF/Motif(R) clone"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.lesstif.org/"
 LICENSE="LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="2.1"
-
-PROVIDE="virtual/motif"
+SLOT="0"
 
 DEPEND="virtual/glibc
 	virtual/x11"
@@ -19,19 +19,42 @@ src_unpack() {
 
 	cd ${S}/scripts/autoconf
 	sed -e "/^aclocaldir =/ a DESTDIR = ${D}" \
-		Makefile.in > Makefile.in.hacked
+	       Makefile.in > Makefile.in.hacked
 	mv Makefile.in.hacked Makefile.in || die
 }
 
 src_compile() {
+	elibtoolize
+
 	econf \
-		--enable-static \
-		--enable-build-21 \
-		--enable-production \
-		--with-x || die "./configure failed"
+	  --prefix=/usr/LessTif \
+	  --mandir=/usr/LessTif/man \
+	  --enable-build-12 \
+	  --disable-build-20 \
+	  --disable-build-21 \
+	  --enable-static \
+	  --enable-shared \
+	  --enable-production \
+	  --enable-verbose=no \
+	  --with-x || die "./configure failed"
+
 	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install"
+	prepman "/usr/LessTif"
+
+	dodir /usr/X11R6/lib
+	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/LessTif/lib/${lib}"\
+		      "/usr/X11R6/lib/${lib}" || die "symlinking ${lib}"
+	done
+
+	dodir "/usr/share/doc"
+	dosym "/usr/LessTif/LessTif"\
+	      "/usr/share/doc/${PF}" || die "linking docs"
 }