Gentoo Archives: gentoo-commits

From: Alexandre Rostovtsev <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/
Date: Sun, 30 Sep 2012 00:16:25
Message-Id: 1348960726.543cae884d816b6ae45792b66518269788f4c2dc.tetromino@gentoo
1 commit: 543cae884d816b6ae45792b66518269788f4c2dc
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 29 23:14:50 2012 +0000
4 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 29 23:18:46 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=543cae88
7
8 gnome-base/gnome-control-center: 3.5.92 → 3.6.0
9
10 Update license, add xsltproc dep, punt unneded apg dep.
11
12 ---
13 ...92.ebuild => gnome-control-center-3.6.0.ebuild} | 18 +++++++++---------
14 .../gnome-control-center-9999.ebuild | 18 +++++++++---------
15 2 files changed, 18 insertions(+), 18 deletions(-)
16
17 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
18 similarity index 97%
19 rename from gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
20 rename to gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
21 index 53be9cb..7e55ae0 100644
22 --- a/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
23 +++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.0.ebuild
24 @@ -14,7 +14,7 @@ fi
25 DESCRIPTION="GNOME Desktop Configuration Tool"
26 HOMEPAGE="http://www.gnome.org/"
27
28 -LICENSE="GPL-2"
29 +LICENSE="GPL-2+"
30 SLOT="2"
31 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
32 if [[ ${PV} = 9999 ]]; then
33 @@ -33,7 +33,7 @@ COMMON_DEPEND="
34 >=x11-libs/gtk+-3.5.13:3
35 >=gnome-base/gsettings-desktop-schemas-3.5.91
36 >=gnome-base/gnome-desktop-3.5.91:3
37 - >=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
38 + >=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
39 >=gnome-base/libgnomekbd-2.91.91
40
41 app-text/iso-codes
42 @@ -55,10 +55,6 @@ COMMON_DEPEND="
43 >=x11-libs/libXi-1.2
44
45 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
46 - v4l? (
47 - media-libs/gstreamer:1.0
48 - media-libs/clutter-gtk:1.0
49 - >=media-video/cheese-3.5.91 )
50 colord? ( >=x11-misc/colord-0.1.8 )
51 cups? ( >=net-print/cups-1.4[dbus] )
52 gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
53 @@ -69,11 +65,14 @@ COMMON_DEPEND="
54 >=net-misc/networkmanager-0.8.997 )
55 socialweb? ( net-libs/libsocialweb )
56 systemd? ( >=sys-apps/systemd-31 )
57 + v4l? (
58 + media-libs/gstreamer:1.0
59 + media-libs/clutter-gtk:1.0
60 + >=media-video/cheese-3.5.91 )
61 wacom? ( >=dev-libs/libwacom-0.6
62 >=x11-libs/libXi-1.2 )"
63 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
64 RDEPEND="${COMMON_DEPEND}
65 - app-admin/apg
66 sys-apps/accountsservice
67 x11-themes/gnome-icon-theme-symbolic
68 colord? ( >=gnome-extra/gnome-color-manager-3 )
69 @@ -97,10 +96,11 @@ DEPEND="${COMMON_DEPEND}
70 x11-proto/xf86miscproto
71 x11-proto/kbproto
72
73 - >=sys-devel/gettext-0.17
74 + dev-libs/libxml2:2
75 + dev-libs/libxslt
76 >=dev-util/intltool-0.40.1
77 + >=sys-devel/gettext-0.17
78 virtual/pkgconfig
79 - dev-libs/libxml2:2
80
81 cups? ( sys-apps/sed )
82
83
84 diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
85 index 53be9cb..7e55ae0 100644
86 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
87 +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
88 @@ -14,7 +14,7 @@ fi
89 DESCRIPTION="GNOME Desktop Configuration Tool"
90 HOMEPAGE="http://www.gnome.org/"
91
92 -LICENSE="GPL-2"
93 +LICENSE="GPL-2+"
94 SLOT="2"
95 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
96 if [[ ${PV} = 9999 ]]; then
97 @@ -33,7 +33,7 @@ COMMON_DEPEND="
98 >=x11-libs/gtk+-3.5.13:3
99 >=gnome-base/gsettings-desktop-schemas-3.5.91
100 >=gnome-base/gnome-desktop-3.5.91:3
101 - >=gnome-base/gnome-settings-daemon-3.5.90[colord?,policykit]
102 + >=gnome-base/gnome-settings-daemon-3.6.0[colord?,policykit]
103 >=gnome-base/libgnomekbd-2.91.91
104
105 app-text/iso-codes
106 @@ -55,10 +55,6 @@ COMMON_DEPEND="
107 >=x11-libs/libXi-1.2
108
109 bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
110 - v4l? (
111 - media-libs/gstreamer:1.0
112 - media-libs/clutter-gtk:1.0
113 - >=media-video/cheese-3.5.91 )
114 colord? ( >=x11-misc/colord-0.1.8 )
115 cups? ( >=net-print/cups-1.4[dbus] )
116 gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
117 @@ -69,11 +65,14 @@ COMMON_DEPEND="
118 >=net-misc/networkmanager-0.8.997 )
119 socialweb? ( net-libs/libsocialweb )
120 systemd? ( >=sys-apps/systemd-31 )
121 + v4l? (
122 + media-libs/gstreamer:1.0
123 + media-libs/clutter-gtk:1.0
124 + >=media-video/cheese-3.5.91 )
125 wacom? ( >=dev-libs/libwacom-0.6
126 >=x11-libs/libXi-1.2 )"
127 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
128 RDEPEND="${COMMON_DEPEND}
129 - app-admin/apg
130 sys-apps/accountsservice
131 x11-themes/gnome-icon-theme-symbolic
132 colord? ( >=gnome-extra/gnome-color-manager-3 )
133 @@ -97,10 +96,11 @@ DEPEND="${COMMON_DEPEND}
134 x11-proto/xf86miscproto
135 x11-proto/kbproto
136
137 - >=sys-devel/gettext-0.17
138 + dev-libs/libxml2:2
139 + dev-libs/libxslt
140 >=dev-util/intltool-0.40.1
141 + >=sys-devel/gettext-0.17
142 virtual/pkgconfig
143 - dev-libs/libxml2:2
144
145 cups? ( sys-apps/sed )