Fixed multilib-strict issue.

Package-Manager: portage-2.0.51.19

3 files changed, 22 insertions, 17 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index f8e31106ee25..ceb0145f6e39 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.15 2005/04/17 13:34:04 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.16 2005/04/19 23:18:36 herbs Exp $
+
+  19 Apr 2005; Herbie Hopkins <herbs@gentoo.org> orbit-0.5.17.ebuild:
+  Fixed multilib-strict issue, bug #88549
 
 *orbit-2.12.2 (17 Apr 2005)
 
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 041bb3d06214..67f05218b769 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2582a263700119dac4786dfe2032ff26 ChangeLog 1891
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ed34b0cf4ce38ef6bcb6b49bdbf273db orbit-0.5.17.ebuild 1506
+MD5 366357f2dd6112dcc288c34b689413d0 orbit-2.12.2.ebuild 1038
+MD5 7d02190487c1313dff1df9488041e832 orbit-2.10.3.ebuild 1033
+MD5 6771e8dc864f613abcc0a84d89ebd374 orbit-0.5.17.ebuild 1619
 MD5 09b07bbdb8993d01fd0400ff70d22050 orbit-2.10.0.ebuild 992
+MD5 f0a8148b5bf1f957ce71012be00dc329 orbit-2.12.1.ebuild 1038
 MD5 adf6161afabb12a91544845a5a8b23d6 orbit-2.10.2.ebuild 1400
-MD5 7d02190487c1313dff1df9488041e832 orbit-2.10.3.ebuild 1033
 MD5 e2bfa71161d4ccf806402d532f8ce614 orbit-2.10.4.ebuild 1023
+MD5 73513b7a09065c73e8f2c69c97c8f4e4 ChangeLog 2005
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 7e3741e3b63851e23c3ef0ae2e9c4fcd orbit-2.12.0.ebuild 1126
-MD5 f0a8148b5bf1f957ce71012be00dc329 orbit-2.12.1.ebuild 1038
-MD5 366357f2dd6112dcc288c34b689413d0 orbit-2.12.2.ebuild 1038
 MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-orbit-0.5.17 66
 MD5 b6e4b20cee3509d04f2651315328e1d5 files/digest-orbit-2.10.0 66
 MD5 8a5c202be9737ff8b7fce75d36f1c878 files/digest-orbit-2.10.2 66
 MD5 f951e87ddc66d6ef47ebd24cedbc8545 files/digest-orbit-2.10.3 66
 MD5 763baa27841f44f10aa13a502816c867 files/digest-orbit-2.10.4 66
 MD5 56089adf3d4cbee72a699b2f8ade07ca files/digest-orbit-2.12.0 66
-MD5 54d4643035be77ed8362225823cd7b60 files/libIDLConf.sh-gentoo.diff 462
-MD5 733dcc9642be4e30137d76a4014742cd files/orbit2-alignment-fix.patch 510
 MD5 37466577b20f8ae228826573b3346263 files/digest-orbit-2.12.1 66
 MD5 66a18f0f92e9cd0f658690bf1e5c862c files/digest-orbit-2.12.2 66
+MD5 54d4643035be77ed8362225823cd7b60 files/libIDLConf.sh-gentoo.diff 462
+MD5 733dcc9642be4e30137d76a4014742cd files/orbit2-alignment-fix.patch 510
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCYmWOXjcVihsel0ERAnMfAJ4+OdW6r10RVhYIEkiQV2VntIemMwCguUkO
-oeijgnoBvHp85el+zRqc2z8=
-=7zPy
+iD8DBQFCZZHg2G5bA0cA/ScRAonKAKCO9uEbAz/ey/Jp27ia+FqKjY1UeACgqo9H
+fUbHgKTp632/e10+CPjpJRo=
+=a7S7
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/orbit-0.5.17.ebuild b/gnome-base/orbit/orbit-0.5.17.ebuild
index 4b4ccb712cbc..9e7b5a3dd8f1 100644
--- a/gnome-base/orbit/orbit-0.5.17.ebuild
+++ b/gnome-base/orbit/orbit-0.5.17.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-base/orbit/orbit-0.5.17.ebuild,v 1.5 2005/01/08 23:35:35 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-0.5.17.ebuild,v 1.6 2005/04/19 23:18:36 herbs Exp $
 
-inherit gnome.org libtool gnuconfig
+inherit gnome.org libtool gnuconfig multilib
 
 MY_P="ORBit-${PV}"
 PVP=(${PV//[-\._]/ })
@@ -32,6 +32,7 @@ src_compile() {
 
 	./configure --host=${CHOST} \
 		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
@@ -42,6 +43,7 @@ src_compile() {
 
 src_install() {
 	make prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		sysconfdir=${D}/etc \
 		infodir=${D}/usr/share/info \
 		localstatedir=${D}/var/lib \
@@ -58,6 +60,6 @@ src_install() {
 	cd ../popt
 	dodoc CHANGES COPYING README
 
-	cd ${D}/usr/lib
-	patch -p0 < ${FILESDIR}/libIDLConf.sh-gentoo.diff
+	sed -i -e 's:-I/usr/include":-I/usr/include/libIDL-1.0":' \
+		${D}/usr/$(get_libdir)/libIDLConf.sh || die
 }