* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome/, gnome-base/gnome-extra-apps/, gnome-base/gnome-light/, ...
@ 2011-08-21 7:10 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-08-21 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 00856c39a4a15bbdc9eadd849daf508290837a0f
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 22:42:00 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 21 07:09:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=00856c39
gnome-base/gnome-*: Meta package churn
* Change the description of meta packages that shouldn't be directly installed
* gnome-fallback no longer pulls in core-apps and shouldn't be directly installed
Use it via USE=-shell emerge -av gnome-light
---
.../gnome-core-apps/gnome-core-apps-3.0.0.ebuild | 2 +-
.../gnome-core-libs/gnome-core-libs-3.0.0.ebuild | 2 +-
| 2 +-
.../gnome-fallback/gnome-fallback-3.0.0.ebuild | 5 ++---
gnome-base/gnome-light/gnome-light-3.0.0.ebuild | 6 ++----
gnome-base/gnome/gnome-3.0.0.ebuild | 2 +-
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
index 5f4d2be..714d997 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-DESCRIPTION="Meta package for the core applications integrated with GNOME 3"
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
index f6207c9..0abc9f5 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-DESCRIPTION="Meta package for the core libraries of GNOME 3"
+DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
--git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
index c3c10fb..333015f 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-DESCRIPTION="Meta package for the applications of GNOME 3"
+DESCRIPTION="Sub-meta package for the applications of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
index 9bba903..7aae618 100644
--- a/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
+++ b/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
@@ -4,11 +4,11 @@
EAPI="4"
-DESCRIPTION="Meta package for GNOME 3 fallback mode"
+DESCRIPTION="Sub-meta package for GNOME 3 fallback mode"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
-IUSE="+bluetooth cups +cdr"
+IUSE="cups"
# when unmasking for an arch
# double check none of the deps are still masked !
@@ -18,7 +18,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-l
# This is a wrapper for the GNOME 3 fallback apps list
RDEPEND="
>=gnome-base/gnome-core-libs-${PV}[cups?]
- >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
>=x11-wm/metacity-2.34.0
>=x11-misc/notification-daemon-0.7
diff --git a/gnome-base/gnome-light/gnome-light-3.0.0.ebuild b/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
index 6ae5b84..e378c79 100644
--- a/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
+DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="2.0"
@@ -32,9 +32,7 @@ RDEPEND="!gnome-base/gnome
>=x11-wm/mutter-${PV}
>=gnome-base/gnome-shell-${PV} )
- fallback? (
- >=x11-wm/metacity-2.34.0
- >=gnome-base/gnome-panel-${PV} )
+ fallback? ( >=gnome-base/gnome-fallback-${PV} )
>=x11-themes/gnome-icon-theme-${PV}
>=x11-themes/gnome-icon-theme-symbolic-${PV}
diff --git a/gnome-base/gnome/gnome-3.0.0.ebuild b/gnome-base/gnome/gnome-3.0.0.ebuild
index 2e1e44e..1af9d22 100644
--- a/gnome-base/gnome/gnome-3.0.0.ebuild
+++ b/gnome-base/gnome/gnome-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-DESCRIPTION="Meta package for GNOME 3"
+DESCRIPTION="Meta package for GNOME 3, merge this package to install"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome/, gnome-base/gnome-extra-apps/, gnome-base/gnome-light/, ...
@ 2011-08-28 6:13 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-08-28 6:13 UTC (permalink / raw
To: gentoo-commits
commit: 46a9681cbd0367b5b791c88a58b109b6ae6f9ec8
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 28 03:56:22 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 28 06:09:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=46a9681c
gnome meta packages: update for 3.1.x
Rename the ebuilds to force updates to gnome-3.1.x versions. Hold gdm at
version 3.0.x for now, until upstream releases a tarball with all the
changes and bugfixes that have landed since June. Hold epiphany at 3.0.x
until webkit-gtk-1.5.x can be tested.
Note that "emerge gnome" will error out on blockers when run on a
gnome-3.0 install. The clutter-1.7.x blocker is unavoidable. However,
the other blockers appear to be due only to portage's resolver
limitations.
"emerge pygobject:2 gnome-menus:0 gnome-power-manager gnome" appears to
be the command that forces portage to avoid all avoidable blockers.
---
...s-3.0.0.ebuild => gnome-core-apps-3.1.0.ebuild} | 9 ++++++---
...s-3.0.0.ebuild => gnome-core-libs-3.1.0.ebuild} | 14 +++++++++-----
| 11 ++++++-----
...ck-3.0.0.ebuild => gnome-fallback-3.1.0.ebuild} | 0
...light-3.0.0.ebuild => gnome-light-3.1.0.ebuild} | 0
.../{gnome-3.0.0.ebuild => gnome-3.1.0.ebuild} | 6 +++---
6 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.1.0.ebuild
similarity index 86%
rename from gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
rename to gnome-base/gnome-core-apps/gnome-core-apps-3.1.0.ebuild
index 714d997..b992386 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.1.0.ebuild
@@ -17,11 +17,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-l
# Note to developers:
# This is a wrapper for the core apps tightly integrated with GNOME 3
# gtk-engines:2 is still around because it's needed for gtk2 apps
+# gnome-menus:0 is used by older packages, and is listed here for a
+# clean upgrade from gnome-3.0
RDEPEND="
>=gnome-base/gnome-core-libs-${PV}[cups?]
>=gnome-base/gnome-session-${PV}
- >=gnome-base/gnome-menus-${PV}
+ >=gnome-base/gnome-menus-${PV}:3
+ >=gnome-base/gnome-menus-3.0.1-r50:0
>=gnome-base/gnome-settings-daemon-${PV}[cups?]
>=gnome-base/gnome-control-center-${PV}[cups?]
@@ -41,7 +44,7 @@ RDEPEND="
>=net-im/empathy-${PV}
>=x11-terms/gnome-terminal-${PV}
- >=gnome-extra/gnome-user-docs-${PV}
+ >=gnome-extra/gnome-user-docs-3.0.0
>=gnome-extra/yelp-${PV}
>=x11-themes/gtk-engines-2.20.2:2
@@ -50,7 +53,7 @@ RDEPEND="
>=x11-themes/gnome-themes-standard-${PV}
bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
- cdr? ( >=app-cdr/brasero-${PV} )
+ cdr? ( >=app-cdr/brasero-3.0.0 )
"
DEPEND=""
S=${WORKDIR}
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.1.0.ebuild
similarity index 81%
rename from gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
rename to gnome-base/gnome-core-libs/gnome-core-libs-3.1.0.ebuild
index 0abc9f5..d852491 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.1.0.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
-IUSE="cups"
+IUSE="cups python"
# when unmasking for an arch
# double check none of the deps are still masked !
@@ -17,11 +17,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-l
# Note to developers:
# This is a wrapper for the core libraries used by GNOME 3
RDEPEND="
- >=dev-libs/glib-2.28.4:2
+ >=dev-libs/glib-2.29.14:2
>=x11-libs/gdk-pixbuf-2.23.2:2
>=x11-libs/pango-1.28.3
- >=media-libs/clutter-1.6.10:1.0
- >=x11-libs/gtk+-3.0.8:3[cups?]
+ >=media-libs/clutter-1.7.5:1.0
+ >=x11-libs/gtk+-3.1.12:3[cups?]
>=dev-libs/atk-1.33.6
>=x11-libs/libwnck-${PV}:3
>=gnome-base/librsvg-2.32.1[gtk]
@@ -29,12 +29,16 @@ RDEPEND="
>=gnome-base/libgnomekbd-${PV}
>=x11-libs/startup-notification-0.10
- >=gnome-base/gvfs-1.8
+ >=gnome-base/gvfs-1.9
>=gnome-base/dconf-0.7.3
>=media-libs/gstreamer-0.10.32:0.10
>=media-libs/gst-plugins-base-0.10.32:0.10
>=media-libs/gst-plugins-good-0.10.23:0.10
+
+ python? (
+ >=dev-python/pygobject-2.28.6-r50:2
+ >=dev-python/pygobject-2.90.2:3 )
"
DEPEND=""
S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.1.0.ebuild
similarity index 85%
rename from gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
rename to gnome-base/gnome-extra-apps/gnome-extra-apps-3.1.0.ebuild
index 333015f..dcd8f6d 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.1.0.ebuild
@@ -21,21 +21,22 @@ RDEPEND="
>=gnome-base/gnome-core-libs-${PV}
>=app-arch/file-roller-${PV}
+ >=games-board/aisleriot-${PV}
>=gnome-extra/bug-buddy-2.32.0:2
>=gnome-extra/gcalctool-6.0.0
- >=gnome-extra/gconf-editor-${PV}
+ >=gnome-extra/gconf-editor-3.0.0
>=gnome-extra/gnome-games-${PV}
>=gnome-extra/gnome-system-monitor-${PV}
>=gnome-extra/gnome-tweak-tool-${PV}
>=gnome-extra/gnome-utils-${PV}
- >=gnome-extra/gucharmap-${PV}:2.90
+ >=gnome-extra/gucharmap-3.0.0:2.90
>=mail-client/evolution-${PV}
>=media-sound/sound-juicer-2.99
- >=media-video/cheese-${PV}
- >=net-analyzer/gnome-nettool-${PV}
+ >=media-video/cheese-3.0.0
+ >=net-analyzer/gnome-nettool-3.0.0
>=net-misc/vinagre-${PV}
>=net-misc/vino-${PV}
- >=www-client/epiphany-${PV}
+ >=www-client/epiphany-3.0.0
"
# Re-add when it stops using outdated libraries like gnome-vfs
#>=media-gfx/shotwell-0.8.1
diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.1.0.ebuild
similarity index 100%
rename from gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
rename to gnome-base/gnome-fallback/gnome-fallback-3.1.0.ebuild
diff --git a/gnome-base/gnome-light/gnome-light-3.0.0.ebuild b/gnome-base/gnome-light/gnome-light-3.1.0.ebuild
similarity index 100%
rename from gnome-base/gnome-light/gnome-light-3.0.0.ebuild
rename to gnome-base/gnome-light/gnome-light-3.1.0.ebuild
diff --git a/gnome-base/gnome/gnome-3.0.0.ebuild b/gnome-base/gnome/gnome-3.1.0.ebuild
similarity index 96%
rename from gnome-base/gnome/gnome-3.0.0.ebuild
rename to gnome-base/gnome/gnome-3.1.0.ebuild
index 1af9d22..d205036 100644
--- a/gnome-base/gnome/gnome-3.0.0.ebuild
+++ b/gnome-base/gnome/gnome-3.1.0.ebuild
@@ -24,19 +24,19 @@ RDEPEND="
>=gnome-base/gnome-core-libs-${PV}[cups?]
>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth,cdr?]
- >=gnome-base/gdm-${PV}
+ >=gnome-base/gdm-3.0.0
>=x11-wm/mutter-${PV}
>=gnome-base/gnome-shell-${PV}
>=x11-themes/gnome-backgrounds-${PV}
- >=x11-themes/gnome-icon-theme-extras-${PV}
+ >=x11-themes/gnome-icon-theme-extras-3.0.0
x11-themes/sound-theme-freedesktop
extras? ( >=gnome-base/gnome-extra-apps-${PV} )
fallback? ( >=gnome-base/gnome-fallback-${PV} )"
DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.8.0[gdu]"
+PDEPEND=">=gnome-base/gvfs-1.9.0[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.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-28 6:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-28 6:13 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome/, gnome-base/gnome-extra-apps/, gnome-base/gnome-light/, Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-08-21 7:10 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox