| 1 |
commit: ffe226165651fd58aa6855d4fa0106637cad238e |
| 2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 27 00:14:18 2011 +0000 |
| 4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 27 00:14:18 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ffe22616 |
| 7 |
|
| 8 |
gnome-extra/gnome-utils: add blockers for file collisions |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838) |
| 11 |
|
| 12 |
--- |
| 13 |
gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild | 4 ++++ |
| 14 |
gnome-extra/gnome-utils/gnome-utils-9999.ebuild | 4 ++++ |
| 15 |
2 files changed, 8 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild |
| 18 |
index 793a2c9..ec49dbf 100644 |
| 19 |
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild |
| 20 |
+++ b/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild |
| 21 |
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND} |
| 22 |
>=dev-util/pkgconfig-0.9 |
| 23 |
doc? ( >=dev-util/gtk-doc-1.10 )" |
| 24 |
|
| 25 |
+# file collisions |
| 26 |
+RDEPEND="${RDEPEND} |
| 27 |
+ !<gnome-base/gnome-control-center-2.90" |
| 28 |
+ |
| 29 |
pkg_setup() { |
| 30 |
if ! use debug; then |
| 31 |
G2CONF="${G2CONF} --enable-debug=minimum" |
| 32 |
|
| 33 |
diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild |
| 34 |
index 793a2c9..ec49dbf 100644 |
| 35 |
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild |
| 36 |
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild |
| 37 |
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND} |
| 38 |
>=dev-util/pkgconfig-0.9 |
| 39 |
doc? ( >=dev-util/gtk-doc-1.10 )" |
| 40 |
|
| 41 |
+# file collisions |
| 42 |
+RDEPEND="${RDEPEND} |
| 43 |
+ !<gnome-base/gnome-control-center-2.90" |
| 44 |
+ |
| 45 |
pkg_setup() { |
| 46 |
if ! use debug; then |
| 47 |
G2CONF="${G2CONF} --enable-debug=minimum" |
Archives