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 1PxHhH-0003DO-Tv for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:36:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9ECEE0654; Wed, 9 Mar 2011 11:34:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 96749E0656 for ; Wed, 9 Mar 2011 11:34:43 +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 D91552AC029 for ; Wed, 9 Mar 2011 11:34:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3E75680074 for ; Wed, 9 Mar 2011 11:34:42 +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: <97a27b5e9015c6753d97760544084338d6438147.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.90.ebuild gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.91.ebuild gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 97a27b5e9015c6753d97760544084338d6438147 Date: Wed, 9 Mar 2011 11:34:42 +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: 25772880e651176ef26d5dd5fabb675d commit: 97a27b5e9015c6753d97760544084338d6438147 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 8 17:57:16 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 9 11:21:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D97a27b5e gnome-base/gnome-settings-daemon: 2.91.90 =E2=86=92 2.91.91 --- ...ebuild =3D> gnome-settings-daemon-2.91.91.ebuild} | 46 +++---------= -------- .../gnome-settings-daemon-9999.ebuild | 2 +- 2 files changed, 7 insertions(+), 41 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.= 90.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9= 1.ebuild similarity index 63% rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9= 0.ebuild rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.91.= ebuild index c0ca0d7..787195c 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.90.ebui= ld +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.91.ebui= ld @@ -17,7 +17,7 @@ HOMEPAGE=3D"http://www.gnome.org" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"debug +udev packagekit policykit smartcard" +IUSE=3D"+cups debug +udev packagekit policykit smartcard" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -25,17 +25,16 @@ 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: cups is optional, but automagic +# Latest gsettings-desktop-schemas is needed due to commit e8d1de92 COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 >=3Ddev-libs/glib-2.26.0 >=3Dx11-libs/gtk+-2.99.3 >=3Dgnome-base/gconf-2.6.1 >=3Dgnome-base/libgnomekbd-2.91.1 >=3Dgnome-base/gnome-desktop-2.91.5:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.2 + >=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig - >=3Dnet-print/cups-1.4 =20 >=3Dx11-libs/libnotify-0.6.1 x11-libs/libXi @@ -45,6 +44,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 >=3Dmedia-sound/pulseaudio-0.9.16 media-libs/libcanberra[gtk3] =20 + cups? ( >=3Dnet-print/cups-1.4[dbus] ) packagekit? ( dev-libs/glib:2 sys-fs/udev[extras] @@ -55,9 +55,6 @@ COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 >=3Dsys-apps/dbus-1.1.2 ) smartcard? ( >=3Ddev-libs/nss-3.11.2 ) udev? ( sys-fs/udev[extras] )" -# !pulseaudio? ( -# >=3Dmedia-libs/gstreamer-0.10.1.2 -# >=3Dmedia-libs/gst-plugins-base-0.10.1.2 )" # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly RDEPEND=3D"${COMMON_DEPEND} >=3Dx11-themes/gnome-themes-standard-2.91 @@ -78,37 +75,15 @@ pkg_setup() { --disable-static --disable-schemas-compile --enable-gconf-bridge + $(use_enable cups) $(use_enable debug) + $(use_enable debug more-warnings) $(use_enable packagekit) $(use_enable policykit polkit) $(use_enable smartcard smartcard-support) $(use_enable udev gudev)" - #$(use_enable pulseaudio pulse) - #$(use_enable !pulseaudio gstreamer) - -# if use pulseaudio; then -# elog "Building volume media keys using Pulseaudio" -# else -# elog "Building volume media keys using GStreamer" -# fi } =20 -#src_prepare() { - # Restore gstreamer volume control support, upstream bug #571145 - # Keep using old patch as it doesn't cause problems like bug #339732 - #epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch" - #echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/P= OTFILES.in - - # NOTE: No point having a gst vol control. PA is a hard dep of GNOME 3. - #epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch" -# -# if [[ ${PV} !=3D 9999 ]]; then -# intltoolize --force --copy --automake || die "intltoolize failed" -# eautoreconf -# fi -# -# gnome2_src_prepare -#} =20 src_install() { gnome2_src_install @@ -116,12 +91,3 @@ src_install() { echo 'GSETTINGS_BACKEND=3D"dconf"' >> 51gsettings-dconf doenvd 51gsettings-dconf || die "doenvd failed" } - -#pkg_postinst() { -# gnome2_pkg_postinst -# -# if ! use pulseaudio; then -# elog "GStreamer volume control support is a feature powered by Gentoo= GNOME Team" -# elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gent= oo.org instead" -# fi -#} diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.= ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebui= ld index 36661d2..787195c 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -44,7 +44,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74 >=3Dmedia-sound/pulseaudio-0.9.16 media-libs/libcanberra[gtk3] =20 - cups? ( >=3Dnet-print/cups-1.4 ) + cups? ( >=3Dnet-print/cups-1.4[dbus] ) packagekit? ( dev-libs/glib:2 sys-fs/udev[extras]