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 1PryAa-0003pY-Q2 for garchives@archives.gentoo.org; Tue, 22 Feb 2011 19:45:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CD3A1C05F; Tue, 22 Feb 2011 19:44:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BE13B1C05C for ; Tue, 22 Feb 2011 19:44:34 +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 3D2FA1B4156 for ; Tue, 22 Feb 2011 19:44:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9DB428006E for ; Tue, 22 Feb 2011 19:44:33 +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: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: ac94b3546890eb017785fec98b551204c5a5a48c Date: Tue, 22 Feb 2011 19:44:33 +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: 9ff6d450768a328e3ec5eafdf089b321 commit: ac94b3546890eb017785fec98b551204c5a5a48c Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Feb 22 19:10:03 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Feb 22 19:32:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dac94b354 gnome-base/gnome-control-center: 2.91.7 -> 2.91.90 * Lots and lots of plugin updates and bugfixes --- ....ebuild =3D> gnome-control-center-2.91.90.ebuild} | 29 ++++++++----= ------ .../gnome-control-center-9999.ebuild | 30 +++++++++++---= ----- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-= r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.= ebuild similarity index 81% rename from gnome-base/gnome-control-center/gnome-control-center-2.91.6-r= 1.ebuild rename to gnome-base/gnome-control-center/gnome-control-center-2.91.90.eb= uild index c867504..1b08877 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebui= ld +++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild @@ -6,14 +6,14 @@ EAPI=3D"3" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit eutils gnome2 +inherit gnome2 =20 -DESCRIPTION=3D"The gnome2 Desktop configuration tool" +DESCRIPTION=3D"GNOME Desktop Configuration Tool" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"2" -IUSE=3D"doc" +IUSE=3D"doc +networkmanager +socialweb" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -21,9 +21,7 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi =20 -# TODO: appindicator # WTF: pulseaudio is compulsary now for gnome-volume-control -# XXX: libXft is checked for, but not used anywhere? # FIXME: Cheese is optional, but automagic =3D> force-enabled for now # FIXME: Cups is optional, but automagic =3D> force-enabled for now # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb @@ -33,11 +31,11 @@ COMMON_DEPEND=3D" >=3Ddev-libs/glib-2.25.11 >=3Dx11-libs/gdk-pixbuf-2.23.0 >=3Dx11-libs/gtk+-2.91.6:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.3 + >=3Dgnome-base/gsettings-desktop-schemas-0.1.7 >=3Dgnome-base/gconf-2.0 >=3Ddev-libs/dbus-glib-0.73 >=3Dgnome-base/gnome-desktop-2.91.5:3 - >=3Dgnome-base/gnome-settings-daemon-2.91.2 + >=3Dgnome-base/gnome-settings-daemon-2.91.9 >=3Dgnome-base/libgnomekbd-2.91.2 =20 app-text/iso-codes @@ -46,21 +44,23 @@ COMMON_DEPEND=3D" gnome-base/libgtop:2 media-libs/fontconfig media-libs/gstreamer:0.10 - net-print/cups =20 >=3Dmedia-libs/libcanberra-0.13[gtk3] >=3Dmedia-sound/pulseaudio-0.9.16 >=3Dmedia-video/cheese-2.29.90 + >=3Dnet-print/cups-1.4 >=3Dsys-auth/polkit-0.97 >=3Dsys-power/upower-0.9.1 =20 x11-apps/xmodmap x11-libs/libX11 - x11-libs/libXft x11-libs/libXxf86misc - >=3Dx11-libs/libxklavier-4.0 + >=3Dx11-libs/libxklavier-5.1 >=3Dx11-libs/libXi-1.2 =20 + networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 ) + socialweb? ( net-libs/libsocialweb ) + !!gnome-extra/gnome-media[pulseaudio] !!=3Dsys-devel/gettext-0.17 - >=3Ddev-util/intltool-0.40 + >=3Ddev-util/intltool-0.40.1 >=3Ddev-util/pkgconfig-0.19 =20 app-text/scrollkeeper @@ -83,13 +83,10 @@ DEPEND=3D"${COMMON_DEPEND} # gnome-base/gnome-common =20 src_prepare() { - # TODO: libsocialweb G2CONF=3D"${G2CONF} --disable-update-mimedb --disable-static - --disable-schemas-install" + --disable-schemas-install + $(use_with socialweb libsocialweb)" DOCS=3D"AUTHORS ChangeLog NEWS README TODO" - - # Taken from upstream, remove for next release, bug 353684 - epatch "${FILESDIR}/${P}-port-to-gtkstyle-context.patch" } diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.eb= uild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index 82fd020..1b08877 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild @@ -8,12 +8,12 @@ GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dl= open =20 inherit gnome2 =20 -DESCRIPTION=3D"The gnome2 Desktop configuration tool" +DESCRIPTION=3D"GNOME Desktop Configuration Tool" HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"2" -IUSE=3D"doc" +IUSE=3D"doc +networkmanager +socialweb" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -21,21 +21,21 @@ else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi =20 -# TODO: appindicator # WTF: pulseaudio is compulsary now for gnome-volume-control -# XXX: libXft is checked for, but not used anywhere? # FIXME: Cheese is optional, but automagic =3D> force-enabled for now # FIXME: Cups is optional, but automagic =3D> force-enabled for now # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb +# +# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run a= t login COMMON_DEPEND=3D" >=3Ddev-libs/glib-2.25.11 >=3Dx11-libs/gdk-pixbuf-2.23.0 >=3Dx11-libs/gtk+-2.91.6:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.3 + >=3Dgnome-base/gsettings-desktop-schemas-0.1.7 >=3Dgnome-base/gconf-2.0 >=3Ddev-libs/dbus-glib-0.73 >=3Dgnome-base/gnome-desktop-2.91.5:3 - >=3Dgnome-base/gnome-settings-daemon-2.91.2 + >=3Dgnome-base/gnome-settings-daemon-2.91.9 >=3Dgnome-base/libgnomekbd-2.91.2 =20 app-text/iso-codes @@ -44,32 +44,36 @@ COMMON_DEPEND=3D" gnome-base/libgtop:2 media-libs/fontconfig media-libs/gstreamer:0.10 - net-print/cups =20 >=3Dmedia-libs/libcanberra-0.13[gtk3] >=3Dmedia-sound/pulseaudio-0.9.16 >=3Dmedia-video/cheese-2.29.90 + >=3Dnet-print/cups-1.4 >=3Dsys-auth/polkit-0.97 >=3Dsys-power/upower-0.9.1 =20 x11-apps/xmodmap x11-libs/libX11 - x11-libs/libXft x11-libs/libXxf86misc - >=3Dx11-libs/libxklavier-4.0 + >=3Dx11-libs/libxklavier-5.1 >=3Dx11-libs/libXi-1.2 =20 + networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 ) + socialweb? ( net-libs/libsocialweb ) + !!gnome-extra/gnome-media[pulseaudio] !!=3Dgnome-base/gnome-session-2.91.6-r1" DEPEND=3D"${COMMON_DEPEND} x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto =20 >=3Dsys-devel/gettext-0.17 - >=3Ddev-util/intltool-0.40 + >=3Ddev-util/intltool-0.40.1 >=3Ddev-util/pkgconfig-0.19 =20 app-text/scrollkeeper @@ -78,11 +82,11 @@ DEPEND=3D"${COMMON_DEPEND} # Needed for autoreconf # gnome-base/gnome-common =20 -pkg_setup() { - # TODO: libsocialweb +src_prepare() { G2CONF=3D"${G2CONF} --disable-update-mimedb --disable-static - --disable-schemas-install" + --disable-schemas-install + $(use_with socialweb libsocialweb)" DOCS=3D"AUTHORS ChangeLog NEWS README TODO" }