From 974f8099fe985e923d56970f2a4fbb5ad4443641 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Tue, 20 Sep 2005 00:48:14 +0000 Subject: Set GTK2_CONFDIR correctly inside pkg_postrm() (bug #106504) Package-Manager: portage-2.0.52-r1 --- gnome-base/librsvg/ChangeLog | 6 +++++- gnome-base/librsvg/Manifest | 6 +++--- gnome-base/librsvg/librsvg-2.12.0.ebuild | 15 +++++++++------ gnome-base/librsvg/librsvg-2.9.5.ebuild | 16 +++++++--------- 4 files changed, 24 insertions(+), 19 deletions(-) (limited to 'gnome-base') 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 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/Manifest b/gnome-base/librsvg/Manifest index 7fc648f3c302..8e7688079551 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,8 +1,8 @@ -MD5 a5bb8566a5604958d6d8f889de8bbee0 ChangeLog 9612 +MD5 d97c1371b3487e4f5505e56ecf48acd0 ChangeLog 9775 MD5 4bd76fdf498f73f383ff25d7aa630d34 librsvg-1.0.3.ebuild 925 -MD5 198fff836851acfa8a3993c504bb8458 librsvg-2.12.0.ebuild 1796 +MD5 8dee5a4a5b89c097d341363c66e9a946 librsvg-2.12.0.ebuild 1850 +MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 799dfdee1c95c49cb64bfc299dfbab65 librsvg-2.9.5.ebuild 1509 MD5 70f6afa0baffe29c6c4ab43dccbd0435 files/digest-librsvg-1.0.3 65 MD5 a84456c040821c0f5f6f6f8668742354 files/digest-librsvg-2.12.0 67 MD5 254740116b1b3ccf3e4013c37c610459 files/digest-librsvg-2.9.5 66 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 } -- cgit v1.2.3-65-gdbad