--- icon-9.4.3-r2.ebuild	2008-08-24 10:49:51.000000000 +0200
+++ icon-9.4.3-r3.ebuild	2008-08-24 11:18:15.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r2.ebuild,v 1.15 2008/08/08 17:20:40 nixnut Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -14,7 +14,7 @@
 KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X iplsrc"
 
-S=${WORKDIR}/icon.v${MY_PV}src
+S="${WORKDIR}/icon.v${MY_PV}src"
 
 DEPEND="X? ( x11-proto/xextproto
 			x11-proto/xproto
@@ -33,6 +33,9 @@
 	# kwds.std - add two lines for the two new added keywords
 	# nargs.std - a couple of functions picked up additional parameters
 	epatch "${FILESDIR}/tests-${MY_PV}.patch"
+
+	# do not prestrip files
+	find "${S}"/src -name 'Makefile' | xargs sed -i -e "/strip/d" || die
 }
 
 src_compile() {
@@ -66,35 +69,35 @@
 src_install() {
 	dodir /usr
 	dodir /usr/bin
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 
-	make Install dest="${D}/usr/lib/icon" || die "Make install failed"
-	dosym /usr/lib/icon/bin/icont /usr/bin/icont
-	dosym /usr/lib/icon/bin/iconx /usr/bin/iconx
-	dosym /usr/lib/icon/bin/icon  /usr/bin/icon
-	dosym /usr/lib/icon/bin/vib   /usr/bin/vib
+	make Install dest="${D}/usr/$(get_libdir)/icon" || die "Make install failed"
+	dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym /usr/$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	dosym /usr/$(get_libdir)/icon/bin/vib   /usr/bin/vib
 
 	cd "${S}/man/man1"
 	doman icont.1
 	doman icon.1
-	rm -rf "${D}"/usr/lib/icon/man
+	rm -rf "${D}"/usr/$(get_libdir)/icon/man
 
 	cd "${S}/doc"
 	dodoc *.txt *.sed ../README
 	# dohtml ignores all anything except .html files, no use here
 	mkdir -p "${D}"/usr/share/doc/${PF}/html
 	cp -dpR *.htm *.gif *.jpg *.css "${D}"/usr/share/doc/${PF}/html
-	rm -rf "${D}"/usr/lib/icon/{doc,README}
+	rm -rf "${D}"/usr/$(get_libdir)/icon/{doc,README}
 
 	# optional Icon Programming Library
 	if use iplsrc; then
 		cd "${S}"
-		dodir /usr/lib/icon/ipl
+		dodir /usr/$(get_libdir)/icon/ipl
 		rm ipl/BuildBin
 		rm ipl/BuildExe
 		rm ipl/CheckAll
 		rm ipl/Makefile
-		insinto /usr/lib/icon
+		insinto /usr/$(get_libdir)/icon
 		doins -r ipl
 	fi
 }