diff options
| -rw-r--r-- | gnome-base/librsvg/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/librsvg/librsvg-2.12.0.ebuild | 15 | ||||
| -rw-r--r-- | gnome-base/librsvg/librsvg-2.9.5.ebuild | 16 |
3 files changed, 21 insertions, 16 deletions
diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index c49ef686c59e..259ad49ff855 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.82 2005/09/17 23:29:12 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.83 2005/09/20 00:48:14 leonardop Exp $ + + 20 Sep 2005; Leonardo Boshell <leonardop@gentoo.org> librsvg-2.9.5.ebuild, + librsvg-2.12.0.ebuild: + Set GTK2_CONFDIR correctly in pkg_postrm() (bug #106504). *librsvg-2.12.0 (17 Sep 2005) diff --git a/gnome-base/librsvg/librsvg-2.12.0.ebuild b/gnome-base/librsvg/librsvg-2.12.0.ebuild index d1ba4e16d0c3..3eca396d51bb 100644 --- a/gnome-base/librsvg/librsvg-2.12.0.ebuild +++ b/gnome-base/librsvg/librsvg-2.12.0.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/gnome-base/librsvg/librsvg-2.12.0.ebuild,v 1.1 2005/09/17 23:29:12 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.12.0.ebuild,v 1.2 2005/09/20 00:48:14 leonardop Exp $ inherit multilib gnome2 @@ -33,6 +33,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog NEWS README TODO" +set_gtk_confdir() { + # 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} +} + pkg_setup() { # FIXME : USEify croco support (?) G2CONF="--with-croco \ @@ -42,10 +48,6 @@ pkg_setup() { $(use_enable gnome gnome-vfs) \ $(use_enable mozilla mozilla-plugin) \ $(use_enable static)" - - # 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/} } src_install() { @@ -56,10 +58,11 @@ src_install() { } pkg_postinst() { + set_gtk_confdir gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders - } pkg_postrm() { + set_gtk_confdir 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 b1d1888ca18f..1d2c218b241b 100644 --- a/gnome-base/librsvg/librsvg-2.9.5.ebuild +++ b/gnome-base/librsvg/librsvg-2.9.5.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/gnome-base/librsvg/librsvg-2.9.5.ebuild,v 1.12 2005/08/16 18:55:51 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.9.5.ebuild,v 1.13 2005/09/20 00:48:14 leonardop Exp $ inherit gnome2 multilib @@ -38,10 +38,10 @@ G2CONF="${G2CONF} \ DOCS="AUTHORS ChangeLog README NEWS TODO" -pkg_setup() { +set_gtk_confdir() { # 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/} + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} } src_install() { @@ -54,13 +54,11 @@ src_install() { } pkg_postinst() { - - gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders - + set_gtk_confdir + gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders } pkg_postrm() { - - gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders - + set_gtk_confdir + gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders } |