public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-02-08 12:54 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-02-08 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     894ad4cb943605618b75a43e64c56279761f6fb6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 12:08:41 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 12:08:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=894ad4cb

gnome-extra/gnome-utils: 2.91.2 -> 2.91.4

* Various bugfixes

---
 ...ils-2.91.2.ebuild => gnome-utils-2.91.4.ebuild} |    4 ++--
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.4.ebuild
similarity index 96%
rename from gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-2.91.4.ebuild
index 4e38ae1..793a2c9 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.2.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.91.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
 
@@ -22,7 +22,7 @@ else
 fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
-RDEPEND=">=dev-libs/glib-2.20:2
+RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gtk+-2.91.1:3
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-panel-2.13.4

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 4e38ae1..793a2c9 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
 
@@ -22,7 +22,7 @@ else
 fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
-RDEPEND=">=dev-libs/glib-2.20:2
+RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/gtk+-2.91.1:3
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-panel-2.13.4



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-02-21 22:35 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-02-21 22:35 UTC (permalink / raw
  To: gentoo-commits

commit:     daf7c7192379fdef41325d678162971d239987f3
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 22:30:04 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:30:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=daf7c719

gnome-extra/gnome-utils: 2.91.4 -> 2.91.90

---
 ...ls-2.91.4.ebuild => gnome-utils-2.91.90.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.4.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
similarity index 100%
rename from gnome-extra/gnome-utils/gnome-utils-2.91.4.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-02-27  3:02 Jonathan Callen
  0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen @ 2011-02-27  3:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ffe226165651fd58aa6855d4fa0106637cad238e
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 00:14:18 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:14:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ffe22616

gnome-extra/gnome-utils: add blockers for file collisions

(Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild |    4 ++++
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
index 793a2c9..ec49dbf 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 
+# file collisions
+RDEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-2.90"
+
 pkg_setup() {
 	if ! use debug; then
 		G2CONF="${G2CONF} --enable-debug=minimum"

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 793a2c9..ec49dbf 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 
+# file collisions
+RDEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-2.90"
+
 pkg_setup() {
 	if ! use debug; then
 		G2CONF="${G2CONF} --enable-debug=minimum"



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-03-23  5:20 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5e96e00bae529c3cb22064652aefd7824d289ee4
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 01:44:33 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 01:44:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5e96e00b

gnome-extra/gnome-utils: 2.91.90 → 2.91.91

---
 ...s-2.91.90.ebuild => gnome-utils-2.91.91.ebuild} |    6 +++---
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.91.ebuild
similarity index 96%
rename from gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-2.91.91.ebuild
index ec49dbf..74192e9 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.90.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.91.91.ebuild
@@ -23,11 +23,11 @@ fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-3.0.3:3
+	>=gnome-base/gconf-2:2
 	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	>=gnome-base/libgtop-2.12
+	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/libXext
 	x11-libs/libX11

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index ec49dbf..74192e9 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -23,11 +23,11 @@ fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-3.0.3:3
+	>=gnome-base/gconf-2:2
 	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	>=gnome-base/libgtop-2.12
+	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/libXext
 	x11-libs/libX11



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-03-26  1:58 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-03-26  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ad355e9c1e19ec5b5161d887076e1d3c8cf974b1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 00:39:37 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 00:57:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ad355e9c

gnome-extra/gnome-utils: 2.91.91 → 2.91.93

* Updated translations and schema paths

---
 ...s-2.91.91.ebuild => gnome-utils-2.91.93.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.91.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.91.93.ebuild
similarity index 100%
rename from gnome-extra/gnome-utils/gnome-utils-2.91.91.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-2.91.93.ebuild



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-04-05  0:57 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05  0:57 UTC (permalink / raw
  To: gentoo-commits

commit:     683ad5461b0e45e2f0c25264d3ae4145b60da2ab
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 18:02:02 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 21:20:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=683ad546

gnome-extra/gnome-utils: 2.91.93 → 3.0.0

---
 ...ils-2.91.93.ebuild => gnome-utils-3.0.0.ebuild} |    2 +-
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-2.91.93.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
similarity index 98%
rename from gnome-extra/gnome-utils/gnome-utils-2.91.93.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
index 55de7d3..7dabe85 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.91.93.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
 	>=gnome-base/gconf-2:2
 	>=gnome-base/gnome-panel-2.13.4

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 55de7d3..7dabe85 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
 	>=gnome-base/gconf-2:2
 	>=gnome-base/gnome-panel-2.13.4



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-04-29 17:29 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-04-29 17:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ca7068eef03b4789fc3d40d1af647997485f3be2
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 17:22:59 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 17:22:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ca7068ee

gnome-extra/gnome-utils: 3.0.0 → 3.0.1

---
 ...utils-3.0.0.ebuild => gnome-utils-3.0.1.ebuild} |    6 ++----
 gnome-extra/gnome-utils/gnome-utils-9999.ebuild    |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
similarity index 92%
rename from gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
index 81a0f15..c91b48c 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.0.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bonobo doc ipv6 test"
+IUSE="doc ipv6 test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -31,8 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/libXext
-	x11-libs/libX11
-	bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
+	x11-libs/libX11"
 
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xextproto
@@ -52,7 +51,6 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		$(use_enable ipv6)
-		$(use_enable bonobo gdict-applet)
 		--enable-zlib
 		--disable-maintainer-flags
 		--disable-static

diff --git a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
index 81a0f15..c91b48c 100644
--- a/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bonobo doc ipv6 test"
+IUSE="doc ipv6 test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -31,8 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=gnome-base/libgtop-2.12:2
 	>=media-libs/libcanberra-0.26-r2[gtk3]
 	x11-libs/libXext
-	x11-libs/libX11
-	bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )"
+	x11-libs/libX11"
 
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xextproto
@@ -52,7 +51,6 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		$(use_enable ipv6)
-		$(use_enable bonobo gdict-applet)
 		--enable-zlib
 		--disable-maintainer-flags
 		--disable-static



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/
@ 2011-10-28  2:23 Alexandre Restovtsev
  0 siblings, 0 replies; 8+ messages in thread
From: Alexandre Restovtsev @ 2011-10-28  2:23 UTC (permalink / raw
  To: gentoo-commits

commit:     5f9c64323cd1750d79f817ba183efa29d082a2c2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 01:52:07 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 01:52:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5f9c6432

gnome-extra/gnome-utils: 3.2.0 → 3.2.1

Fixes screenshot help.

---
 ...utils-3.2.0.ebuild => gnome-utils-3.2.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
similarity index 100%
rename from gnome-extra/gnome-utils/gnome-utils-3.2.0.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild



^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-10-28  2:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-23  5:20 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-utils/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2011-10-28  2:23 Alexandre Restovtsev
2011-04-29 17:29 Nirbheek Chauhan
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  1:58 Nirbheek Chauhan
2011-02-27  3:02 Jonathan Callen
2011-02-21 22:35 Nirbheek Chauhan
2011-02-08 12:54 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox