fix multilib-strict issues

Package-Manager: portage-2.0.51.22-r3

3 files changed, 24 insertions, 19 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 5fd9609fc7f8..091fa3e61755 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.112 2005/10/17 12:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.113 2005/11/24 12:41:19 blubb Exp $
+
+  24 Nov 2005; Simon Stelling <blubb@gentoo.org> gal-0.24.ebuild:
+  fix multilib-strict issues
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org> gal-0.24.ebuild:
   Mark 0.24 stable on ia64
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index b01c7783727a..a457c6001dc9 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,17 +1,17 @@
+MD5 254606ed3a2bd55a1de1d4fd5aef7609 ChangeLog 12435
+MD5 9d0017c08b56fd1a6194cf0d507e15ca gal-1.99.11.ebuild 969
+MD5 af29f367a5cf64352efc40f7090dc2dc gal-0.24.ebuild 2194
 MD5 866d71718fbd730feb8e2324148c9030 gal-2.4.3.ebuild 1232
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 48240ca7733a66175155d806e516b162 ChangeLog 12342
+MD5 9ff9fee55965d99be176562ad9209aa6 gal-2.2.4.ebuild 1283
 MD5 d4c9f96e5bcd2da8f027089685a58803 gal-2.2.5.ebuild 1285
-MD5 ef1cc033cd7891f05757aaa4412b774e gal-0.24.ebuild 2094
 MD5 e5e37fe28167909da191d05d1582a91d gal-2.4.1.ebuild 1155
-MD5 9d0017c08b56fd1a6194cf0d507e15ca gal-1.99.11.ebuild 969
-MD5 9ff9fee55965d99be176562ad9209aa6 gal-2.2.4.ebuild 1283
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 d3f2cb3e99716f24029dd7afa3fa97a3 files/digest-gal-0.24 62
+MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
 MD5 5dcd5a971a2fcca6c5fef688892c7926 files/digest-gal-2.4.3 63
-MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
-MD5 dd70bd29550176ee681bf6b7893071a0 files/digest-gal-2.2.5 63
 MD5 c6255084120bc27d90ae92dd62826c16 files/digest-gal-2.2.4 63
-MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
-MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
+MD5 dd70bd29550176ee681bf6b7893071a0 files/digest-gal-2.2.5 63
 MD5 a10092842b8cabef52b8995773852a22 files/digest-gal-2.4.1 63
-MD5 d3f2cb3e99716f24029dd7afa3fa97a3 files/digest-gal-0.24 62
+MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
+MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
+MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
diff --git a/gnome-extra/gal/gal-0.24.ebuild b/gnome-extra/gal/gal-0.24.ebuild
index b0840488e70a..34f62160713a 100644
--- a/gnome-extra/gal/gal-0.24.ebuild
+++ b/gnome-extra/gal/gal-0.24.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/gnome-extra/gal/gal-0.24.ebuild,v 1.19 2005/10/17 12:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.24.ebuild,v 1.20 2005/11/24 12:41:19 blubb Exp $
 
-inherit gnome.org libtool eutils
+inherit gnome.org libtool eutils multilib
 
 DESCRIPTION="The Gnome Application Libraries"
 HOMEPAGE="http://www.gnome.org/"
@@ -47,7 +47,8 @@ src_compile() {
 		    --prefix=/usr \
 		    --sysconfdir=/etc \
 		    --localstatedir=/var/lib \
-		     ${myconf} || die
+			--libdir=/usr/$(get_libdir) \
+			${myconf} || die
 
 	if use alpha; then
 		# This program doesn't link on alpha, at least with the
@@ -62,16 +63,17 @@ src_compile() {
 src_install() {
 	make prefix=${D}/usr \
 	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
+	     localstatedir=${D}/var/lib \
+		 libdir=${D}/usr/$(get_libdir) \
 	     install || die
 
 	# Add some type of backward compat...
-	local fullname="`eval basename \`readlink ${D}/usr/lib/libgal.so\``"
-	dosym ${fullname##*/} /usr/lib/libgal.so.$((`echo ${PV} | cut -d. -f2`-1))
+	local fullname="`eval basename \`readlink ${D}/usr/$(get_libdir)/libgal.so\``"
+	dosym ${fullname##*/} /usr/$(get_libdir)/libgal.so.$((`echo ${PV} | cut -d. -f2`-1))
 
 	# gal-0.23 provides libgal.so.21, and its compatible with 0.24
 	# so we add this symlink for more backwards compatibility - liquidx.
-	dosym ${fullname##*/} /usr/lib/libgal.so.21
+	dosym ${fullname##*/} /usr/$(get_libdir)/libgal.so.21
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README
 }