From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PxHhS-0003He-QM for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:37:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9011DE0504; Wed, 9 Mar 2011 11:34:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4B1E4E0504 for ; Wed, 9 Mar 2011 11:34:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5AE11B4266 for ; Wed, 9 Mar 2011 11:34:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C11E88007B for ; Wed, 9 Mar 2011 11:34:37 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <9bbb81dd75108994c3bc7cf1ab9fa917c4460870.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-panel/gnome-panel-2.91.90.ebuild gnome-base/gnome-panel/gnome-panel-2.91.91.ebuild gnome-base/gnome-panel/gnome-panel-9999.ebuild X-VCS-Directories: gnome-base/gnome-panel/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 9bbb81dd75108994c3bc7cf1ab9fa917c4460870 Date: Wed, 9 Mar 2011 11:34:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9dba2924182f9c9f536865519825b068 commit: 9bbb81dd75108994c3bc7cf1ab9fa917c4460870 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 8 13:12:43 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 9 10:12:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D9bbb81dd gnome-base/gnome-panel: 2.91.90 =E2=86=92 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 =3D> 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-ba= se/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=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 FDL-1.1 LGPL-2" SLOT=3D"0" -# Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?i= d=3D631553 -#KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" IUSE=3D"+bonobo doc eds +introspection networkmanager" +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live + KEYWORDS=3D"" +else + # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?= id=3D631553 + KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +fi =20 RDEPEND=3D">=3Dgnome-base/gnome-desktop-2.91:3 >=3Dx11-libs/pango-1.15.4[introspection?] >=3Ddev-libs/glib-2.25.12:2 - >=3Dx11-libs/gtk+-2.99:3[introspection?] - x11-libs/gdk-pixbuf + >=3Dx11-libs/gtk+-3.0:3[introspection?] + x11-libs/gdk-pixbuf:2 >=3Ddev-libs/libgweather-2.91:3 - dev-libs/libxml2 - >=3Dgnome-base/gconf-2.6.1[introspection?] - >=3Dmedia-libs/libcanberra-0.23[gtk3] + dev-libs/libxml2:2 + >=3Dgnome-base/gconf-2.6.1:2[introspection?] >=3Dgnome-base/gnome-menus-2.27.92 gnome-base/librsvg >=3Ddev-libs/dbus-glib-0.80 @@ -33,8 +37,8 @@ RDEPEND=3D">=3Dgnome-base/gnome-desktop-2.91:3 >=3Dx11-libs/cairo-1 x11-libs/libXau >=3Dx11-libs/libXrandr-1.2 + >=3Dx11-libs/libwnck-2.91:3 =20 - >=3Dx11-libs/libwnck-2.91 eds? ( >=3Dgnome-extra/evolution-data-server-2.91.2 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) networkmanager? ( >=3Dnet-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} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" else + # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?= id=3D631553 KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" fi =20 RDEPEND=3D">=3Dgnome-base/gnome-desktop-2.91:3 >=3Dx11-libs/pango-1.15.4[introspection?] >=3Ddev-libs/glib-2.25.12:2 - >=3Dx11-libs/gtk+-2.99:3[introspection?] - x11-libs/gdk-pixbuf + >=3Dx11-libs/gtk+-3.0:3[introspection?] + x11-libs/gdk-pixbuf:2 >=3Ddev-libs/libgweather-2.91:3 - dev-libs/libxml2 - >=3Dgnome-base/gconf-2.6.1[introspection?] + dev-libs/libxml2:2 + >=3Dgnome-base/gconf-2.6.1:2[introspection?] >=3Dgnome-base/gnome-menus-2.27.92 gnome-base/librsvg >=3Ddev-libs/dbus-glib-0.80 @@ -36,8 +37,8 @@ RDEPEND=3D">=3Dgnome-base/gnome-desktop-2.91:3 >=3Dx11-libs/cairo-1 x11-libs/libXau >=3Dx11-libs/libXrandr-1.2 + >=3Dx11-libs/libwnck-2.91:3 =20 - >=3Dx11-libs/libwnck-2.91 eds? ( >=3Dgnome-extra/evolution-data-server-2.91.2 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.6.7 )"