menu patch, fix for the default panel config

5 files changed, 135 insertions, 3 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 709ba8bd323f..101d2f7ae56c 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2003/09/12 19:50:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.51 2003/09/22 03:27:33 spider Exp $
+
+*gnome-panel-2.4.0-r1 (22 Sep 2003)
+
+  22 Sep 2003; <spider@gentoo.org> gnome-panel-2.4.0-r1.ebuild,
+  files/menu-2.4.0.patch:
+  Added the gentoo menu patch, and got the fix for the default panel right this
+  time.
 
 *gnome-panel-2.4.0 (11 Sep 2003)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 42a3eaeaa51c..2ce7e732d66b 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -4,12 +4,12 @@ MD5 3a7584b8422b47ba3a2c286498ce025d gnome-panel-2.2.2.1.ebuild 957
 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 f5ac2e04ff31cd8499850548fd3a38ce ChangeLog 6408
+MD5 b3b6ab3ceb6698c02ecbf7b4413afc1d ChangeLog 6623
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 95daeb28a4a553527a9b88656a058732 gnome-panel-2.2.2.ebuild 975
 MD5 a2be6e4c7cb7892f5bb7fb6aa699dc8d gnome-panel-2.3.91.ebuild 2062
 MD5 4254474ce4a431c6fa409bca6bec0319 gnome-panel-2.4.0.ebuild 2068
-MD5 b1649ff8917287a361df00f66682bc5f gnome-panel-2.4.0-r1.ebuild 2163
+MD5 0cd854cb0d8142734823cebd324ad7de gnome-panel-2.4.0-r1.ebuild 2165
 MD5 f60317ea4a979e5210a402a7787aab3d files/digest-gnome-panel-2.2.2.1 73
 MD5 4e1b795f852d1e379d50f668ea0e8a1e files/digest-gnome-panel-2.2.2.2 73
 MD5 f2d5e4648fa9ccb542a49f0a794f7dea files/gnome-panel-2.2.0.1-notification_area_crash_on_exit_fix.patch 660
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r1
new file mode 100644
index 000000000000..155f0241468a
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r1
@@ -0,0 +1 @@
+MD5 9a81f7ebbb450611a28783900f5f2cbc gnome-panel-2.4.0.tar.bz2 2641373
diff --git a/gnome-base/gnome-panel/files/menu-2.4.0.patch b/gnome-base/gnome-panel/files/menu-2.4.0.patch
new file mode 100644
index 000000000000..1968977a3fc8
--- /dev/null
+++ b/gnome-base/gnome-panel/files/menu-2.4.0.patch
@@ -0,0 +1,46 @@
+--- gnome-panel/distribution.c.1	2003-09-15 20:47:24.000000000 +0200
++++ gnome-panel/distribution.c	2003-09-15 20:50:33.000000000 +0200
+@@ -38,6 +38,11 @@
+ 	 PANEL_STOCK_CDE, "cdemenu:/",
+ 	 NULL, NULL
+ 	},
++	{ DISTRIBUTION_GENTOO, "/etc/gentoo-release",
++	 N_("Gentoo Linux"), N_("Gentoo Menu"),
++	 PANEL_STOCK_GENTOO, "/var/lib/gnome/Gentoo/.",
++	 NULL, NULL
++	},
+ 	{ DISTRIBUTION_UNKNOWN, NULL, NULL, NULL, NULL }
+ };
+ 
+--- gnome-panel/panel-stock-icons.c.1	2003-09-15 20:52:10.000000000 +0200
++++ gnome-panel/panel-stock-icons.c	2003-09-15 20:52:27.000000000 +0200
+@@ -87,6 +87,7 @@
+ 	{ PANEL_STOCK_DRAWER,              "panel-drawer" },
+ 	{ PANEL_STOCK_APPLETS,             "gnome-applets" },
+ 	{ PANEL_STOCK_DESKTOP,             "gnome-ccdesktop" },
++	{ PANEL_STOCK_GENTOO,              "gentoo" },
+ };
+ 
+ static void
+--- gnome-panel/panel-stock-icons.h.1	2003-09-15 21:10:32.000000000 +0200
++++ gnome-panel/panel-stock-icons.h	2003-09-15 21:10:48.000000000 +0200
+@@ -61,6 +61,7 @@
+ #define PANEL_STOCK_DRAWER              "panel-drawer"
+ #define PANEL_STOCK_APPLETS             "panel-applet"
+ #define PANEL_STOCK_DESKTOP             "panel-desktop"
++#define PANEL_STOCK_GENTOO              "panel-gentoo"
+ 
+ /* stock items  - no point in theme the icons one these,
+  * they use stock gtk icons and just modify the text
+--- gnome-panel/distribution.h.1	2003-09-15 22:00:02.000000000 +0200
++++ gnome-panel/distribution.h	2003-09-15 22:01:13.000000000 +0200
+@@ -10,7 +10,8 @@
+ 	DISTRIBUTION_UNKNOWN = 0,
+ 	DISTRIBUTION_DEBIAN,
+ 	DISTRIBUTION_SUSE,
+-	DISTRIBUTION_SOLARIS
++	DISTRIBUTION_SOLARIS,
++	DISTRIBUTION_GENTOO
+ } DistributionType;
+ 
+ typedef struct {
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
new file mode 100644
index 000000000000..78a987937881
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
@@ -0,0 +1,78 @@
+# 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 $
+
+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 menu"
+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}
+	use menu && epatch ${FILESDIR}/menu-${PV}.patch
+
+#	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 --config-source ${GCONF_CONFIG_SOURCE} --load=${S}/gnome-panel/panel-default-setup.entries
+}