Bump for gnome-panel and gnome-desktop, also make slab-integration optional

svn path=/; revision=20

7 files changed, 46 insertions, 41 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index a634dfb..585246f 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -3,18 +3,18 @@ MD5 482fa0fe32a392ef294ae4cc20a9ed67 files/gnome-desktop-recently-used-apps.patc
 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.19.90.tar.bz2 1346326 RMD160 38eb30c960cfb922a7af87c5842e75cb99817817 SHA1 ab89235cc013b4c38fdf947e5abdfafba46e47d2 SHA256 8c2bf531dd3cf75bcf0863f6b577148184f1fe084bb0ddb0586d0997d255dc9b
-EBUILD gnome-desktop-2.18.3.ebuild 1354 RMD160 6132129e28cf9ea41ba943706a48714030205961 SHA1 87f1003692f9e09ce64c8e6e51e11d490dbff9e1 SHA256 68f879b38e848115c7762314bad0e1af360821a51f8b0ba9e6925637084b0c21
-MD5 0eb02075972dd0a2d853a66d6d0f2812 gnome-desktop-2.18.3.ebuild 1354
-RMD160 6132129e28cf9ea41ba943706a48714030205961 gnome-desktop-2.18.3.ebuild 1354
-SHA256 68f879b38e848115c7762314bad0e1af360821a51f8b0ba9e6925637084b0c21 gnome-desktop-2.18.3.ebuild 1354
-EBUILD gnome-desktop-2.19.90.ebuild 1360 RMD160 ec225ebc6585dc7b3521493ff3d0abdaf3296abd SHA1 b954c77331bad39fd6e61b9ef76e916e4ef92a3a SHA256 9dbe48f7b734cca816fc4b9ef0a288408da346f33596ede18f994a1b2742e9b2
-MD5 efc8af75b2257538f51b5556780882a7 gnome-desktop-2.19.90.ebuild 1360
-RMD160 ec225ebc6585dc7b3521493ff3d0abdaf3296abd gnome-desktop-2.19.90.ebuild 1360
-SHA256 9dbe48f7b734cca816fc4b9ef0a288408da346f33596ede18f994a1b2742e9b2 gnome-desktop-2.19.90.ebuild 1360
+DIST gnome-desktop-2.19.92.tar.bz2 1353208 RMD160 441be88222f7698fdb5f7f9af17d2456dc64aecb SHA1 32358c490c81c1a8cf20c54b6414f9a509709770 SHA256 d156b8478064e38771e1a9bd26f3be929ceeb12b93bbc294a3a11b14e13c1a49
+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.19.92.ebuild 1377 RMD160 b2ada63b9b248f6a58199b668c0d7516761c808b SHA1 3e9c52df057321e8c54fdaac74a25b0c4b613284 SHA256 40e5f12c2f03a2a301dacd9384158578ec8f74ae963ec28178d969cddc7b52eb
+MD5 ea71995d19561c7722507cbc45578deb gnome-desktop-2.19.92.ebuild 1377
+RMD160 b2ada63b9b248f6a58199b668c0d7516761c808b gnome-desktop-2.19.92.ebuild 1377
+SHA256 40e5f12c2f03a2a301dacd9384158578ec8f74ae963ec28178d969cddc7b52eb gnome-desktop-2.19.92.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 bbeb8ea9c5171b1930ca158527aed68a files/digest-gnome-desktop-2.19.90 271
-RMD160 5dae9335557d5538a9796939e2c1c3d477348dd3 files/digest-gnome-desktop-2.19.90 271
-SHA256 443f4041788b6c9a526f5baae5cafd0f9786d353324e7932bcf402eaa6cb5966 files/digest-gnome-desktop-2.19.90 271
+MD5 5c7c68a916fa88f6fe4a3aeb913f6668 files/digest-gnome-desktop-2.19.92 271
+RMD160 11dbd90b872158905825af02012a2187660489a3 files/digest-gnome-desktop-2.19.92 271
+SHA256 42fa7b2e91a53a4d075961bf267035e12f3e657fc9758f1e81c2df8fd954df02 files/digest-gnome-desktop-2.19.92 271
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild
index 0f64f30..10b44c1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.18.3.ebuild
@@ -10,7 +10,7 @@ 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"
+IUSE="doc slab"
 
 RDEPEND=">=dev-libs/libxml2-2.4.20
 	>=x11-libs/gtk+-2.8
@@ -43,5 +43,5 @@ src_unpack() {
 		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
 		|| die "sed failed (2)"
 	fi
-	epatch ${FILESDIR}/gnome-desktop-recently-used-apps.patch
+	use slab && epatch ${FILESDIR}/gnome-desktop-recently-used-apps.patch
 }
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.19.90.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.19.92.ebuild
index 4597bd2..57f63bf 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.19.90.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.19.92.ebuild
@@ -10,7 +10,7 @@ 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"
+IUSE="doc slab"
 
 RDEPEND=">=dev-libs/libxml2-2.4.20
 	>=x11-libs/gtk+-2.11.3
@@ -43,5 +43,5 @@ src_unpack() {
 		sed -i '/^CFLAGS/s/$/ -mieee/' ${S}/gnome-about/Makefile.in \
 		|| die "sed failed (2)"
 	fi
-	epatch ${FILESDIR}/gnome-desktop-recently-used-apps.patch
+	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 0f89f8b..b914a81 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -18,19 +18,19 @@ AUX intlclock-applet.tar.bz2 165860 RMD160 b908ee17c5c221ec1552edaf41ac1fa3e7061
 MD5 d7516d8c7367b0df7f10da2701bb4aab files/intlclock-applet.tar.bz2 165860
 RMD160 b908ee17c5c221ec1552edaf41ac1fa3e70617cd files/intlclock-applet.tar.bz2 165860
 SHA256 42e31d4c63aae5128755e4e52f73aa11cfbd34f823149c3cbb303a0ac666acb3 files/intlclock-applet.tar.bz2 165860
-DIST gnome-panel-2.18.2.tar.bz2 2724039 RMD160 ac7be435aa51e364a6786f4589f0a85c8940a54a SHA1 629a6c8e6f83c039bc1d9561807c04298bf83f86 SHA256 94e6eeabc73ddd6d54e068fcebfe4b64eb3b8917ac8f3d6d160adba387a9a501
-DIST gnome-panel-2.19.6.tar.bz2 2790908 RMD160 6802f53e3660aa58b46756317f941e77ce3e6ea4 SHA1 e53eb46970e7e01e6342b953f3f092bf190f57b8 SHA256 52037d2473635773e976fc873c320e4f5eecf6ad8cd3149ed5e3b373cba7baa7
-EBUILD gnome-panel-2.18.2.ebuild 1945 RMD160 80e1725a06ba24656ffdd5610d47faec56a453d4 SHA1 148d65be960d68e4a0eacbd9e2cc988cdee62a02 SHA256 07c769d8b7e381950322095679e9aca027ddd98db2ac9878a74c4ed309e682ef
-MD5 e953f371ac7aae3075213df6b0706023 gnome-panel-2.18.2.ebuild 1945
-RMD160 80e1725a06ba24656ffdd5610d47faec56a453d4 gnome-panel-2.18.2.ebuild 1945
-SHA256 07c769d8b7e381950322095679e9aca027ddd98db2ac9878a74c4ed309e682ef gnome-panel-2.18.2.ebuild 1945
-EBUILD gnome-panel-2.19.6.ebuild 2129 RMD160 040a9b19839949efadf1d985a497a396993caa5f SHA1 a7033285121560c6287efa540c9309a128271ee3 SHA256 b6845d061ef64c906e75306c577371619ae3fe6d5be0703a7e9ae9917be85d80
-MD5 6c386ee3a5e6174795577a9e4e5607ae gnome-panel-2.19.6.ebuild 2129
-RMD160 040a9b19839949efadf1d985a497a396993caa5f gnome-panel-2.19.6.ebuild 2129
-SHA256 b6845d061ef64c906e75306c577371619ae3fe6d5be0703a7e9ae9917be85d80 gnome-panel-2.19.6.ebuild 2129
-MD5 f6f8273aa2c13ca9d3c0be59e31bceb9 files/digest-gnome-panel-2.18.2 262
-RMD160 40aee6032db2cc0efc5ef443d2e05efdb592e2a5 files/digest-gnome-panel-2.18.2 262
-SHA256 ea5add9feaa52477f103e021d37d4762e3b5a077e98e96f53c95fd0ebf767beb files/digest-gnome-panel-2.18.2 262
-MD5 52abb2f672f20b887eef16b6915dabb3 files/digest-gnome-panel-2.19.6 262
-RMD160 72430ec8049b74189b2696de7765533327ce09c5 files/digest-gnome-panel-2.19.6 262
-SHA256 a21824cac22947fab639d332d911d1d4afb5e2fcc7ca0120b8ec7c491c49d9d2 files/digest-gnome-panel-2.19.6 262
+DIST gnome-panel-2.18.3.tar.bz2 2722555 RMD160 346c3e981de3af98632d43511545b1877cf9cb5e SHA1 a521b722a1cc753ea0fa3ed7dcf5262750235f9a SHA256 efb12148ace94612b47add4060dd9ae088b47e09e5c4c223f8ab7e1c7dcc9410
+DIST gnome-panel-2.19.92.tar.bz2 2776094 RMD160 479b9681b24052000ae9fe0f3d0be48bf93bd515 SHA1 73ab5f54fa44c2460b348eb112087e65c8ba2c16 SHA256 da2af2a8d0007be2075240907a50baa85846709fb1d58f12d114b729a18afeff
+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.19.92.ebuild 2149 RMD160 481d4c0fbd5139958570f28d0e07fcfcba92fe4b SHA1 2113d93f469c5538a4619c9559bcc8147d9b9056 SHA256 48e330770c615882f78c41378a16ba9c44cae39d9c460546e37bc76e5fa32e0c
+MD5 35118ae1d020660c912c62f6f5d2fffb gnome-panel-2.19.92.ebuild 2149
+RMD160 481d4c0fbd5139958570f28d0e07fcfcba92fe4b gnome-panel-2.19.92.ebuild 2149
+SHA256 48e330770c615882f78c41378a16ba9c44cae39d9c460546e37bc76e5fa32e0c gnome-panel-2.19.92.ebuild 2149
+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 cd359a5084680104e4cc571ad52e7b9e files/digest-gnome-panel-2.19.92 265
+RMD160 00d5473daaaa01e89ceb5ee0b90c511a5b5856fd files/digest-gnome-panel-2.19.92 265
+SHA256 786b20c931b63fbbafd598653ff42a3f2f1e1438e4f0623158aea7ab4ea32217 files/digest-gnome-panel-2.19.92 265
diff --git a/gnome-base/gnome-panel/gnome-panel-2.18.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
index 913b012..f816cb1 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.18.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.18.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,7 +10,7 @@ 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"
+IUSE="doc eds slab"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=x11-libs/gtk+-2.10
@@ -50,8 +50,10 @@ 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"
-	epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
-	epatch ${FILESDIR}/${PN}-recently-used-apps.patch
+	if use slab; then
+		epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
+		epatch ${FILESDIR}/${PN}-recently-used-apps.patch
+	fi
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-panel/gnome-panel-2.19.6.ebuild b/gnome-base/gnome-panel/gnome-panel-2.19.92.ebuild
index 017ad0e..eb503b4 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.19.6.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.19.92.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,7 +10,7 @@ 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 intlclock"
+IUSE="doc eds intlclock slab"
 
 RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=dev-libs/glib-2.13.0
@@ -51,8 +51,10 @@ 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"
-	epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
-	epatch ${FILESDIR}/${PN}-recently-used-apps.patch
+	if use slab; then
+		epatch ${FILESDIR}/${PN}-alt-f1-slab.patch
+		epatch ${FILESDIR}/${PN}-recently-used-apps.patch
+	fi
 
 	if use intlclock; then
 		cd ${S}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index daaecac..8e9f9b2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1,5 +1,6 @@
-
+gnome-base/gnome-desktop:slab - Add integration with Novell's new main menu
 gnome-base/gnome-panel:intlclock - Add international clock with worldmap to appet list
+gnome-base/gnome-panel:slab - Add integration with Novell's new main menu
 gnome-extra/gnome-main-menu:beagle - enable beagle search support
 gnome-extra/gnome-main-menu:libssui - integrate alternate libssui logout and shutdown dialogs
 gnome-extra/gnome-main-menu:nautilus - enable nautilus extension