Multilib fixes.

(Portage version: 2.0.51.22-r1)

5 files changed, 47 insertions, 27 deletions

diff --git a/dev-dotnet/gecko-sharp/ChangeLog b/dev-dotnet/gecko-sharp/ChangeLog
index 6ad30f83d4d2..86dda06dbabb 100644
--- a/dev-dotnet/gecko-sharp/ChangeLog
+++ b/dev-dotnet/gecko-sharp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/gecko-sharp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/ChangeLog,v 1.31 2005/05/21 09:31:03 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/ChangeLog,v 1.32 2005/05/31 12:14:57 herbs Exp $
+
+  31 May 2005; Herbie Hopkins <herbs@gentoo.org> gecko-sharp-0.6.ebuild,
+  gecko-sharp-0.7-r1.ebuild, gecko-sharp-0.10.ebuild:
+  Multilib fixes.
 
   21 May 2005; Tom Martin <slarti@gentoo.org> gecko-sharp-0.10.ebuild:
   Marked ~amd64.
diff --git a/dev-dotnet/gecko-sharp/Manifest b/dev-dotnet/gecko-sharp/Manifest
index f989b09f296e..aa08ca8dcb99 100644
--- a/dev-dotnet/gecko-sharp/Manifest
+++ b/dev-dotnet/gecko-sharp/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0aa237b162e562ac3a72181d852f7911 gecko-sharp-0.10.ebuild 926
-MD5 b65cb61696c67ca3ca57c00b14583b54 ChangeLog 4187
-MD5 a23fed44e980c33f3c407d9a75898c9e gecko-sharp-0.7.ebuild 990
+MD5 c42fd1229d4075f06783ea8d640b5c39 gecko-sharp-0.7-r1.ebuild 1222
 MD5 b066a0a800c3aa974941a7c76abc2c57 gecko-sharp-0.5-r2.ebuild 747
-MD5 6fc8ff05493b0300a40082c19d694d4a gecko-sharp-0.7-r1.ebuild 1091
+MD5 712ac12ac2dfb03e4e5eae3551f05eaf gecko-sharp-0.6.ebuild 893
+MD5 abbdf03e6173449d58138d0e645af279 gecko-sharp-0.10.ebuild 1352
+MD5 a23fed44e980c33f3c407d9a75898c9e gecko-sharp-0.7.ebuild 990
+MD5 bb89b4bcdcc7d91947c06564e5827741 ChangeLog 4333
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 95e7a7fe00013c49ca13ec20fc5f039e gecko-sharp-0.6.ebuild 752
-MD5 e1474f95b8a6ffc1af4ec208a4bab724 files/digest-gecko-sharp-0.10 72
-MD5 a38f4e44ece71af1b0528ace678cb4d5 files/digest-gecko-sharp-0.7 67
 MD5 54b9bdcc1876fbeb916b8a5fb29adaa2 files/gecko-sharp-0.7-1.9.3-compat.diff 698
+MD5 41db66016dd18480802fc0e658a04746 files/digest-gecko-sharp-0.5-r2 67
 MD5 a38f4e44ece71af1b0528ace678cb4d5 files/digest-gecko-sharp-0.7-r1 67
 MD5 9aa313387703e02ad1bcddcde0729a66 files/digest-gecko-sharp-0.6 67
-MD5 41db66016dd18480802fc0e658a04746 files/digest-gecko-sharp-0.5-r2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjv/yCHk4+ZoBpvsRAkF0AKCGdQYlaabzvMBpTzTvOYlSkBNmYQCfVL8Z
-6LPXjf0yh9mS+HvaTov8840=
-=+ODB
------END PGP SIGNATURE-----
+MD5 a38f4e44ece71af1b0528ace678cb4d5 files/digest-gecko-sharp-0.7 67
+MD5 e1474f95b8a6ffc1af4ec208a4bab724 files/digest-gecko-sharp-0.10 72
diff --git a/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild b/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild
index 84b4dffd0a8c..ae53b4af7c4b 100644
--- a/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild
+++ b/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild,v 1.3 2005/05/21 09:31:03 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.10.ebuild,v 1.4 2005/05/31 12:14:57 herbs Exp $
 
