Don't remove panel-default-setup.entries during pkg_postinst, it causes problems...

Package-Manager: portage-2.0.53_rc7

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 5c0b834ca7ab790a258680dedd70d8c8869a91f8..de6d7cdafadcf895887dac566d3adaea1b0e655c 100644 (file)
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.152 2005/10/10 07:30:45 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.153 2005/11/06 03:30:20 obz Exp $
+
+  06 Nov 2005; Mike Gardiner <obz@gentoo.org> gnome-panel-2.10.2.ebuild,
+  gnome-panel-2.12.1.ebuild:
+  Don't remove panel-default-setup.entries during pkg_postinst, it causes
+  problems with binary packages, and file ownership. See #111648.
 
   10 Oct 2005; Hardave Riar <hardave@gentoo.org> gnome-panel-2.10.2.ebuild:
   Stable on mips.

diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 16134e6cfa07ee78bc276dab9ed7645a5d0cb20d..ffe9eebe56e99dd3907770ee9ca670e98079074d 100644 (file)
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,14 +1,14 @@
-MD5 e7218afb1489edc5472155fcc3a8da45 ChangeLog 19755
-MD5 f7e2e4cf2f4edcca0070acfc88ebec43 gnome-panel-1.4.1.ebuild 1821
-MD5 1ab5abca58ed191a20538e5298dbf5bf gnome-panel-1.4.2-r2.ebuild 2079
-MD5 e396d648e215308e9b6f3b10c57ffd00 gnome-panel-2.10.0-r1.ebuild 1896
-MD5 9f780eabeaeb9774762a4f1e29c9f175 gnome-panel-2.10.2.ebuild 1980
-MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553
-MD5 1b43f1ec9da96b09e8e7983f5c0d43c9 gnome-panel-2.12.1.ebuild 1827
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 a7a477fdd50b14cdc78459cd6f6d231f ChangeLog 19994
 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
 MD5 a810fac56997cf9a6ee29adec5fb19cf files/digest-gnome-panel-2.10.0-r1 72
 MD5 3fb66501747e994bb5ac1d787b52a02c files/digest-gnome-panel-2.10.2 72
-MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71
 MD5 b5a5789da6572a0201fa063c86f6fb25 files/digest-gnome-panel-2.12.1 72
+MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71
+MD5 f7e2e4cf2f4edcca0070acfc88ebec43 gnome-panel-1.4.1.ebuild 1821
+MD5 1ab5abca58ed191a20538e5298dbf5bf gnome-panel-1.4.2-r2.ebuild 2079
+MD5 e396d648e215308e9b6f3b10c57ffd00 gnome-panel-2.10.0-r1.ebuild 1896
+MD5 71c5c0453fba8f040ac4f34d1e97eb9a gnome-panel-2.10.2.ebuild 1957
+MD5 eef80d8d68dd53f02ee262d49eae1455 gnome-panel-2.12.1.ebuild 1802
+MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158

diff --git a/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild
index d0684e81c4996258c3be7ae96c6ee215a388357b..014cb26fc9d90a2b4e2a5aa3acc299f97a39809b 100644 (file)
--- a/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.10.2.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/gnome-panel/gnome-panel-2.10.2.ebuild,v 1.12 2005/10/10 07:30:45 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild,v 1.13 2005/11/06 03:30:20 obz Exp $
 
 inherit eutils gnome2
 
@@ -59,7 +59,6 @@ pkg_postinst() {
                GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
                ${ROOT}/usr/bin/gconftool-2 --direct --config-source \
                        ${GCONF_CONFIG_SOURCE} --load=${entries}
-               rm -f ${entries}
        fi
 
        local updater=`which gtk-update-icon-cache`

diff --git a/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild
index e3817f7f0296a78a49e32678b36ab352e5c3f786..e1ef300332cd0364d357675ce227630299f4b198 100644 (file)
--- a/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.12.1.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/gnome-panel/gnome-panel-2.12.1.ebuild,v 1.1 2005/10/08 19:48:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild,v 1.2 2005/11/06 03:30:20 obz Exp $
 
 inherit gnome2
 
@@ -59,7 +59,6 @@ pkg_postinst() {
                GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
                ${ROOT}/usr/bin/gconftool-2 --direct --config-source \
                        ${GCONF_CONFIG_SOURCE} --load=${entries}
-               rm -f ${entries}
        fi
 
        # Calling this late so it doesn't process the GConf schemas file we already