bugfixes 'n cleanup

7 files changed, 50 insertions, 128 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index dd1b1443576b..ca4f885a01ee 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.52 2003/09/23 15:50:38 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.53 2003/10/03 16:58:11 foser Exp $
+
+  03 Oct 2003; foser <foser@gentoo.org> gnome-panel-2.4.0-r1.ebuild :
+  Fix gnome-vfs dep (#30247)
+  Move patching and gconf hack to src_compile
+  Include initial panel size fix
 
   23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org>
   gnome-panel-2.2.2.2.ebuild:
@@ -23,6 +28,9 @@
 
 *gnome-panel-2.3.91 (07 Sep 2003)
 
+  08 Sep 2003; foser <foser@gentoo.org> gnome-panel-2.3.91.ebuild :
+  Add patch to fix default panel size 
+
   07 Sep 2003; foser <foser@gentoo.org> gnome-panel-2.3.91.ebuild :
   Gnome 2.4 rc1
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 6626a9fae653..dfaa8e2acbec 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,22 +1,20 @@
-MD5 d82ee364dfaa608ef973effd351506e1 ChangeLog 6735
-MD5 1c41d01742b08320a5080625b7862d11 gnome-panel-1.4.1.ebuild 1774
-MD5 48542b12f7de0aa1d685b144b762a3ff gnome-panel-1.4.2-r2.ebuild 2016
-MD5 623e3c1deaace4f7ecea86edb2de8e71 gnome-panel-2.0.9.ebuild 1264
+MD5 eb58dda325007520bcfc41d8f435dd60 gnome-panel-2.2.2.2.ebuild 960
 MD5 1272743bcce046b4520549f4e2c297f3 gnome-panel-2.2.1.ebuild 967
 MD5 3a7584b8422b47ba3a2c286498ce025d gnome-panel-2.2.2.1.ebuild 957
-MD5 95daeb28a4a553527a9b88656a058732 gnome-panel-2.2.2.ebuild 975
-MD5 eb58dda325007520bcfc41d8f435dd60 gnome-panel-2.2.2.2.ebuild 960
+MD5 623e3c1deaace4f7ecea86edb2de8e71 gnome-panel-2.0.9.ebuild 1264
+MD5 48542b12f7de0aa1d685b144b762a3ff gnome-panel-1.4.2-r2.ebuild 2016
+MD5 1c41d01742b08320a5080625b7862d11 gnome-panel-1.4.1.ebuild 1774
+MD5 ed28710f995438db67abe249eab1f5dd gnome-panel-2.4.0-r1.ebuild 1567
+MD5 abad4f33d02ed84054cf5252bf95b7ac ChangeLog 7016
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4254474ce4a431c6fa409bca6bec0319 gnome-panel-2.4.0.ebuild 2068
-MD5 0cd854cb0d8142734823cebd324ad7de gnome-panel-2.4.0-r1.ebuild 2165
-MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
+MD5 95daeb28a4a553527a9b88656a058732 gnome-panel-2.2.2.ebuild 975
+MD5 f60317ea4a979e5210a402a7787aab3d files/digest-gnome-panel-2.2.2.1 73
+MD5 4e1b795f852d1e379d50f668ea0e8a1e files/digest-gnome-panel-2.2.2.2 73
+MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
+MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
+MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
+MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
 MD5 0a052b9077e11ce4e7817086d8f16d8e files/digest-gnome-panel-2.0.9 71
-MD5 f2d5e4648fa9ccb542a49f0a794f7dea files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch 660
 MD5 aa9fbd835415fb98e0ccf04c782fe80f files/digest-gnome-panel-2.2.1 71
 MD5 2e605d3f26decbbd5ce0ae57ebef6611 files/digest-gnome-panel-2.2.2 71
-MD5 f60317ea4a979e5210a402a7787aab3d files/digest-gnome-panel-2.2.2.1 73
-MD5 4e1b795f852d1e379d50f668ea0e8a1e files/digest-gnome-panel-2.2.2.2 73
-MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0 71
-MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
-MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0
deleted file mode 100644
index 155f0241468a..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a81f7ebbb450611a28783900f5f2cbc gnome-panel-2.4.0.tar.bz2 2641373
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch
deleted file mode 100644
index da10cbc13285..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-panel-2.2.0.1/applets/notification_area/eggtraymanager.c gnome-panel-2.2.0.1.patched/applets/notification_area/eggtraymanager.c
---- gnome-panel-2.2.0.1/applets/notification_area/eggtraymanager.c	2003-01-30 06:52:16.000000000 +0100
-+++ gnome-panel-2.2.0.1.patched/applets/notification_area/eggtraymanager.c	2003-02-17 14:36:59.000000000 +0100
-@@ -399,7 +399,7 @@
- 
-   invisible = manager->invisible;
-   
--  display = GDK_WINDOW_XDISPLAY (manager->invisible);
-+  display = GDK_WINDOW_XDISPLAY (manager->invisible->window);
-   
-   if (XGetSelectionOwner (display, manager->selection_atom) ==
-       GDK_WINDOW_XWINDOW (manager->invisible->window))
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
new file mode 100644
index 000000000000..3625c88b3821
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
@@ -0,0 +1,20 @@
+--- ./gnome-panel/panel-default-setup.entries~	2003-07-01 15:29:54.000000000 +0100
++++ ./gnome-panel/panel-default-setup.entries	2003-08-19 07:49:23.000000000 +0100
+@@ -98,7 +98,7 @@
+       <key>size</key>
+       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+       <value>
+-        <int>32</int>
++        <int>24</int>
+       </value>
+     </entry>
+   </entrylist>
+@@ -131,7 +131,7 @@
+       <key>size</key>
+       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+       <value>
+-        <int>32</int>
++        <int>24</int>
+       </value>
+     </entry>
+   </entrylist>
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
index 78a987937881..efa44a8e1bee 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild,v 1.1 2003/09/22 03:27:33 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild,v 1.2 2003/10/03 16:58:11 foser Exp $
 
 inherit gnome2 eutils
 
@@ -18,7 +18,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=x11-libs/libwnck-2.3
 	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.1.3
+	>=gnome-base/gnome-vfs-2.3
 	>=gnome-base/gnome-desktop-2.3
 	>=gnome-base/libbonoboui-2.1.1
 	>=gnome-base/libglade-2
@@ -35,44 +35,29 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
 
-src_compile() {
-
-#	for i in $(find ${S}/help -iname Makefile.am); do
-#		cp ${i} ${i}.old
-#		sed -e 's:include \$(top_srcdir)/xmldocs.make::' ${i}.old > ${i}
-#	done
-
-#	cd ${S}/help/C/clock
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
-#	cd ${S}/help/C/window-list
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
-#	cd ${S}/help/C/workspace-switcher
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
+src_unpack() {
 
+	unpack ${A}
 
 	cd ${S}
 	use menu && epatch ${FILESDIR}/menu-${PV}.patch
-
-#	WANT_AUTOCONF_2_5=1 ./autogen.sh || die
+	# fix initial menu size
+	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch
 
 	sed -i 's:--load:-v:' gnome-panel/Makefile.am
 
-	WANT_AUTOMAKE=1.4 automake -v || die
-
 	# FIXME : uh yeah, this is nice
 	touch gnome-panel/blah
 	chmod +x gnome-panel/blah
 
-	gnome2_src_compile
 }
 
 pkg_postinst() {
+
 	gnome2_pkg_postinst
 
 	einfo "setting panel gconf defaults..."
 	GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
 	${ROOT}/usr/bin/gconftool-2 --direct --config-source ${GCONF_CONFIG_SOURCE} --load=${S}/gnome-panel/panel-default-setup.entries
+
 }
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0.ebuild
deleted file mode 100644
index c9a47526f95c..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0.ebuild,v 1.1 2003/09/11 03:38:38 spider Exp $
-
-inherit gnome2 eutils
-
-SLOT="0"
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
-
-IUSE="doc"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/gnome-desktop-2.3
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gconf-2.3.1
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
-
-src_compile() {
-
-#	for i in $(find ${S}/help -iname Makefile.am); do
-#		cp ${i} ${i}.old
-#		sed -e 's:include \$(top_srcdir)/xmldocs.make::' ${i}.old > ${i}
-#	done
-
-#	cd ${S}/help/C/clock
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
-#	cd ${S}/help/C/window-list
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
-#	cd ${S}/help/C/workspace-switcher
-#	mv Makefile.am Makefile.am.old
-#	sed -e 's:include \$(top_srcdir)/xmldocs.make::' Makefile.am.old > Makefile.am
-
-
-	cd ${S}
-
-#	WANT_AUTOCONF_2_5=1 ./autogen.sh || die
-
-	sed -i 's:--load:-v:' gnome-panel/Makefile.am
-
-	WANT_AUTOMAKE=1.4 automake -v || die
-
-	# FIXME : uh yeah, this is nice
-	touch gnome-panel/blah
-	chmod +x gnome-panel/blah
-
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "setting panel gconf defaults..."
-	GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source` ${ROOT}/usr/bin/gconftool-2 --direct --load=${S}/gnome-panel/panel-default-setup.entries
-}