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 <gentoo-commits+bounces-357989-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QbPEf-0002CG-FK
for garchives@archives.gentoo.org; Tue, 28 Jun 2011 03:45:13 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 700401C0FF;
Tue, 28 Jun 2011 03:44:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 304BE1C0FF
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 03:44:55 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 639CE1B4046
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 03:44:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id B76288003E
for <gentoo-commits@lists.gentoo.org>; Tue, 28 Jun 2011 03:44:53 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <27c99d81fd83f8de48114b4625d25369d567c9ce.tetromino@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-9999.ebuild
X-VCS-Directories: gnome-base/gnome-settings-daemon/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Restovtsev
X-VCS-Revision: 27c99d81fd83f8de48114b4625d25369d567c9ce
Date: Tue, 28 Jun 2011 03:44:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: ddfbecf6d0af206cad298624916c3d92
commit: 27c99d81fd83f8de48114b4625d25369d567c9ce
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 03:39:17 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jun 28 03:42:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D27c99d81
gnome-base/gnome-settings-daemon: update live ebuild
Update the live ebuild with new dependencies, correctly set the pnp.ids
path (requires the previous commit for gnome-desktop:3 that installs
pnp.ids properly!), add a blocker on <gnome-color-manager-3.1.1 (file
collisions), and apply the touchpad timeout fix.
---
.../gnome-settings-daemon-9999.ebuild | 28 ++++++++++++++=
++---
1 files changed, 23 insertions(+), 5 deletions(-)
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 54403af..3f54d72 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=3D"3"
GCONF_DEBUG=3D"no"
GNOME2_LA_PUNT=3D"yes"
=20
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} =3D 9999 ]]; then
inherit gnome2-live
fi
@@ -21,27 +21,32 @@ if [[ ${PV} =3D 9999 ]]; then
else
KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f=
bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-IUSE=3D"+cups debug packagekit policykit smartcard +udev"
+IUSE=3D"+cups debug packagekit policykit short-touchpad-timeout smartcar=
d +udev"
=20
# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
COMMON_DEPEND=3D">=3Ddev-libs/dbus-glib-0.74
>=3Ddev-libs/glib-2.26.0:2
>=3Dx11-libs/gtk+-2.99.3:3
>=3Dgnome-base/gconf-2.6.1:2
>=3Dgnome-base/libgnomekbd-2.91.1
- >=3Dgnome-base/gnome-desktop-2.91.5:3
+ >=3Dgnome-base/gnome-desktop-3.1.2:3
>=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1
media-fonts/cantarell
media-libs/fontconfig
-
- >=3Dx11-libs/libnotify-0.6.1
+ >=3Dmedia-libs/lcms-2.2:2
+ >=3Dx11-libs/libnotify-0.7.3
x11-libs/libXi
x11-libs/libXext
+ x11-libs/libXfixes
x11-libs/libXxf86misc
>=3Dx11-libs/libxklavier-5.0
+ >=3Dx11-misc/colord-0.1.9
>=3Dmedia-sound/pulseaudio-0.9.16
media-libs/libcanberra[gtk3]
=20
+ !<gnome-extra/gnome-color-manager-3.1.1
+
cups? ( >=3Dnet-print/cups-1.4[dbus] )
packagekit? (
dev-libs/glib:2
@@ -68,6 +73,8 @@ DEPEND=3D"${COMMON_DEPEND}
>=3Ddev-util/intltool-0.40
>=3Ddev-util/pkgconfig-0.19
x11-proto/inputproto
+ x11-proto/kbproto
+ x11-proto/xf86miscproto
x11-proto/xproto"
=20
pkg_setup() {
@@ -77,6 +84,7 @@ pkg_setup() {
--disable-static
--disable-schemas-compile
--enable-gconf-bridge
+ --with-pnpids=3D${EROOT}usr/share/libgnome-desktop-3.0/pnp.ids
$(use_enable cups)
$(use_enable debug)
$(use_enable debug more-warnings)
@@ -86,6 +94,16 @@ pkg_setup() {
$(use_enable udev gudev)"
}
=20
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=3D621836
+ # Apparently this change severely affects touchpad usability for some
+ # people, so revert it if USE=3Dshort-touchpad-timeout.
+ # Revisit if/when upstream adds a setting for customizing the timeout.
+ use short-touchpad-timeout &&
+ epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
+
+ gnome2_src_prepare
+}
=20
src_install() {
gnome2_src_install