Dropping references to non-installed apps in default config file, bug #347912

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 37 insertions, 4 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index 87d758f16a6e..df5c5a715194 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.23 2010/10/15 21:21:25 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.24 2010/12/27 00:39:21 vostorga Exp $
+
+  27 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> lxpanel-0.5.6.ebuild,
+  +files/lxpanel-0.5.6-broken-apps.patch:
+  Dropping references to non-installed apps in default config file, bug
+  #347912
 
   15 Oct 2010; Victor Ostorga <vostorga@gentoo.org> lxpanel-0.5.6.ebuild:
   Dropping .la files
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index e9a9e140f306..b0da4ba4ecba 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,5 +1,6 @@
 AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489
 AUX lxpanel-0.5.3-battery.patch 347 RMD160 c39c2cff83876216b4876b050456a1efb179c8e0 SHA1 516be1c204212a28521a40c7df9b303d59e31481 SHA256 9b47b25cee0ef6c3fe7d9af11500db6d9e8821a0ddc53cae2f28d722501945e9
+AUX lxpanel-0.5.6-broken-apps.patch 567 RMD160 628f01083f7c06476394447aacdc6fa542359bab SHA1 23ae82f23458596e1bb356cf897e5310cb05c080 SHA256 0b914f680f2dbaafb3a4966a9795e3d154839cb910eca9f58bdf18d41901eb25
 AUX lxpanel-0.5.6-symbol-alarm.patch 1461 RMD160 5ed09d071a349b7554400ea73d16f6aacdc4ad8d SHA1 6b111b32eb1ae9ee869df8ff0ac4c23b8ccbfbb8 SHA256 afafb59ea3e537147ff4d81feb5ec2a3a18eaa628f992c5a44321fa29b85e6af
 DIST lxpanel-0.5.3.tar.gz 929896 RMD160 1ecd5d0d004a1965e0ecdd95531d3743785f8825 SHA1 1ef57049b7d6f699178a6796afb19fec86c107f0 SHA256 69976816ac4ebee8c7dc56df322701e1de9f90ac558a702c12eb3f2e37563ebe
 DIST lxpanel-0.5.4.1.tar.gz 1020003 RMD160 1cd7351fc8add3b7b7336dca4eebbee8f79b9c19 SHA1 c0130528b21e6be22b24eeeb4a525df0c52b2447 SHA256 c0fae92a71f44e0379de4b0f48696756591be2a4688615e877da8bde12889ed9
@@ -8,6 +9,6 @@ DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7
 EBUILD lxpanel-0.5.3.ebuild 1173 RMD160 c201d345299f59587beccf3aa0318599206a4227 SHA1 0358b53d465662fc95842828e88421e9f6fc1b7a SHA256 92f8409e0b2fb6b1fdf37b6435d8cbe5100482fda21a7b092077cbfb6e884297
 EBUILD lxpanel-0.5.4.1.ebuild 1145 RMD160 5804481d311d7659e50d062468f6c1bc91ccf0f8 SHA1 c69950e14acf0a21bc0ab11c4a3c07e7ee3c6035 SHA256 c24bc187d04570f3a75f753fd43e6df762eb2532fdc1bda6d057ebbfbc4832a1
 EBUILD lxpanel-0.5.5.ebuild 1167 RMD160 6d866e255385610cc2ad58e859e6699d8d831f4b SHA1 42024f5aea108f732efa83e0d067683475bbb30c SHA256 339fddae5296096ef9f33f48037388ad7465f52745ae0826add6003d31da294e
-EBUILD lxpanel-0.5.6.ebuild 1283 RMD160 91d1118c5a319348b9aef7618c2c1da436ebc620 SHA1 6419557dbd730e43dd957fb585182281b05df2fb SHA256 ccb5ffa524d9cf86b27e9bc2abc53154e09e1ca32dcbf814c1cb7ee54b626400
-MISC ChangeLog 3304 RMD160 17e3cc85f3150feef0218baf9185bca2b4f4db13 SHA1 e1a988b176721596b3fade1231a57114129a7113 SHA256 d59b9271bdde43037091cc53ace06bb6e01dd5bb179073ffa0ec537f521629e0
+EBUILD lxpanel-0.5.6.ebuild 1549 RMD160 540b0371c05cedd551c2346b87780af79e6d4466 SHA1 87aff6d0e73c396bdcbc1406b8c8b66e053125c7 SHA256 d609c614d7c2f5e5adf8bd34da83e780ccb4e674ccb8bf55f08b7fb05f8e3ffd
+MISC ChangeLog 3504 RMD160 c8da0b92e61f98006e75e2255a454ea1790771dc SHA1 f145ceda23806dff8fffd8063876d63ee53474ce SHA256 5b41d6262e55e7d2e8a4ed6a1d809252bd90b6fa9da2cb3290e7e6e1b574d65d
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch b/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch
new file mode 100644
index 000000000000..16cda10915aa
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch
@@ -0,0 +1,20 @@
+diff -NrU5 lxpanel-0.5.6.original/data/default/panels/panel.in lxpanel-0.5.6/data/default/panels/panel.in
+--- lxpanel-0.5.6.original/data/default/panels/panel.in	2010-02-08 00:37:52.000000000 -0600
++++ lxpanel-0.5.6/data/default/panels/panel.in	2010-12-26 12:49:42.000000000 -0600
+@@ -50,16 +50,10 @@
+     type = launchbar
+     Config {
+         Button {
+             id=pcmanfm.desktop
+         }
+-        Button {
+-            id=gnome-terminal.desktop
+-        }
+-        Button {
+-            id=firefox.desktop
+-        }
+     }
+ }
+ 
+ Plugin {
+     type = space
diff --git a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
index cb353a9302b5..b1f8c0735772 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.3 2010/10/15 21:21:25 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.4 2010/12/27 00:39:21 vostorga Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
 	epatch "${FILESDIR}"/${P}-symbol-alarm.patch
+	epatch "${FILESDIR}"/${P}-broken-apps.patch
 	eautoreconf
 }
 
@@ -46,3 +47,9 @@ src_install () {
 	# Get rid of the .la files.
 	find "${D}" -name '*.la' -delete
 }
+
+pkg_postinst() {
+	elog "If you have problems with broken icons shown in the main panel,"
+	elog "you will have to configure panel settings via its menu."
+	elog "This will not be an issue with first time installations."
+}