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-control-center/
Date: Mon, 30 May 2011 18:40:02
Message-Id: d589f6229a410be3465b833d1fa02aacef15ba80.nirbheek@gentoo
1 commit: d589f6229a410be3465b833d1fa02aacef15ba80
2 Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
3 AuthorDate: Fri May 27 02:40:01 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 18:10:08 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d589f622
7
8 gnome-base/gnome-control-center: 3.0.1.1 → 3.0.2
9
10 * Add runtime dependency on cups-pk-helper (new package added in previous
11 patch), without which gnome-control-center cannot add or remove printers.
12 * Fix a typo in LDFLAGS (gnome bug 651162).
13
14 Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
15
16 ---
17 ....1.ebuild => gnome-control-center-3.0.2.ebuild} | 10 ++++++++++
18 .../gnome-control-center-9999.ebuild | 1 +
19 2 files changed, 11 insertions(+), 0 deletions(-)
20
21 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
22 similarity index 90%
23 rename from gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
24 rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
25 index 862790a..4c7c3ac 100644
26 --- a/gnome-base/gnome-control-center/gnome-control-center-3.0.1.1.ebuild
27 +++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
28 @@ -64,6 +64,7 @@ COMMON_DEPEND="
29 socialweb? ( net-libs/libsocialweb )"
30 RDEPEND="${COMMON_DEPEND}
31 sys-apps/accountsservice
32 + cups? ( net-print/cups-pk-helper )
33
34 !gnome-extra/gnome-media[pulseaudio]
35 !<gnome-extra/gnome-media-2.32.0-r300
36 @@ -95,3 +96,12 @@ pkg_setup() {
37 $(use_with socialweb libsocialweb)"
38 DOCS="AUTHORS ChangeLog NEWS README TODO"
39 }
40 +
41 +src_prepare() {
42 + # https://bugzilla.gnome.org/show_bug.cgi?id=651162
43 + # XXX: remove for next release
44 + sed -e 's:no-undefined:-no-undefined:' \
45 + -i libgnome-control-center/Makefile.* || die "sed failed"
46 +
47 + gnome2_src_prepare
48 +}
49
50 diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
51 index 9ddf3af..f0b273a 100644
52 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
53 +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
54 @@ -64,6 +64,7 @@ COMMON_DEPEND="
55 socialweb? ( net-libs/libsocialweb )"
56 RDEPEND="${COMMON_DEPEND}
57 sys-apps/accountsservice
58 + cups? ( net-print/cups-pk-helper )
59
60 !gnome-extra/gnome-media[pulseaudio]
61 !<gnome-extra/gnome-media-2.32.0-r300