Optionally depend on new libgdu package, split out of gnome-disk-utility.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 26 insertions, 16 deletions

diff --git a/rox-base/rox-media/ChangeLog b/rox-base/rox-media/ChangeLog
index 0d805e4ec1aa..fcd1c8f5b6e4 100644
--- a/rox-base/rox-media/ChangeLog
+++ b/rox-base/rox-media/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox-media
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/ChangeLog,v 1.4 2010/12/04 11:25:57 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/ChangeLog,v 1.5 2012/04/12 09:25:21 tetromino Exp $
+
+  12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  rox-media-0.0.3.ebuild, rox-media-0.0.3-r1.ebuild:
+  Optionally depend on new libgdu package, split out of gnome-disk-utility.
 
   04 Dec 2010; Markos Chandras <hwoarang@gentoo.org> rox-media-0.0.3-r1.ebuild:
   Stable on amd64 wrt bug #343713
diff --git a/rox-base/rox-media/Manifest b/rox-base/rox-media/Manifest
index 31a10f318e76..c78ab8530043 100644
--- a/rox-base/rox-media/Manifest
+++ b/rox-base/rox-media/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rox-media-0.0.3-Respect-env.patch 806 RMD160 113a6d339860e8050d09b5108cc6b475ea6504f6 SHA1 1697030908402fccdcae6cd5642c4e6315c1e8bd SHA256 5972fbc5b609c544008996d08b0409a1a468b08fd27b7078f583bf0debe5ecfa
 DIST Media-0.0.3.tar.bz2 26051 RMD160 2c768f76d270ad9010d5ff2c76e6846f65df486c SHA1 a08ab7fea7bf1b6419ef763f1db743d39becb11d SHA256 e52339ca78960c6ac5b4ede1ad5792f108b8af37cd6fbe4cbde72e7b8d86d826
-EBUILD rox-media-0.0.3-r1.ebuild 1067 RMD160 0a1aa6692bcc73420ce5244d594c6718d05c7132 SHA1 04264913a6c064a7c137e9f24ac0d8131c93410b SHA256 8e57dcc4e9cf13e902ab8fef1b4e832be9b17b0ad025e672f48ac06c7fdbba7a
-EBUILD rox-media-0.0.3.ebuild 979 RMD160 1daf653658099196d2eca27d1fa7344675d7d4d8 SHA1 6ead7a6237c3eda938c637ec1480ece08344cdac SHA256 d2a63b88f514a6cce5cf1e84e693480a61c6cb74c9933800b92055c7ba71b1d0
-MISC ChangeLog 837 RMD160 e96f9d8a5c417316081a8595b92aa739b0352565 SHA1 7c1efd98637c7bbd326e37df9cb7fdb0b4ab1143 SHA256 ea443e9481d172d97c0128c8054ee1dcc016714867569be3d773aa58bf9348bf
+EBUILD rox-media-0.0.3-r1.ebuild 1152 RMD160 6ee9944701a5f1ee7b8dd12c878b0b39d2c9e170 SHA1 c1e1f30a18709ce06e0bd28c4847d119d34b6cbb SHA256 5be26b9b10983fddc7557e46cd9a03a1e756a1c739113b2bc1f5dc35ec036dc5
+EBUILD rox-media-0.0.3.ebuild 1063 RMD160 328856240f48af06faafc88f2927b723175089fc SHA1 dd8dbd6ed21c896ae300cc609735f2b2d9f59735 SHA256 5f5d884b972df0d61b6ab03db2420d7a0efa6a2615fed53f272a1649fb4f48bd
+MISC ChangeLog 1027 RMD160 790285a544f9c0a5fc5b8617b4c4fc81fe647624 SHA1 7f7595660be2cc6cfbb39f56d6edde8f9b18c04c SHA256 da6c07d7ec1cbc14197970ed0155035aae8e9a03210c87494bf2c7c83e60c407
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkz6MzkACgkQ9/cejkQaxBCjCgCePIXgmSreT5aK6AmUjnjWqRAd
-7vAAnR4vyddHoDdKDzjLT+CItkhdgb7Q
-=RN71
+iF4EAREIAAYFAk+Gn4cACgkQdjK8w9WeBnBe5AD+K6E2ExKl7COSrhVgftoytmlQ
+1D6oR5hHfBy0a50em3cA/iBQJogkHM6HdF7nH7cwl4E0auQEC7eCZCdvd8x7HPvg
+=hr3o
 -----END PGP SIGNATURE-----
diff --git a/rox-base/rox-media/rox-media-0.0.3-r1.ebuild b/rox-base/rox-media/rox-media-0.0.3-r1.ebuild
index 0af5fe7890f9..175ecb0afab0 100644
--- a/rox-base/rox-media/rox-media-0.0.3-r1.ebuild
+++ b/rox-base/rox-media/rox-media-0.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/rox-media-0.0.3-r1.ebuild,v 1.3 2010/12/04 11:25:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/rox-media-0.0.3-r1.ebuild,v 1.4 2012/04/12 09:25:21 tetromino Exp $
 
 EAPI=3
 inherit rox eutils
@@ -16,7 +16,10 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	gnome-base/gconf:2
-	sys-apps/gnome-disk-utility
+	|| (
+		gnome-base/libgdu
+		=sys-apps/gnome-disk-utility-3.0.2-r300
+		<=sys-apps/gnome-disk-utility-3.0.2-r200 )
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/scons"
diff --git a/rox-base/rox-media/rox-media-0.0.3.ebuild b/rox-base/rox-media/rox-media-0.0.3.ebuild
index d0160c1dc5e0..69b952f532bc 100644
--- a/rox-base/rox-media/rox-media-0.0.3.ebuild
+++ b/rox-base/rox-media/rox-media-0.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/rox-media-0.0.3.ebuild,v 1.2 2010/07/29 02:08:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-media/rox-media-0.0.3.ebuild,v 1.3 2012/04/12 09:25:21 tetromino Exp $
 
 EAPI=3
 inherit rox
@@ -16,7 +16,10 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	gnome-base/gconf:2
-	sys-apps/gnome-disk-utility
+	|| (
+		gnome-base/libgdu
+		=sys-apps/gnome-disk-utility-3.0.2-r300
+		<=sys-apps/gnome-disk-utility-3.0.2-r200 )
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/scons"