Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/
Date: Tue, 22 Feb 2011 00:31:48
Message-Id: 6d150cf32d8730318e80bb9060f582b62688a98b.nirbheek@gentoo
1 commit: 6d150cf32d8730318e80bb9060f582b62688a98b
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 22 00:07:57 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 22 00:07:57 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6d150cf3
7
8 gnome-base/gnome-settings-daemon: 2.91.9 -> 2.91.90
9
10 * New packagekit plugin, gudev support
11
12 ---
13 ...ebuild => gnome-settings-daemon-2.91.90.ebuild} | 17 ++++++++++++-----
14 .../gnome-settings-daemon-9999.ebuild | 17 ++++++++++++-----
15 2 files changed, 24 insertions(+), 10 deletions(-)
16
17 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.90.ebuild
18 similarity index 89%
19 rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
20 rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.90.ebuild
21 index e2fe6bb..a5e8fd8 100644
22 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
23 +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.90.ebuild
24 @@ -6,7 +6,7 @@ EAPI="3"
25 GCONF_DEBUG="yes"
26 GNOME2_LA_PUNT="yes"
27
28 -inherit autotools eutils gnome2
29 +inherit gnome2
30
31 DESCRIPTION="Gnome Settings Daemon"
32 HOMEPAGE="http://www.gnome.org"
33 @@ -17,7 +17,7 @@ HOMEPAGE="http://www.gnome.org"
34
35 LICENSE="GPL-2"
36 SLOT="0"
37 -IUSE="debug policykit smartcard"
38 +IUSE="debug +udev packagekit policykit smartcard"
39 if [[ ${PV} = 9999 ]]; then
40 inherit gnome2-live
41 KEYWORDS=""
42 @@ -25,7 +25,7 @@ else
43 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
44 fi
45
46 -# Cups-1.4 is needed due to bug 353724
47 +# TODO: cups is optional, but automagic
48 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
49 >=dev-libs/glib-2.26.0
50 >=x11-libs/gtk+-2.99.3
51 @@ -45,10 +45,15 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
52 >=media-sound/pulseaudio-0.9.16
53 media-libs/libcanberra[gtk3]
54
55 + packagekit? (
56 + dev-libs/glib:2
57 + >=app-portage/packagekit-0.6.4
58 + >=sys-power/upower-0.9.1 )
59 policykit? (
60 >=sys-auth/polkit-0.97
61 >=sys-apps/dbus-1.1.2 )
62 - smartcard? ( >=dev-libs/nss-3.11.2 )"
63 + smartcard? ( >=dev-libs/nss-3.11.2 )
64 + udev? ( sys-fs/udev[extras] )"
65 # !pulseaudio? (
66 # >=media-libs/gstreamer-0.10.1.2
67 # >=media-libs/gst-plugins-base-0.10.1.2 )"
68 @@ -73,8 +78,10 @@ pkg_setup() {
69 --disable-schemas-compile
70 --enable-gconf-bridge
71 $(use_enable debug)
72 + $(use_enable packagekit)
73 $(use_enable policykit polkit)
74 - $(use_enable smartcard smartcard-support)"
75 + $(use_enable smartcard smartcard-support)
76 + $(use_enable udev gudev)"
77 #$(use_enable pulseaudio pulse)
78 #$(use_enable !pulseaudio gstreamer)
79
80
81 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
82 index e2fe6bb..a5e8fd8 100644
83 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
84 +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
85 @@ -6,7 +6,7 @@ EAPI="3"
86 GCONF_DEBUG="yes"
87 GNOME2_LA_PUNT="yes"
88
89 -inherit autotools eutils gnome2
90 +inherit gnome2
91
92 DESCRIPTION="Gnome Settings Daemon"
93 HOMEPAGE="http://www.gnome.org"
94 @@ -17,7 +17,7 @@ HOMEPAGE="http://www.gnome.org"
95
96 LICENSE="GPL-2"
97 SLOT="0"
98 -IUSE="debug policykit smartcard"
99 +IUSE="debug +udev packagekit policykit smartcard"
100 if [[ ${PV} = 9999 ]]; then
101 inherit gnome2-live
102 KEYWORDS=""
103 @@ -25,7 +25,7 @@ else
104 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
105 fi
106
107 -# Cups-1.4 is needed due to bug 353724
108 +# TODO: cups is optional, but automagic
109 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
110 >=dev-libs/glib-2.26.0
111 >=x11-libs/gtk+-2.99.3
112 @@ -45,10 +45,15 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
113 >=media-sound/pulseaudio-0.9.16
114 media-libs/libcanberra[gtk3]
115
116 + packagekit? (
117 + dev-libs/glib:2
118 + >=app-portage/packagekit-0.6.4
119 + >=sys-power/upower-0.9.1 )
120 policykit? (
121 >=sys-auth/polkit-0.97
122 >=sys-apps/dbus-1.1.2 )
123 - smartcard? ( >=dev-libs/nss-3.11.2 )"
124 + smartcard? ( >=dev-libs/nss-3.11.2 )
125 + udev? ( sys-fs/udev[extras] )"
126 # !pulseaudio? (
127 # >=media-libs/gstreamer-0.10.1.2
128 # >=media-libs/gst-plugins-base-0.10.1.2 )"
129 @@ -73,8 +78,10 @@ pkg_setup() {
130 --disable-schemas-compile
131 --enable-gconf-bridge
132 $(use_enable debug)
133 + $(use_enable packagekit)
134 $(use_enable policykit polkit)
135 - $(use_enable smartcard smartcard-support)"
136 + $(use_enable smartcard smartcard-support)
137 + $(use_enable udev gudev)"
138 #$(use_enable pulseaudio pulse)
139 #$(use_enable !pulseaudio gstreamer)
Report Message
Find on MARC Find on Google Groups