Bump enhanced gnome-panel and gnome-desktop packages, remove them from package mask (as GNOME 2.20 is now too), and clean out

2.18-versions

svn path=/; revision=29

7 files changed, 24 insertions, 159 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 948696b..19c43ba 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,19 +2,11 @@ AUX gnome-desktop-recently-used-apps.patch 64868 RMD160 02231803ef31044d88cd808b
 MD5 482fa0fe32a392ef294ae4cc20a9ed67 files/gnome-desktop-recently-used-apps.patch 64868
 RMD160 02231803ef31044d88cd808bc61007c9195870ec files/gnome-desktop-recently-used-apps.patch 64868
 SHA256 7f35d6549a3b1b48cac1223d76d4ef508e5f0e9dba7bc6ebe8c035f7d1c89885 files/gnome-desktop-recently-used-apps.patch 64868
-DIST gnome-desktop-2.18.3.tar.bz2 1306654 RMD160 fb3cc9047ab4678607e9cae6cc18f0803b03ace3 SHA1 e466fb1619423d185772d0052562a2e66dc2e01e SHA256 8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
-DIST gnome-desktop-2.20.0.tar.bz2 1353685 RMD160 74cf96610e6fe81a964cc1487f26d2a5babf7600 SHA1 6bfb7a44d324f0d2a10d5185770e43bbc2378fc8 SHA256 363ecfe56738d840dcfa1333dc8401e63a253a21031b673ebd3df6ac722d58bf
-EBUILD gnome-desktop-2.18.3.ebuild 1371 RMD160 8175cab2205e3ba3a405fc1e6a0cc834e0c3dbce SHA1 378282eb71b5eceaee1065e98ccc3d1eb00a2cbb SHA256 8e3bce922f0f934e20acd35e4382dcf6bbc27925a612d026687cc311800a8127
-MD5 144b9ba4249a5f127876ab379d064b2a gnome-desktop-2.18.3.ebuild 1371
-RMD160 8175cab2205e3ba3a405fc1e6a0cc834e0c3dbce gnome-desktop-2.18.3.ebuild 1371
-SHA256 8e3bce922f0f934e20acd35e4382dcf6bbc27925a612d026687cc311800a8127 gnome-desktop-2.18.3.ebuild 1371
-EBUILD gnome-desktop-2.20.0.ebuild 1377 RMD160 b2ada63b9b248f6a58199b668c0d7516761c808b SHA1 3e9c52df057321e8c54fdaac74a25b0c4b613284 SHA256 40e5f12c2f03a2a301dacd9384158578ec8f74ae963ec28178d969cddc7b52eb
-MD5 ea71995d19561c7722507cbc45578deb gnome-desktop-2.20.0.ebuild 1377
-RMD160 b2ada63b9b248f6a58199b668c0d7516761c808b gnome-desktop-2.20.0.ebuild 1377
-SHA256 40e5f12c2f03a2a301dacd9384158578ec8f74ae963ec28178d969cddc7b52eb gnome-desktop-2.20.0.ebuild 1377
-MD5 9d902e27b3740acad81c70d580f0ea55 files/digest-gnome-desktop-2.18.3 268
-RMD160 0e354ffc7c985d313aed9648a1793f44130bc74d files/digest-gnome-desktop-2.18.3 268
-SHA256 8264affb750486034b98cb726c3496d48eeeb111b8bac6f2224d5e9751ecfe07 files/digest-gnome-desktop-2.18.3 268
-MD5 cc45ca35072635309c456df6d8746d2e files/digest-gnome-desktop-2.20.0 268
-RMD160 22c31ac54de2c6781d55d9bfc8c87eecf5d8a9d5 files/digest-gnome-desktop-2.20.0 268
-SHA256 c30c6a506b6c3ca906763468b17c49fb2a376b31c3d184096d50559fb9e4dda1 files/digest-gnome-desktop-2.20.0 268
+DIST gnome-desktop-2.20.1.tar.bz2 1356668 RMD160 c5df55634541f4cf6e41c9ed35199724e2a3a388 SHA1 be035617bf66dbff87f220d419d77d55124b5314 SHA256 f94a3e8962980628ae8a18135c419d239109cf1f68b4d8de7e4739194cf53391
+EBUILD gnome-desktop-2.20.1.ebuild 1401 RMD160 1211d7cc4a33619a26abd7f2d5dcbc3e72a07413 SHA1 d5d26f4b66bcd10e744c5758d957fc063d1b7656 SHA256 3ae644b2bb6013e7c2c31bb0ee20cf577bb3eab9ef46b5aea599b416767cfa98
+MD5 5deab065531c3d03b63cc7b5c3904999 gnome-desktop-2.20.1.ebuild 1401
+RMD160 1211d7cc4a33619a26abd7f2d5dcbc3e72a07413 gnome-desktop-2.20.1.ebuild 1401
+SHA256 3ae644b2bb6013e7c2c31bb0ee20cf577bb3eab9ef46b5aea599b416767cfa98 gnome-desktop-2.20.1.ebuild 1401
+MD5 88304c82449f2149624bbb0c5e60fce3 files/digest-gnome-desktop-2.20.1 268
+RMD160 72181af70523af0c09f3f448f2dfe4f8fd8b5879 files/digest-gnome-desktop-2.20.1 268
+SHA256 be2cfbd4cee0c746b18305a39cf93fe7c2082cc9cc150a609f1a2eefeb219c6f files/digest-gnome-desktop-2.20.1 268
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild
deleted file mode 100644
index 10b44c1..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.16.2.ebuild,v 1.3 2006/12/12 16:27:50 wolf31o2 Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Libraries for the gnome desktop that is not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc slab"
-
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=x11-libs/gtk+-2.8
-	>=dev-libs/glib-2.8
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/startup-notification-0.5
-	!gnome-base/gnome-core"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix bug 16853 by building gnome-about with IEEE to prevent
-	# floating point exceptions on alpha
-	if use alpha; then
-		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
-		|| die "sed failed (2)"
-	fi
-	use slab && epatch ${FILESDIR}/gnome-desktop-recently-used-apps.patch
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.20.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.20.1.ebuild
index 57f63bf..793954e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.20.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.20.1.ebuild
@@ -15,6 +15,7 @@ IUSE="doc slab"
 RDEPEND=">=dev-libs/libxml2-2.4.20
 	>=x11-libs/gtk+-2.11.3
 	>=dev-libs/glib-2.13.0
