From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/
Date: Wed, 9 Mar 2011 11:34:37 +0000 (UTC) [thread overview]
Message-ID: <9bbb81dd75108994c3bc7cf1ab9fa917c4460870.nirbheek@gentoo> (raw)
commit: 9bbb81dd75108994c3bc7cf1ab9fa917c4460870
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 8 13:12:43 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 10:12:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9bbb81dd
gnome-base/gnome-panel: 2.91.90 → 2.91.91
* Re-add keywords, but don't remove the old version
* There are still regressions and migration issues with this version, so you
might want to stick with 2.91.6, if possible
---
...l-2.91.90.ebuild => gnome-panel-2.91.91.ebuild} | 20 ++++++++++++--------
gnome-base/gnome-panel/gnome-panel-9999.ebuild | 11 ++++++-----
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/gnome-base/gnome-panel/gnome-panel-2.91.90.ebuild b/gnome-base/gnome-panel/gnome-panel-2.91.91.ebuild
similarity index 85%
rename from gnome-base/gnome-panel/gnome-panel-2.91.90.ebuild
rename to gnome-base/gnome-panel/gnome-panel-2.91.91.ebuild
index d67bc7d..b1e8170 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.91.90.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.91.91.ebuild
@@ -13,19 +13,23 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-# Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
-#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+bonobo doc eds +introspection networkmanager"
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+ KEYWORDS=""
+else
+ # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+fi
RDEPEND=">=gnome-base/gnome-desktop-2.91:3
>=x11-libs/pango-1.15.4[introspection?]
>=dev-libs/glib-2.25.12:2
- >=x11-libs/gtk+-2.99:3[introspection?]
- x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-3.0:3[introspection?]
+ x11-libs/gdk-pixbuf:2
>=dev-libs/libgweather-2.91:3
- dev-libs/libxml2
- >=gnome-base/gconf-2.6.1[introspection?]
- >=media-libs/libcanberra-0.23[gtk3]
+ dev-libs/libxml2:2
+ >=gnome-base/gconf-2.6.1:2[introspection?]
>=gnome-base/gnome-menus-2.27.92
gnome-base/librsvg
>=dev-libs/dbus-glib-0.80
@@ -33,8 +37,8 @@ RDEPEND=">=gnome-base/gnome-desktop-2.91:3
>=x11-libs/cairo-1
x11-libs/libXau
>=x11-libs/libXrandr-1.2
+ >=x11-libs/libwnck-2.91:3
- >=x11-libs/libwnck-2.91
eds? ( >=gnome-extra/evolution-data-server-2.91.2 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
diff --git a/gnome-base/gnome-panel/gnome-panel-9999.ebuild b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
index 0732047..b1e8170 100644
--- a/gnome-base/gnome-panel/gnome-panel-9999.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
@@ -18,17 +18,18 @@ if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
else
+ # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
fi
RDEPEND=">=gnome-base/gnome-desktop-2.91:3
>=x11-libs/pango-1.15.4[introspection?]
>=dev-libs/glib-2.25.12:2
- >=x11-libs/gtk+-2.99:3[introspection?]
- x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-3.0:3[introspection?]
+ x11-libs/gdk-pixbuf:2
>=dev-libs/libgweather-2.91:3
- dev-libs/libxml2
- >=gnome-base/gconf-2.6.1[introspection?]
+ dev-libs/libxml2:2
+ >=gnome-base/gconf-2.6.1:2[introspection?]
>=gnome-base/gnome-menus-2.27.92
gnome-base/librsvg
>=dev-libs/dbus-glib-0.80
@@ -36,8 +37,8 @@ RDEPEND=">=gnome-base/gnome-desktop-2.91:3
>=x11-libs/cairo-1
x11-libs/libXau
>=x11-libs/libXrandr-1.2
+ >=x11-libs/libwnck-2.91:3
- >=x11-libs/libwnck-2.91
eds? ( >=gnome-extra/evolution-data-server-2.91.2 )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
next reply other threads:[~2011-03-09 11:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-09 11:34 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-25 22:44 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/ Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2012-12-24 14:47 Gilles Dartiguelongue
2012-11-22 23:04 Gilles Dartiguelongue
2012-10-16 3:01 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-09-10 10:43 Priit Laes
2012-09-08 8:43 Nirbheek Chauhan
2012-08-18 10:40 Priit Laes
2012-05-24 9:11 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
2011-05-30 18:39 Nirbheek Chauhan
2011-05-19 12:33 Gilles Dartiguelongue
2011-04-19 6:52 Gilles Dartiguelongue
2011-04-06 12:14 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-04-01 14:48 Nirbheek Chauhan
2011-03-29 8:36 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-04 14:57 Nirbheek Chauhan
2011-02-27 3:02 Jonathan Callen
2011-02-23 14:40 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9bbb81dd75108994c3bc7cf1ab9fa917c4460870.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox