Version bump. Also remove <dbus-1 and dbus-glib OR depend as non-split dbus is not in the tree anymore

Package-Manager: portage-2.1.3_rc5

5 files changed, 35 insertions, 21 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index b9c5098a927e..3a1c7883bb4e 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.217 2007/06/02 02:56:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.218 2007/06/29 13:05:06 leio Exp $
+
+*gnome-panel-2.18.2 (29 Jun 2007)
+
+  29 Jun 2007; Mart Raudsepp <leio@gentoo.org> -gnome-panel-2.18.0.ebuild,
+  +gnome-panel-2.18.2.ebuild:
+  Version bump. Also remove <dbus-1 and dbus-glib OR depend as non-split dbus
+  is not in the tree anymore
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> gnome-panel-2.16.3.ebuild:
   Marking gnome-panel-2.16.3 ppc stable for bug #171107
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index eb441cdde330..ee15ab592ffd 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-panel-2.14.2.tar.bz2 2571077 RMD160 1938dd84993f38ac9cbaf7694f22e1ff38e233fa SHA1 da7d3147e808a9feaee1a5c8df7b53d07dbe6c5b SHA256 b819a3c8ad09a517cdf67ddf2394ac0560ead31272ff697d2f242569980e1dc8
 DIST gnome-panel-2.16.1.tar.bz2 2689938 RMD160 9cff06b11d65b905cab3582747da4e00c56f8029 SHA1 7f10a31edb3082c0ef16b1a980807a73e7ef39fa SHA256 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23
 DIST gnome-panel-2.16.2.tar.bz2 2686630 RMD160 c6711b6d00e2950ceb8d30965510d5b97bf1cfce SHA1 b01ca1610fb4f78a00aee9c0f48c305b5ea605ce SHA256 11e6f6a076d24a76ae252e04302593dc4e8d72d95081f0ec63b54ccae0705bee
 DIST gnome-panel-2.16.3.tar.bz2 2692203 RMD160 973587c05bf8c984492aacd32516629272e00171 SHA1 3581ddaf05a75e4a3ed02dee90609b47a5ef346b SHA256 16e44673e3a660585cb007c54d7b5e0aa5fe26e979090926cc55322bb6d0d67e
-DIST gnome-panel-2.18.0.tar.bz2 2706385 RMD160 b681a4d96e4ccc6e727f405abf4fd2c45c5e670a SHA1 8bc631c52332e6c19490eea4759deba00186fce0 SHA256 856c5205878bd0bee4bc7e62bdc7ecfce560aa233d2acfaf17a61d5ec446ef46
 DIST gnome-panel-2.18.1.tar.bz2 2713127 RMD160 380a87bb366ed788110eea55803e33a3b519ca93 SHA1 c690833d3e409cb9b22413aa987163b9d6d3b8b4 SHA256 c04b53bcc0057ed042169baa725ed3769194864e5824643cc0af8c58cf773d2c
+DIST gnome-panel-2.18.2.tar.bz2 2724039 RMD160 ac7be435aa51e364a6786f4589f0a85c8940a54a SHA1 629a6c8e6f83c039bc1d9561807c04298bf83f86 SHA256 94e6eeabc73ddd6d54e068fcebfe4b64eb3b8917ac8f3d6d160adba387a9a501
 EBUILD gnome-panel-2.14.2.ebuild 1795 RMD160 300768ae5a489a3ace615edacffaf6e936553939 SHA1 e43b2977dee157eddb8ee5d45f340c2c4bc0c00b SHA256 89e2593ff4cc859827c2c7888f2099f1f5d753c27ff90578066575a1712034ce
 MD5 f0904c4f827842b4e9bcdfff03a850a2 gnome-panel-2.14.2.ebuild 1795
 RMD160 300768ae5a489a3ace615edacffaf6e936553939 gnome-panel-2.14.2.ebuild 1795
@@ -20,18 +23,18 @@ EBUILD gnome-panel-2.16.3.ebuild 1904 RMD160 16623c4e19ff6120c03b8673d3434ba2c66
 MD5 563663c05ba4e359095eedac6f95ec6f gnome-panel-2.16.3.ebuild 1904
 RMD160 16623c4e19ff6120c03b8673d3434ba2c6606e9b gnome-panel-2.16.3.ebuild 1904
 SHA256 95278dc7e1560dd7e4f429110249efa360b5a5ed2ed941e09603179eb60f30d0 gnome-panel-2.16.3.ebuild 1904
-EBUILD gnome-panel-2.18.0.ebuild 2002 RMD160 b2f9b7027e6c10cd1e9419211bbc5f2eff2091b1 SHA1 76de96f5ee5d1695fe708538134cbd0e8150c92f SHA256 2041a9b262869296d41f89fabf065586ea7f766d2258c219f48ed2710371882a
-MD5 748d8ad448cc7a3bb5afe2da5ed0d292 gnome-panel-2.18.0.ebuild 2002
-RMD160 b2f9b7027e6c10cd1e9419211bbc5f2eff2091b1 gnome-panel-2.18.0.ebuild 2002
-SHA256 2041a9b262869296d41f89fabf065586ea7f766d2258c219f48ed2710371882a gnome-panel-2.18.0.ebuild 2002
 EBUILD gnome-panel-2.18.1.ebuild 2006 RMD160 fa32704b091a0b3c17c7215d6df243a6ad7c1d54 SHA1 ad12a1c46f63d77596629fee158d73fd3e7f42e3 SHA256 961de76bf351e9cff4810f40827047943891c43f47755137e8a56f651c73bd10
 MD5 dfdae125031a90df8aa778a27adca615 gnome-panel-2.18.1.ebuild 2006
 RMD160 fa32704b091a0b3c17c7215d6df243a6ad7c1d54 gnome-panel-2.18.1.ebuild 2006
 SHA256 961de76bf351e9cff4810f40827047943891c43f47755137e8a56f651c73bd10 gnome-panel-2.18.1.ebuild 2006
-MISC ChangeLog 28048 RMD160 aaff2084db661ffba3934ec97629e90079e2ab38 SHA1 e9649bc415761ae0442613a0df34a347fefbe0f5 SHA256 bc36dc4f35b0b1c832088472b29039e21c687206c06246b133d3cdd1c73fa59c
-MD5 c5290d301488004992fb012b8a8be703 ChangeLog 28048
-RMD160 aaff2084db661ffba3934ec97629e90079e2ab38 ChangeLog 28048
-SHA256 bc36dc4f35b0b1c832088472b29039e21c687206c06246b133d3cdd1c73fa59c ChangeLog 28048
+EBUILD gnome-panel-2.18.2.ebuild 1941 RMD160 c00c2a602ee30a93227be9028c11d64c2b10aacb SHA1 6e71ccde076c35e1a6aae2ae15b335ef44eaa11a SHA256 8cb3daa614899ddab2567b5ab4251e19467944d196406efdde415579f5645d5c
+MD5 ed10c05cb66355d1ff1f62c46a54548a gnome-panel-2.18.2.ebuild 1941
+RMD160 c00c2a602ee30a93227be9028c11d64c2b10aacb gnome-panel-2.18.2.ebuild 1941
+SHA256 8cb3daa614899ddab2567b5ab4251e19467944d196406efdde415579f5645d5c gnome-panel-2.18.2.ebuild 1941
+MISC ChangeLog 28294 RMD160 c01cf34c5ae1c0d94766abe3cb48255e7c87ace7 SHA1 6a970bb0f7eaf92d8a27c30ff11cf509c29e2f0a SHA256 977cde92875d63d212c76a71db282748a971d66af965623c672740f44827e7e0
+MD5 2df1914e83d743c89e0e1d5cd7892ad6 ChangeLog 28294
+RMD160 c01cf34c5ae1c0d94766abe3cb48255e7c87ace7 ChangeLog 28294
+SHA256 977cde92875d63d212c76a71db282748a971d66af965623c672740f44827e7e0 ChangeLog 28294
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -48,9 +51,16 @@ SHA256 27675a73cf581e5453f6514f11441cbbaf43d53da7993ccea4f18f2a822fb7ad files/di
 MD5 644433fed42b51f9a5926c7ee896304b files/digest-gnome-panel-2.16.3 262
 RMD160 9865f863dadae569b272241e79b2589bc965fe76 files/digest-gnome-panel-2.16.3 262
 SHA256 50ee01612a91c0035871cb0b04ed53d51418c6a2e94cd5c5bbb6f9a44d6d6e90 files/digest-gnome-panel-2.16.3 262
-MD5 abaf9ab29fc3790f54d7d79e038f6e93 files/digest-gnome-panel-2.18.0 262
-RMD160 9b2378c1afb518b3b15be8b77b58b92ff742fdd3 files/digest-gnome-panel-2.18.0 262
-SHA256 8546a6dc601d4e5a0d6beb4bc47a87afc9ab4653916ed2136396e76be813ea15 files/digest-gnome-panel-2.18.0 262
 MD5 0da70bb8e2f5a503124509f6313aad95 files/digest-gnome-panel-2.18.1 262
 RMD160 2f7a70c9797a90a537d8550e7a2b9087757462b7 files/digest-gnome-panel-2.18.1 262
 SHA256 f982f0f44d041ec34aaa0bd0b44c4ee7a710bc8fbf34a22d9474cd7f5fda1206 files/digest-gnome-panel-2.18.1 262
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGhQNkkeYb6olFHJcRAps/AJwIlj7/uEkxVOfnlJDhUklikKxktQCgxlSr
+dfTUab/MrBrOQaMvfcDwP1U=
+=bg4/
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.0
deleted file mode 100644
index 256d3542b022..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67ab5a4df1817fe14572d9e366664665 gnome-panel-2.18.0.tar.bz2 2706385
-RMD160 b681a4d96e4ccc6e727f405abf4fd2c45c5e670a gnome-panel-2.18.0.tar.bz2 2706385
-SHA256 856c5205878bd0bee4bc7e62bdc7ecfce560aa233d2acfaf17a61d5ec446ef46 gnome-panel-2.18.0.tar.bz2 2706385
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.2
new file mode 100644
index 000000000000..d14590333a6f
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.18.2
@@ -0,0 +1,3 @@
+MD5 5db34402d672afd41870946c38092b7f gnome-panel-2.18.2.tar.bz2 2724039
+RMD160 ac7be435aa51e364a6786f4589f0a85c8940a54a gnome-panel-2.18.2.tar.bz2 2724039
+SHA256 94e6eeabc73ddd6d54e068fcebfe4b64eb3b8917ac8f3d6d160adba387a9a501 gnome-panel-2.18.2.tar.bz2 2724039
diff --git a/gnome-base/gnome-panel/gnome-panel-2.18.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.18.2.ebuild
index c9bac7ad3207..a4a55a22fd6f 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.18.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18.0.ebuild,v 1.1 2007/03/27 03:19:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.18.2.ebuild,v 1.1 2007/06/29 13:05:06 leio Exp $
 
 inherit gnome2
 
@@ -24,10 +24,7 @@ RDEPEND=">=gnome-base/gnome-desktop-2.12
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-menus-2.11.1
 	>=gnome-base/libbonobo-2
-	||  (
-			>=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
-		)
+	>=dev-libs/dbus-glib-0.71
 	x11-libs/libXau
 	media-libs/libpng
 	>=x11-libs/cairo-1.0.0