+	>=gnome-base/gconf-2
 	>=gnome-base/libgnomecanvas-2
 	>=gnome-base/libgnomeui-2.6
 	>=gnome-base/gnome-vfs-2
@@ -40,7 +41,7 @@ src_unpack() {
 	# Fix bug 16853 by building gnome-about with IEEE to prevent
 	# floating point exceptions on alpha
 	if use alpha; then
-		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
+		sed -i '/^CFLAGS/s/$/ -mieee/' "${S}"/gnome-about/Makefile.in \
 		|| die "sed failed (2)"
 	fi
 	use slab && epatch ${FILESDIR}/gnome-desktop-recently-used-apps.patch
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index f1376b6..4d691d0 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -10,19 +10,11 @@ AUX gnome-panel-recently-used-apps.patch 5005 RMD160 0d6a63ab97749a48d6ce4e2e00c
 MD5 fe126619c09ba90f3306879d0fff1620 files/gnome-panel-recently-used-apps.patch 5005
 RMD160 0d6a63ab97749a48d6ce4e2e00c6e78b999ca45c files/gnome-panel-recently-used-apps.patch 5005
 SHA256 2d5aa1ec0b9fa55744b22de3137d3305454e45786a5a150002199054a0462bcc files/gnome-panel-recently-used-apps.patch 5005
-DIST gnome-panel-2.18.3.tar.bz2 2722555 RMD160 346c3e981de3af98632d43511545b1877cf9cb5e SHA1 a521b722a1cc753ea0fa3ed7dcf5262750235f9a SHA256 efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
-DIST gnome-panel-2.20.0.1.tar.bz2 2804616 RMD160 c48fd450c62e129344a3c33568ec018fbefc5572 SHA1 7743a9653f36a80161b5c63f5a7e2ee51b7b3387 SHA256 70214f2242f1fae76c42a0ed498ccadf776691204181f61fcb95da5e16539dfa
-EBUILD gnome-panel-2.18.3.ebuild 1965 RMD160 4b7f8b5dd5d6a7585d3f6c5b69c5a0bde1aa0a12 SHA1 bc71f42491ec91b1dba0a00bd53d9e8d903930e1 SHA256 24f3beb91f3bab3729e6877ded7918774389c5b0fbce5d4fd938bdabdc871ede
-MD5 8dcdbead5215d001f863ebc21a455a62 gnome-panel-2.18.3.ebuild 1965
-RMD160 4b7f8b5dd5d6a7585d3f6c5b69c5a0bde1aa0a12 gnome-panel-2.18.3.ebuild 1965
-SHA256 24f3beb91f3bab3729e6877ded7918774389c5b0fbce5d4fd938bdabdc871ede gnome-panel-2.18.3.ebuild 1965
-EBUILD gnome-panel-2.20.0.1.ebuild 2007 RMD160 3e331d4c451a784b72584313802b8e17db2ca66a SHA1 f4b60d5d6077ea9817a4584761dc4a11b99dd377 SHA256 aa99a52baef7e7986561c2af2d76d3fbb7b18b32830594c86f8ad2410aa2506f
-MD5 d8617adac341cc539d84e2d289213a2d gnome-panel-2.20.0.1.ebuild 2007
-RMD160 3e331d4c451a784b72584313802b8e17db2ca66a gnome-panel-2.20.0.1.ebuild 2007
-SHA256 aa99a52baef7e7986561c2af2d76d3fbb7b18b32830594c86f8ad2410aa2506f gnome-panel-2.20.0.1.ebuild 2007
-MD5 aa46df5e0e8e45c0c453c9fa12278e16 files/digest-gnome-panel-2.18.3 262
-RMD160 c0b2f0078afa1ac56f14c157eaac53621e05ec86 files/digest-gnome-panel-2.18.3 262
-SHA256 b28787b9d0b03fa57aca169d793815e2dcc7abcd3a6581d9196213346cf420e3 files/digest-gnome-panel-2.18.3 262
-MD5 2893f376009cdebb233a602324d08d0d files/digest-gnome-panel-2.20.0.1 268
-RMD160 578d074884aa6db87bbc3b5681125a69a94c530a files/digest-gnome-panel-2.20.0.1 268
-SHA256 c744a74a704cb562c51b721046354c136cdceb1617b8a3744f87d5043b9a4712 files/digest-gnome-panel-2.20.0.1 268
+DIST gnome-panel-2.20.1.tar.bz2 2820992 RMD160 9648be6685038114066790136caf0cbade68ffba SHA1 92288158cd4ab9cc56557ca4345292316e7af6bd SHA256 3ec39b085b905946fa891cb01ae320166a85e11e850f29bf622057a00a4d1b01
+EBUILD gnome-panel-2.20.1.ebuild 2022 RMD160 63b07468b371a42fb2a4e41b612db8991bceee6d SHA1 6bf4d806b91401e547b8f011af20b8572ef8e307 SHA256 a8844dad53522b16f70d33740ab3f00b6e4c5a7eca744c7280ba88db847ea98a
+MD5 24f9a70d5567936bd912b929c78b1a54 gnome-panel-2.20.1.ebuild 2022
+RMD160 63b07468b371a42fb2a4e41b612db8991bceee6d gnome-panel-2.20.1.ebuild 2022
+SHA256 a8844dad53522b16f70d33740ab3f00b6e4c5a7eca744c7280ba88db847ea98a gnome-panel-2.20.1.ebuild 2022
+MD5 fb97b94b27f7e6dd5c55e0736eb8e368 files/digest-gnome-panel-2.20.1 262
+RMD160 af9b754362b29828fb659cafe84e42fb6f8aed8a files/digest-gnome-panel-2.20.1 262
+SHA256 a87c0f7c7fb05d1fb521dc9e3cc312543f6d70bbf8cd3240cde6f2e642748de1 files/digest-gnome-panel-2.20.1 262
diff --git a/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
deleted file mode 100644
index f816cb1..0000000
--- a/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc eds slab"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2.5
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/orbit-2.4
-	>=gnome-base/gnome-vfs-2.14.2
-	>=x11-libs/libwnck-2.13.5
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	>=dev-libs/dbus-glib-0.71
-	x11-libs/libXau
-	media-libs/libpng
-	>=x11-libs/cairo-1.0.0
-	>=x11-libs/pango-1.15.4
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper $(use_enable eds) \
-			--with-in-process-applets=clock,notification-area,wncklet"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# FIXME : uh yeah, this is nice
-	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed"
-	if use slab; then
-		epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
-		epatch ${FILESDIR}/${PN}-recently-used-apps.patch
-	fi
-}
-
-pkg_postinst() {
-	local entries="/etc/gconf/schemas/panel-default-setup.entries"
-	if [ -e "$entries" ]; then
-		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=${entries}
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.20.0.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild
index 4b3b771..ab56139 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.20.0.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.20.1.ebuild
@@ -42,7 +42,7 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 pkg_setup() {
 	G2CONF="--disable-scrollkeeper $(use_enable eds) \
-			--with-in-process-applets=notification-area,wncklet"
+			--with-in-process-applets=clock,notification-area,wncklet"
 }
 
 src_unpack() {
@@ -50,7 +50,7 @@ src_unpack() {
 
 	# FIXME : uh yeah, this is nice
 	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' ${S}/gnome-panel/Makefile.in || die "sed failed"
+	sed -i 's:--load:-v:' "${S}/gnome-panel/Makefile.in" || die "sed failed"
 	if use slab; then
 		epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
 		epatch ${FILESDIR}/${PN}-recently-used-apps.patch
@@ -61,11 +61,12 @@ src_unpack() {
 
 pkg_postinst() {
 	local entries="/etc/gconf/schemas/panel-default-setup.entries"
+
 	if [ -e "$entries" ]; then
 		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=${entries}
+		GCONF_CONFIG_SOURCE=`"${ROOT}usr/bin/gconftool-2" --get-default-source`
+		"${ROOT}usr/bin/gconftool-2" --direct --config-source \
+			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
 	fi
 
 	# Calling this late so it doesn't process the GConf schemas file we already
diff --git a/profiles/package.mask b/profiles/package.mask
index 3a3bd1f..4e4671b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,6 +6,3 @@
 # NOTE: Please add your entry at the top!
 #
 
-# This is really only meant in combination with the gnome-experimental overlay
->=gnome-base/gnome-desktop-2.19.5
->=gnome-base/gnome-panel-2.19.5