fresh release

6 files changed, 50 insertions, 7 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index dd3af833e6df..228f20dd6b10 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2004/03/20 12:47:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.79 2004/03/22 23:37:34 foser Exp $
+
+*gnome-panel-2.6.0 (22 Mar 2004)
+
+  22 Mar 2004; foser <foser@gentoo.org> gnome-panel-2.6.0.ebuild :
+  Gnome 2.6 final
+  Add parallalel build fix, suggested by j. <merkaba@quantumfish.com> in #45315
+  Use a less intrusive workaround for the gconf defaults stuff, proposed by 
+  Matthew Schick <matt@breakmygentoo.net> in #45295
 
 *gnome-panel-2.5.93 (20 Mar 2004)
 
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 73b636202896..779e445a77e6 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,10 +1,12 @@
-MD5 4b92f7dc8dd68dce59d8136b55a40009 gnome-panel-2.5.93.ebuild 1609
+MD5 200a2de6491875b711d0f178417469f7 gnome-panel-2.5.93.ebuild 1610
 MD5 e11304bcd9e75b68da81a2394330bb42 gnome-panel-2.4.2.ebuild 1749
 MD5 f47c4c717069b1543c5c8207724849e1 gnome-panel-1.4.2-r2.ebuild 2021
 MD5 c74e4abdc06344fc7adbe9beccc58568 gnome-panel-1.4.1.ebuild 1768
+MD5 38ee1474c9042421beebc6ea2ccda3ff gnome-panel-2.6.0.ebuild 1763
 MD5 05dbdbfe52729cd2e88c928fcea1300d gnome-panel-2.4.0-r1.ebuild 1615
 MD5 44726072a5df289f52c9a07526712d0a ChangeLog 10437
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1b4289df33228cb2b0a0a97db36e781f files/gnome-panel-2.6-parallel_install.patch 946
 MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
 MD5 0da97a8d3431fb320df239061385648b files/digest-gnome-panel-2.5.93 72
 MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
@@ -13,3 +15,4 @@ 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 7a56d7cd6b8d36c12f13018f16a7d1a5 files/digest-gnome-panel-2.4.2 71
+MD5 3f16b84c6dcb22313794b6f82b9f7a29 files/digest-gnome-panel-2.6.0 71
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93
deleted file mode 100644
index bdc188433d4c..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 798e1daf242615c127d2c1f275af6bcd gnome-panel-2.5.93.tar.bz2 2833271
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.0
new file mode 100644
index 000000000000..02071d468c37
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.0
@@ -0,0 +1 @@
+MD5 9e0ad03c9266d342b99837ca4e947b55 gnome-panel-2.6.0.tar.bz2 2933581
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch b/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch
new file mode 100644
index 000000000000..f5f257f7240e
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch
@@ -0,0 +1,24 @@
+diff -ru gnome-panel-2.5.93/gnome-panel/Makefile.am gnome-panel-2.5.93-new/gnome-panel/Makefile.am
+--- gnome-panel-2.5.93/gnome-panel/Makefile.am	2004-02-06 10:04:50.000000000 -0600
++++ gnome-panel-2.5.93-new/gnome-panel/Makefile.am	2004-03-21 15:30:23.935813144 -0600
+@@ -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)
+diff -ru gnome-panel-2.5.93/gnome-panel/Makefile.in gnome-panel-2.5.93-new/gnome-panel/Makefile.in
+--- gnome-panel-2.5.93/gnome-panel/Makefile.in	2004-03-15 05:47:50.000000000 -0600
++++ gnome-panel-2.5.93-new/gnome-panel/Makefile.in	2004-03-21 15:30:33.409372944 -0600
+@@ -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)
+ 
+ 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.5.93.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
index 86b3a5732a98..3436206665e9 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.5.93.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.6.0.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.5.93.ebuild,v 1.1 2004/03/20 12:47:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild,v 1.1 2004/03/22 23:37:34 foser Exp $
 
 inherit gnome2 eutils
 
@@ -39,12 +39,20 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# should fix parallel install #45315
+	epatch ${FILESDIR}/${PN}-2.6-parallel_install.patch
+
+}
+
+src_compile() {
+
+	gnome2_src_configure
+
 	# FIXME : uh yeah, this is nice
 	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' gnome-panel/Makefile.am
+	sed -i 's:--load:-v:' gnome-panel/Makefile || die
 
-	WANT_AUTOMAKE=1.7 aclocal || die
-	WANT_AUTOMAKE=1.7 automake || die
+	emake || die
 
 }