Use correct GTK2_CONF_DIR on multilib systems.

(Portage version: 2.0.51.19)

4 files changed, 29 insertions, 17 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 30c8d05b1809..97d03d07cbe1 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.71 2005/04/07 15:23:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.72 2005/04/18 14:41:29 herbs Exp $
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> librsvg-2.8.1-r1.ebuild,
+  librsvg-2.9.5.ebuild:
+  Fix bug #67989, use the correct GTK2_CONF_DIR on multilib systems.
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> librsvg-2.8.1-r1.ebuild:
   stable on amd64
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 194f81f967c7..b9d679e309d5 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,17 +1,17 @@
-MD5 d9afa9ec1ecf74f3f9b22a14565e3cb5 ChangeLog 8345
+MD5 1577b32e1bc3e6dd0b61e6f556175811 librsvg-2.6.5.ebuild 1209
+MD5 9ae093294301f8980b8f5ecc87ef8254 librsvg-2.8.1-r1.ebuild 1742
+MD5 bc3e3401ea4d027902f2ea596ec8e6f8 librsvg-2.8.1.ebuild 1313
 MD5 4bd76fdf498f73f383ff25d7aa630d34 librsvg-1.0.3.ebuild 925
 MD5 62862626e0141a94877b2316316786c9 librsvg-2.4.0-r1.ebuild 1021
 MD5 b64f9893ef38a233736163fddb30a743 librsvg-2.6.4.ebuild 1351
-MD5 1577b32e1bc3e6dd0b61e6f556175811 librsvg-2.6.5.ebuild 1209
-MD5 b644e9c093a84a834f4f55168de9e551 librsvg-2.8.1-r1.ebuild 1555
-MD5 bc3e3401ea4d027902f2ea596ec8e6f8 librsvg-2.8.1.ebuild 1313
-MD5 10174f6c315ccb64948653a41ce2c373 librsvg-2.9.5.ebuild 1311
+MD5 5a6bdd68fe43487c3430cb23c9482e97 ChangeLog 8513
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 70f6afa0baffe29c6c4ab43dccbd0435 files/digest-librsvg-1.0.3 65
+MD5 b179865fc341957dbf53a1d252e2bd01 librsvg-2.9.5.ebuild 1498
+MD5 4da0dc642eed645fd4dcbbfa8c7f4989 files/librsvg-2.6.4-gcc2_fix.patch 653
 MD5 34c42ed742cb02509b40848042cbc522 files/digest-librsvg-2.4.0-r1 66
+MD5 d74e975dc13fe71bdb6a66a6e021b3d7 files/digest-librsvg-2.8.1-r1 66
+MD5 70f6afa0baffe29c6c4ab43dccbd0435 files/digest-librsvg-1.0.3 65
 MD5 a8d8e664929769b2cb10ba5dbeccb0d6 files/digest-librsvg-2.6.4 66
 MD5 46efdcbccab8e3618356a4b79cdf7a6a files/digest-librsvg-2.6.5 66
 MD5 d74e975dc13fe71bdb6a66a6e021b3d7 files/digest-librsvg-2.8.1 66
-MD5 d74e975dc13fe71bdb6a66a6e021b3d7 files/digest-librsvg-2.8.1-r1 66
 MD5 254740116b1b3ccf3e4013c37c610459 files/digest-librsvg-2.9.5 66
-MD5 4da0dc642eed645fd4dcbbfa8c7f4989 files/librsvg-2.6.4-gcc2_fix.patch 653
diff --git a/gnome-base/librsvg/librsvg-2.8.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.8.1-r1.ebuild
index 95ce9ac8a38a..7d727a4a2ecf 100644
--- a/gnome-base/librsvg/librsvg-2.8.1-r1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.8.1-r1.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/librsvg/librsvg-2.8.1-r1.ebuild,v 1.7 2005/04/07 15:23:18 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.8.1-r1.ebuild,v 1.8 2005/04/18 14:41:29 herbs Exp $
 
-inherit gnome2
+inherit gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -36,6 +36,10 @@ G2CONF="${G2CONF} \
 	--enable-pixbuf-loader \
 	--enable-gtk-theme"
 
+# An arch specific config directory is used on multilib systems
+has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
 DOCS="AUTHORS ChangeLog README NEWS TODO"
 
 src_unpack() {
@@ -60,12 +64,12 @@ src_install() {
 
 pkg_postinst() {
 
-	gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 }
 
 pkg_postrm() {
 
-	gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 }
diff --git a/gnome-base/librsvg/librsvg-2.9.5.ebuild b/gnome-base/librsvg/librsvg-2.9.5.ebuild
index 2faae1292024..a395bc81f914 100644
--- a/gnome-base/librsvg/librsvg-2.9.5.ebuild
+++ b/gnome-base/librsvg/librsvg-2.9.5.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/librsvg/librsvg-2.9.5.ebuild,v 1.1 2005/03/20 23:04:04 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.9.5.ebuild,v 1.2 2005/04/18 14:41:29 herbs Exp $
 
-inherit gnome2
+inherit gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -36,6 +36,10 @@ G2CONF="${G2CONF} \
 	--enable-pixbuf-loader \
 	--enable-gtk-theme"
 
+# An arch specific config directory is used on multilib systems
+has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
 DOCS="AUTHORS ChangeLog README NEWS TODO"
 
 src_install() {
@@ -49,12 +53,12 @@ src_install() {
 
 pkg_postinst() {
 
-	gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 }
 
 pkg_postrm() {
 
-	gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
 
 }