[patch] teh patch

icon_multilibstrict.patch (text/plain), 2.03 KB, created by Alexis Ballier on 2008-02-10 17:58:54 UTC

Index: icon-9.4.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r2.ebuild,v
retrieving revision 1.10
diff -u -B -r1.10 icon-9.4.3-r2.ebuild
--- icon-9.4.3-r2.ebuild	18 Dec 2007 21:12:51 -0000	1.10
+++ icon-9.4.3-r2.ebuild	10 Feb 2008 17:58:25 -0000
@@ -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.10 2007/12/18 21:12:51 jer 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"
@@ -66,35 +66,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
 }