more virtual/motif fixes

Package-Manager: portage-2.0.51-r15

2 files changed, 24 insertions, 35 deletions

diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index b74b6a7f807c..cabedb61d60c 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,5 +1,5 @@
 MD5 217fc493f31fef3b4ebe2e11a1dd99eb lesstif-0.93.97.ebuild 2031
-MD5 3fe90fe82b83d7f13295a45e8101935d lesstif-0.94.0-r1.ebuild 2130
+MD5 563fb7fbfaca7fe9368f6ce6a92ed250 lesstif-0.94.0-r1.ebuild 1866
 MD5 fa5d70bc071b28f95c686985ce837400 lesstif-0.93.94.ebuild 2183
 MD5 e779e239b046dbc81e4cb75b0a6cc126 ChangeLog 5797
 MD5 02d292c6923224be8fe37a2ca609a29b lesstif-0.94.0.ebuild 2032
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild
index 7f9fdc23a38b..bb1dae50e507 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild,v 1.3 2005/02/14 11:30:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r1.ebuild,v 1.4 2005/02/14 13:11:17 lanius Exp $
 
 inherit libtool flag-o-matic multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~ppc-macos sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -22,7 +22,7 @@ PROVIDE="virtual/motif"
 src_compile() {
 	use ppc-macos || elibtoolize
 
-	if use ppc-macos || macos ; then
+	if use ppc-macos; then
 		append-ldflags -L/usr/lib -lX11 -lXt
 	fi
 
@@ -39,52 +39,41 @@ src_install() {
 
 
 	einfo "Fixing binaries"
-	dodir /usr/bin/lesstif
 	for file in `ls ${D}/usr/bin`
 	do
 		mv ${D}/usr/bin/${file} ${D}/usr/bin/${file}-lesstif
 	done
-	rm -f ${D}/usr/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/$(get_libdir)/LessTif
-
 
 	einfo "Fixing libraries"
 	dodir /usr/$(get_libdir)/lesstif
-	mv ${D}/usr/$(get_libdir)/$(get_libdir)* ${D}/usr/$(get_libdir)/lesstif
-
+	mv ${D}/usr/lib/* ${D}/usr/$(get_libdir)/lesstif/
 
 	einfo "Fixing includes"
 	dodir /usr/include/lesstif/
 	mv ${D}/usr/include/* ${D}/usr/include/lesstif
-	rm -fR ${D}/usr/include
-
 
 	einfo "Fixing man pages"
-	dodir /usr/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}-lesstif.1
+	mans="1 3 5"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}/}
+			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-lesstif.${man}
+		done
 	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}-lesstif.3
-	done
-	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}-lesstif.5
-	done
-	rm -fR ${D}/usr/share/man
 
-	rm -fR ${D}/usr/share/aclocal
+
+	einfo "Fixing docs"
+	dodir /usr/share/doc/
+	mv ${D}/usr/LessTif ${D}/usr/share/doc/${P}
+	rm -fR ${D}/usr/$(get_libdir)/LessTif
+
+	# cleanup
+	rm -f ${D}/usr/bin/mxmkmf-lesstif
+	rm -fR ${D}/usr/share/aclocal/
+	rm -fR ${D}/usr/$(get_libdir)/lesstif/LessTif/
+	rm -fR ${D}/usr/$(get_libdir)/X11/
 
 	# insinto /et/env.d/motif lesstif
 	# motif-config lesstif