-inherit mono
+inherit mono multilib
 
 MY_P="${P/${PN}/${PN}-2.0}"
 
@@ -21,6 +21,19 @@ DEPEND=">=dev-lang/mono-1.0
 	>=dev-dotnet/gtk-sharp-1.9.2
 	www-client/mozilla"
 
+src_unpack() {
+	unpack ${A}
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+			-e 's:${prefix}/lib:${libdir}:' \
+			-e 's:$(prefix)/lib:$(libdir):' \
+			${S}/{Makefile.*,*.pc.in} || die
+		sed -i -e "s:GACUTIL_FLAGS=.*:GACUTIL_FLAGS=\'/root \$(DESTDIR)\$(libdir) \
+				/package gecko-sharp-2.0 /gacdir \$(DESTDIR)\$(libdir)\':" \
+			${S}/configure* || die
+	fi
+}
+
 src_compile() {
 	econf || die "./configure failed!"
 	emake -j1 || die "emake failed"
@@ -32,6 +45,6 @@ src_install() {
 	mv ${D}/usr/bin/webshot ${D}/usr/bin/webshot-2.0
 	sed -i -e "s:nailer:nailer-2.0:" ${D}/usr/bin/webshot-2.0
 
-	mv ${D}/usr/lib/gecko-sharp/WebThumbnailer.exe \
-		${D}/usr/lib/gecko-sharp/WebThumbnailer-2.0.exe
+	mv ${D}/usr/$(get_libdir)/gecko-sharp/WebThumbnailer.exe \
+		${D}/usr/$(get_libdir)/gecko-sharp/WebThumbnailer-2.0.exe
 }
diff --git a/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild b/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild
index 1dc16d76218e..e938987a1a4d 100644
--- a/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild
+++ b/dev-dotnet/gecko-sharp/gecko-sharp-0.6.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/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild,v 1.11 2005/05/16 20:13:46 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.6.ebuild,v 1.12 2005/05/31 12:14:57 herbs Exp $
 
 inherit mono
 
@@ -17,6 +17,14 @@ DEPEND=">=dev-lang/mono-1.0
 	=dev-dotnet/gtk-sharp-1.0*
 	www-client/mozilla"
 
+src_unpack() {
+	unpack ${A}
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+			${S}/*.pc.in || die
+	fi
+}
+
 src_compile() {
 	econf || die "./configure failed!"
 	emake -j1 || die "Make failed. You may need to unmerge gecko-sharp and re-emerge it if you are upgrading from an earlier version."
diff --git a/dev-dotnet/gecko-sharp/gecko-sharp-0.7-r1.ebuild b/dev-dotnet/gecko-sharp/gecko-sharp-0.7-r1.ebuild
index 379de33f47fa..c849b3c000b1 100644
--- a/dev-dotnet/gecko-sharp/gecko-sharp-0.7-r1.ebuild
+++ b/dev-dotnet/gecko-sharp/gecko-sharp-0.7-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/dev-dotnet/gecko-sharp/gecko-sharp-0.7-r1.ebuild,v 1.2 2005/05/17 15:21:20 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gecko-sharp/gecko-sharp-0.7-r1.ebuild,v 1.3 2005/05/31 12:14:57 herbs Exp $
 
 inherit mono eutils
 
@@ -23,6 +23,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-1.9.3-compat.diff
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+			${S}/*.pc.in || die
+	fi
 }
 
 src_compile() {
@@ -36,6 +41,6 @@ src_install() {
 	mv ${D}/usr/bin/webshot ${D}/usr/bin/webshot-2.0
 	sed -i -e "s:nailer:nailer-2.0:" ${D}/usr/bin/webshot-2.0
 
-	mv ${D}/usr/lib/gecko-sharp/WebThumbnailer.exe \
-		${D}/usr/lib/gecko-sharp/WebThumbnailer-2.0.exe
+	mv ${D}/usr/$(get_libdir)/gecko-sharp/WebThumbnailer.exe \
+		${D}/usr/$(get_libdir)/gecko-sharp/WebThumbnailer-2.0.exe
 }