minor fixes

4 files changed, 53 insertions, 6 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 89298497745b..809f9d8981b7 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.81 2004/04/21 13:53:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.82 2004/04/26 17:14:33 foser Exp $
 
 *gnome-panel-2.6.1 (21 Apr 2004)
 
+  26 Apr 2004; foser <foser@gentoo.org> gnome-panel-2.6.1.ebuild :
+  Fix gconf dep
+  Update parallel build patch (provided by j. <merkaba@quantumfish.com>) #48583
+
   21 Apr 2004; foser <foser@gentoo.org> gnome-panel-2.6.1.ebuild :
   New release
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 76a994e20f89..b0c3742e1399 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,11 +1,12 @@
-MD5 651d7de1d682820ae4bfce44da495d0e gnome-panel-2.6.1.ebuild 1692
+MD5 39af6a10e2cbf9767cc96055a7596172 gnome-panel-2.6.1.ebuild 1694
 MD5 a7a7e8509b009fe8eae0410a0d98f8cf gnome-panel-2.4.2.ebuild 1745
 MD5 f47c4c717069b1543c5c8207724849e1 gnome-panel-1.4.2-r2.ebuild 2021
 MD5 c74e4abdc06344fc7adbe9beccc58568 gnome-panel-1.4.1.ebuild 1768
 MD5 294bb599d9f24b1766d6de5aa6bc657f gnome-panel-2.6.0.ebuild 1692
-MD5 eaed0dc8e33c234cbc8e3040fe46f398 ChangeLog 10972
+MD5 e520ece36848141fe3800d0080effd99 ChangeLog 11136
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1b4289df33228cb2b0a0a97db36e781f files/gnome-panel-2.6-parallel_install.patch 946
+MD5 5ffccffad18cb6c8135031a65f763cb2 files/gnome-panel-2.6.1-parallel_install.patch 1486
 MD5 fd45982a0009ea6751868529516f641a files/gnome-panel-calendar-l10n.patch 1239
 MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch b/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch
new file mode 100644
index 000000000000..9fe5142b644f
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch
@@ -0,0 +1,42 @@
+diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.am gnome-panel-2.6.1-new/gnome-panel/Makefile.am
+--- gnome-panel-2.6.1/gnome-panel/Makefile.am	2004-04-19 10:16:02.000000000 -0500
++++ gnome-panel-2.6.1-new/gnome-panel/Makefile.am	2004-04-22 14:30:37.002004640 -0500
+@@ -43,7 +43,7 @@
+ 	GNOME_Panel-stubs.c	\
+ 	GNOME_Panel-skels.c	\
+ 	GNOME_Panel-common.c	\
+-	GNOME_Panel.h		\
++	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
+ 	$(NULL)
+ 
+ $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
+@@ -254,7 +254,7 @@
+ panel_enum_headers =					\
+ 	$(top_srcdir)/gnome-panel/panel-enums.h		\
+ 	$(top_srcdir)/gnome-panel/panel-types.h		\
+-	GNOME_Panel.h
++	$(top_builddir)/gnome-panel/GNOME_Panel.h
+ 
+ panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
+ 	$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
+diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.in gnome-panel-2.6.1-new/gnome-panel/Makefile.in
+--- gnome-panel-2.6.1/gnome-panel/Makefile.in	2004-04-19 10:25:25.000000000 -0500
++++ gnome-panel-2.6.1-new/gnome-panel/Makefile.in	2004-04-22 14:30:52.054716280 -0500
+@@ -273,7 +273,7 @@
+ 	GNOME_Panel-stubs.c	\
+ 	GNOME_Panel-skels.c	\
+ 	GNOME_Panel-common.c	\
+-	GNOME_Panel.h		\
++	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
+ 	$(NULL)
+ 
+ 
+@@ -497,7 +497,7 @@
+ panel_enum_headers = \
+ 	$(top_srcdir)/gnome-panel/panel-enums.h		\
+ 	$(top_srcdir)/gnome-panel/panel-types.h		\
+-	GNOME_Panel.h
++	$(top_builddir)/gnome-panel/GNOME_Panel.h
+ 
+ 
+ uidir = $(datadir)/gnome-2.0/ui
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
index 0812fe0c6e00..eb0ba25ebb46 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6.1.ebuild,v 1.1 2004/04/21 13:53:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild,v 1.2 2004/04/26 17:14:33 foser Exp $
 
 inherit gnome2 eutils
 
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.3.2
 	>=gnome-base/libglade-2.3
 	>=gnome-base/libgnome-2.1.1
 	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/gconf-2.3.3
+	>=gnome-base/gconf-2.6.1
 	media-libs/libpng
 	!gnome-extra/system-tray-applet"
 
@@ -40,7 +40,7 @@ src_unpack() {
 	cd ${S}
 
 	# should fix parallel install #45315
-	epatch ${FILESDIR}/${PN}-2.6-parallel_install.patch
+	epatch ${FILESDIR}/${PN}-2.6.1-parallel_install.patch
 
 }