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-extra/gnome-screensaver/
Date: Tue, 22 Feb 2011 19:45:13
Message-Id: 20372ff889a57092b93bb9cae6f8f6a7b153eb0f.nirbheek@gentoo
1 commit: 20372ff889a57092b93bb9cae6f8f6a7b153eb0f
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 22 19:29:08 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 22 19:32:49 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=20372ff8
7
8 gnome-extra/gnome-screensaver: 2.91.4 -> 2.91.90
9
10 ---
11 ...1.4.ebuild => gnome-screensaver-2.91.90.ebuild} | 15 +--------------
12 .../gnome-screensaver-9999.ebuild | 15 +--------------
13 2 files changed, 2 insertions(+), 28 deletions(-)
14
15 diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.4.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild
16 similarity index 88%
17 rename from gnome-extra/gnome-screensaver/gnome-screensaver-2.91.4.ebuild
18 rename to gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild
19 index 7b3802f..fd2591c 100644
20 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.4.ebuild
21 +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.91.90.ebuild
22 @@ -26,6 +26,7 @@ RDEPEND="
23 >=x11-libs/gtk+-2.99.3:3
24 >=gnome-base/gnome-desktop-2.91.5:3
25 >=gnome-base/gnome-menus-2.12
26 + >=gnome-base/gsettings-desktop-schemas-0.1.7
27 >=gnome-base/libgnomekbd-0.1
28 >=dev-libs/dbus-glib-0.71
29
30 @@ -70,14 +71,6 @@ pkg_setup() {
31 --disable-schemas-compile"
32 }
33
34 -src_prepare() {
35 - gnome2_src_prepare
36 -
37 - # Fix intltoolize broken file, see upstream #577133
38 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
39 - || die "sed failed"
40 -}
41 -
42 src_install() {
43 gnome2_src_install
44
45 @@ -101,12 +94,6 @@ src_install() {
46 pkg_postinst() {
47 gnome2_pkg_postinst
48
49 - if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
50 - ewarn "You have a too old xorg-server installation. This will cause"
51 - ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
52 - echo
53 - fi
54 -
55 if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
56 ewarn "You have xscreensaver installed, you probably want to disable it."
57 ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
58
59 diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
60 index 7b3802f..fd2591c 100644
61 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
62 +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-9999.ebuild
63 @@ -26,6 +26,7 @@ RDEPEND="
64 >=x11-libs/gtk+-2.99.3:3
65 >=gnome-base/gnome-desktop-2.91.5:3
66 >=gnome-base/gnome-menus-2.12
67 + >=gnome-base/gsettings-desktop-schemas-0.1.7
68 >=gnome-base/libgnomekbd-0.1
69 >=dev-libs/dbus-glib-0.71
70
71 @@ -70,14 +71,6 @@ pkg_setup() {
72 --disable-schemas-compile"
73 }
74
75 -src_prepare() {
76 - gnome2_src_prepare
77 -
78 - # Fix intltoolize broken file, see upstream #577133
79 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
80 - || die "sed failed"
81 -}
82 -
83 src_install() {
84 gnome2_src_install
85
86 @@ -101,12 +94,6 @@ src_install() {
87 pkg_postinst() {
88 gnome2_pkg_postinst
89
90 - if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
91 - ewarn "You have a too old xorg-server installation. This will cause"
92 - ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
93 - echo
94 - fi
95 -
96 if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
97 ewarn "You have xscreensaver installed, you probably want to disable it."
98 ewarn "To prevent a duplicate screensaver entry in the menu, you need to"