diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-03-06 21:43:59 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-03-06 21:43:59 +0000 |
| commit | 9ebc2726621a2bb3bf1e03c81512f57711145a8e (patch) | |
| tree | 8e24440f62a8310510004db8b45533926c15b225 /gnome-base | |
| parent | No files should be compressed in the tree (diff) | |
| download | historical-9ebc2726621a2bb3bf1e03c81512f57711145a8e.tar.gz historical-9ebc2726621a2bb3bf1e03c81512f57711145a8e.tar.bz2 historical-9ebc2726621a2bb3bf1e03c81512f57711145a8e.zip | |
Fix bug 306431 by adding a dependency on gvfs[gdu]. Also move it to PDEPEND to prevent circular dependencies (gnome -> nautilus, gvfs[gdu] -> gnome-disk-utility[nautilus] -> nautilus)
Package-Manager: portage-2.1.7.17/cvs/Linux i686
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gnome/Manifest | 14 | ||||
| -rw-r--r-- | gnome-base/gnome/gnome-2.28.2.ebuild | 7 |
3 files changed, 12 insertions, 16 deletions
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog index cd2e4aa34be9..4d9b68b33c81 100644 --- a/gnome-base/gnome/ChangeLog +++ b/gnome-base/gnome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.374 2010/02/24 23:45:08 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.375 2010/03/06 21:43:59 nirbheek Exp $ + + 06 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gnome-2.28.2.ebuild: + Fix bug 306431 by adding a dependency on gvfs[gdu]. Also move it to + PDEPEND to prevent circular dependencies (gnome -> nautilus, gvfs[gdu] -> + gnome-disk-utility[nautilus] -> nautilus) *gnome-2.28.2 (24 Feb 2010) diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest index e9f93e38b6d7..28d30454992a 100644 --- a/gnome-base/gnome/Manifest +++ b/gnome-base/gnome/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - EBUILD gnome-2.26.3.ebuild 5435 RMD160 19cb868cd66ee256071558dda297807dd3da231d SHA1 f1630ae52420313dc9c4fa77783204c824300e4e SHA256 d3744f21d5f73ff1395930717dc4b94daaf1bdd8507ed0c4192caee450084f93 EBUILD gnome-2.28.1.ebuild 5530 RMD160 41d0de85b8f5dcc96dfc277036e98d0d5e5ced86 SHA1 5a80a9113f66a5b016c2debe15f07c3ebeb0a755 SHA256 c35098638c98aaa6fb62c84aa2da3e3131aabe1eb7cc42ad3ea8b809847e4679 -EBUILD gnome-2.28.2.ebuild 5369 RMD160 ad4efeff434645d51bf69edbcfdfa2f935757fd6 SHA1 1eec92b7d1b11906fcd670c2588aea8fa846c01b SHA256 11d123562678b472e2dfde7da363d5748377ec291f9048d92f6dac91dc8def1a -MISC ChangeLog 50235 RMD160 25eae78dbb28af65266740c54a27b26961bda210 SHA1 21d6c18de8fee6f37b393e7b571d22541012d3e8 SHA256 dd6bed4c91034926abc9b8defadb6e9e0977a3886cff26959e894271d78e91a1 +EBUILD gnome-2.28.2.ebuild 5398 RMD160 47c4e63153eedf5d49ec1dab8909460004e2e212 SHA1 d8270e4f23532a86dc3c71652525fcd07b854ff4 SHA256 d8686119f11b4f063707becf3a01a8024b37352ee9607ba8e3796860cd75dbbe +MISC ChangeLog 50506 RMD160 c8286dcad40c3b5c5358c112e90077013b0f0177 SHA1 1f43568027d64aa8ef131e1346abda8b7f9de8e7 SHA256 006fce847250504eb020588d2d0bac11c54bea95a704ecdfd8ccf66d004e8d06 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuFuhMACgkQ1fmVwcYIWAYsQwCfQkzeYp+0w9EB+2V3XDIwQCCf -Da0AnRLsru+ObBje6ujnLKkjOxGymw20 -=u21n ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome/gnome-2.28.2.ebuild b/gnome-base/gnome/gnome-2.28.2.ebuild index 159cac3a12d9..c9aa7ad166db 100644 --- a/gnome-base/gnome/gnome-2.28.2.ebuild +++ b/gnome-base/gnome/gnome-2.28.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.28.2.ebuild,v 1.1 2010/02/24 23:45:08 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.28.2.ebuild,v 1.2 2010/03/06 21:43:59 nirbheek Exp $ -EAPI="1" +EAPI="2" DESCRIPTION="Meta package for the GNOME desktop" HOMEPAGE="http://www.gnome.org/" @@ -58,7 +58,6 @@ RDEPEND=" >=gnome-base/gnome-settings-daemon-2.28.1 >=gnome-base/gnome-control-center-2.28.1 - >=gnome-base/gvfs-1.4.3 >=gnome-base/nautilus-2.28.4 >=media-libs/gstreamer-0.10.25 @@ -157,6 +156,8 @@ RDEPEND=" mono? ( >=dev-dotnet/gtk-sharp-2.12.9 >=app-misc/tomboy-1.0.1 )" +DEPEND="" +PDEPEND=">=gnome-base/gvfs-1.4.3[gdu]" # Broken from assumptions of gnome-vfs headers being included in nautilus headers, # which isn't the case with nautilus-2.22, bug #216019 # >=app-admin/gnome-system-tools-2.28.2 |