New version, removed older versions

11 files changed, 28 insertions, 228 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index b508993ddbf2..995f2595bfa5 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.102 2004/11/12 03:48:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.103 2004/11/25 04:09:10 obz Exp $
+
+*gnome-panel-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -gnome-panel-2.4.2.ebuild,
+  -gnome-panel-2.6.0.ebuild, -gnome-panel-2.6.1.ebuild,
+  -gnome-panel-2.8.0.ebuild, +gnome-panel-2.8.1.ebuild:
+  New version, removed older versions
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-panel-2.8.0.1.ebuild:
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 05ceeb97ada5..a60ebae74662 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,22 +1,25 @@
-MD5 fbc3f8444d816773653b9220a15b84d9 ChangeLog 13392
-MD5 c1cc3a4aeb5177c42bafb6f920fa4b15 gnome-panel-1.4.1.ebuild 1756
-MD5 fe6aa18439955a359b5f10cd88f066f0 gnome-panel-1.4.2-r2.ebuild 2012
+MD5 d17f0d5524f680a8165dfc21942ca3e6 gnome-panel-2.8.0.ebuild 1620
+MD5 3a09dfc675f796eee702071e1c664877 gnome-panel-2.6.1.ebuild 1689
 MD5 adb77720655c74cc85d58851680bb7ee gnome-panel-2.4.2.ebuild 1742
+MD5 e02c1a0afe390959aac169a7c883d92e .gnome-panel-2.8.1.ebuild.swp 12288
+MD5 5c51c49268ccd43e69240b5c3cc10863 gnome-panel-2.8.0.1.ebuild 1637
+MD5 fe6aa18439955a359b5f10cd88f066f0 gnome-panel-1.4.2-r2.ebuild 2012
+MD5 c1cc3a4aeb5177c42bafb6f920fa4b15 gnome-panel-1.4.1.ebuild 1756
 MD5 9b4f8cd6befbe61a22a9d14edf9d3ebc gnome-panel-2.6.0.ebuild 1681
-MD5 3a09dfc675f796eee702071e1c664877 gnome-panel-2.6.1.ebuild 1689
-MD5 9d64141532a1a16a3672379e89af9d41 gnome-panel-2.6.2.ebuild 1553
+MD5 64cfdef03308c18765dad03ba9dfe408 gnome-panel-2.8.1.ebuild 1510
+MD5 fbc3f8444d816773653b9220a15b84d9 ChangeLog 13392
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5c51c49268ccd43e69240b5c3cc10863 gnome-panel-2.8.0.1.ebuild 1637
-MD5 d17f0d5524f680a8165dfc21942ca3e6 gnome-panel-2.8.0.ebuild 1620
-MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
+MD5 9d64141532a1a16a3672379e89af9d41 gnome-panel-2.6.2.ebuild 1553
+MD5 f85d576de1f4c7a262f6d3ba6100dfdd files/digest-gnome-panel-2.8.0.1 73
+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
+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
 MD5 a97c633eb450778f2ef65ae645294ce9 files/digest-gnome-panel-2.6.1 71
 MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71
-MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
-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 974047f04ed92ebd67a850f2145a41d4 files/digest-gnome-panel-2.8.0 71
-MD5 f85d576de1f4c7a262f6d3ba6100dfdd files/digest-gnome-panel-2.8.0.1 73
+MD5 d73ee881aa34103605b0989a4b035b7d files/digest-gnome-panel-2.8.1 71
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2
deleted file mode 100644
index 6ab82e44c1b3..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d62da1f6cb129f65206a945d93a2fa85 gnome-panel-2.4.2.tar.bz2 2662404
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
deleted file mode 100644
index 02071d468c37..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0ad03c9266d342b99837ca4e947b55 gnome-panel-2.6.0.tar.bz2 2933581
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.1
deleted file mode 100644
index bb1ccd3b6c66..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 232366bafcab15dfde3430f722ed709e gnome-panel-2.6.1.tar.bz2 2984590
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.0
deleted file mode 100644
index 47424636111f..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e52dccf538a07917d2840e95864fddfd gnome-panel-2.8.0.tar.bz2 3205758
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.1
new file mode 100644
index 000000000000..9c3e0e18a631
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.8.1
@@ -0,0 +1 @@
+MD5 77aea214467da238170ed10dbc825799 gnome-panel-2.8.1.tar.bz2 3210138
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
deleted file mode 100644
index 3175b9c1f418..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.14 2004/11/08 19:42:15 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips arm"
-# IUSE="doc menu"
-IUSE="doc"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.3
-	>=gnome-base/orbit-2.4
-	>=gnome-base/gnome-vfs-2.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
-	media-libs/libpng
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-# agh. ./configure check for XML::Parser.
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# use menu && epatch ${FILESDIR}/menu-${PV}.patch
-
-	# fix calendar day-of-week for l10n, see bug #38672
-	# consider clean/removing for gtk+-2.4/gnome-2.6
-	epatch ${FILESDIR}/${PN}-calendar-l10n.patch
-
-	# 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 || die
-
-}
-
-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=/etc/gconf/schemas/panel-default-setup.entries
-
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
deleted file mode 100644
index 51c2af4d6d58..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild,v 1.10 2004/11/08 19:42:15 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ia64 mips arm"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.3.2
-	>=x11-libs/libwnck-2.3
-	>=gnome-base/orbit-2.4
-	>=gnome-base/gnome-vfs-2.3
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2.3
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/gconf-2.3.3
-	media-libs/libpng
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
-
-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 || die
-
-	emake || die
-
-}
-
-# hard disable eds support for now
-G2CONF="${G2CONF} --disable-eds"
-
-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=/etc/gconf/schemas/panel-default-setup.entries
-
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
deleted file mode 100644
index d554959fe84f..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.6 2004/11/08 19:42:15 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa amd64 ~ia64 ~mips ~arm"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.3.2
-	>=x11-libs/libwnck-2.3
-	>=gnome-base/orbit-2.4
-	>=gnome-base/gnome-vfs-2.3
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2.3
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/gconf-2.6.1
-	media-libs/libpng
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# should fix parallel install #45315
-	epatch ${FILESDIR}/${PN}-2.6.1-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 || die
-
-	emake || die
-
-}
-
-# hard disable eds support for now
-G2CONF="${G2CONF} --disable-eds"
-
-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=/etc/gconf/schemas/panel-default-setup.entries
-
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.8.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.8.1.ebuild
index 2f5d0386cbf6..3d635e209e21 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.8.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.8.0.ebuild,v 1.2 2004/11/08 19:42:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.8.1.ebuild,v 1.1 2004/11/25 04:09:10 obz Exp $
 
 inherit gnome2 eutils
 
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.31
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 src_compile() {
 
@@ -47,7 +47,6 @@ src_compile() {
 
 }
 
-# hard disable eds support for now
 G2CONF="${G2CONF} $(use_enable eds)"
 
 pkg_postinst() {
@@ -57,5 +56,6 @@ 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=/etc/gconf/schemas/panel-default-setup.entries
+	rm /etc/gconf/schemas/panel-default-setup.entries
 
 }