1 |
commit: 18e77c5d17b5f13700754fbc5a155890f3a0b5fd |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 25 15:29:49 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 25 16:26:29 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e77c5d |
7 |
|
8 |
gnome-extra/cinnamon-screensaver: Version bump |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
gnome-extra/cinnamon-screensaver/Manifest | 1 + |
13 |
.../cinnamon-screensaver-3.0.1.ebuild | 105 +++++++++++++++++++++ |
14 |
.../files/cinnamon-screensaver-2.8.0-webkit4.patch | 4 +- |
15 |
...nnamon-screensaver-3.0.1-automagic-logind.patch | 21 +++++ |
16 |
4 files changed, 129 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest |
19 |
index 8e27e02..3a921d5 100644 |
20 |
--- a/gnome-extra/cinnamon-screensaver/Manifest |
21 |
+++ b/gnome-extra/cinnamon-screensaver/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065475e39ac09f957de2da8423b685ade1441036 SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d WHIRLPOOL 61a2af9bdfcc4be850ff4455782f00048d12ee1d1f36cd35acdc498e4054d450946a064db8b09b6c6000b897af21cfa0a3acc699eefdef437a699e454e252dcc |
24 |
+DIST cinnamon-screensaver-3.0.1.tar.gz 147036 SHA256 de32ab1852b605835ea0ca41f248d18b32d7805d479eb6fd5877d4de92dbb784 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427 WHIRLPOOL 6b4094cff650234933d82248fc671e399956bc435d1c47aa3b6869f2ba7c3eaaf9d973e05d29f1c274b269b6be62beca0ff0b3babc3804a73d62b9329be568f2 |
25 |
|
26 |
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..a8c339a |
29 |
--- /dev/null |
30 |
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild |
31 |
@@ -0,0 +1,105 @@ |
32 |
+# Copyright 1999-2016 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=6 |
37 |
+PYTHON_COMPAT=( python2_7 ) |
38 |
+ |
39 |
+inherit autotools gnome2 multilib python-single-r1 |
40 |
+ |
41 |
+DESCRIPTION="Screensaver for Cinnamon" |
42 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
43 |
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz" |
44 |
+ |
45 |
+LICENSE="GPL-2+" |
46 |
+SLOT="0" |
47 |
+IUSE="debug doc pam systemd" |
48 |
+KEYWORDS="~amd64 ~x86" |
49 |
+ |
50 |
+COMMON_DEPEND=" |
51 |
+ >=dev-libs/glib-2.37.3:2[dbus] |
52 |
+ >=x11-libs/gtk+-3.1.4:3[introspection] |
53 |
+ >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] |
54 |
+ >=gnome-base/gsettings-desktop-schemas-0.1.7 |
55 |
+ >=gnome-base/libgnomekbd-3.6 |
56 |
+ >=dev-libs/dbus-glib-0.78 |
57 |
+ |
58 |
+ net-libs/webkit-gtk:4[introspection] |
59 |
+ |
60 |
+ sys-apps/dbus |
61 |
+ x11-libs/libxklavier |
62 |
+ x11-libs/libX11 |
63 |
+ x11-libs/libXext |
64 |
+ x11-libs/libXrandr |
65 |
+ x11-libs/libXScrnSaver |
66 |
+ x11-libs/libXxf86misc |
67 |
+ x11-libs/libXxf86vm |
68 |
+ x11-themes/adwaita-icon-theme |
69 |
+ |
70 |
+ ${PYTHON_DEPS} |
71 |
+ |
72 |
+ pam? ( virtual/pam ) |
73 |
+ systemd? ( >=sys-apps/systemd-31:0= ) |
74 |
+" |
75 |
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack |
76 |
+RDEPEND=" |
77 |
+ !~gnome-extra/cinnamon-1.8.8.1 |
78 |
+ !systemd? ( sys-auth/consolekit ) |
79 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
80 |
+" |
81 |
+DEPEND="${COMMON_DEPEND} |
82 |
+ >=dev-util/intltool-0.35 |
83 |
+ gnome-base/gnome-common |
84 |
+ sys-devel/gettext |
85 |
+ virtual/pkgconfig |
86 |
+ x11-proto/xextproto |
87 |
+ x11-proto/randrproto |
88 |
+ x11-proto/scrnsaverproto |
89 |
+ x11-proto/xf86miscproto |
90 |
+ doc? ( |
91 |
+ app-text/xmlto |
92 |
+ app-text/docbook-xml-dtd:4.1.2 |
93 |
+ app-text/docbook-xml-dtd:4.4 ) |
94 |
+" |
95 |
+ |
96 |
+pkg_setup() { |
97 |
+ python_setup |
98 |
+} |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ eapply "${FILESDIR}"/${PN}-3.0.1-automagic-logind.patch |
102 |
+ eapply "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572 |
103 |
+ |
104 |
+ # Fix xscreensaver paths for gentoo |
105 |
+ sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \ |
106 |
+ -i data/screensavers/xscreensaver@××××××××.org/main || die |
107 |
+ |
108 |
+ python_fix_shebang data/screensavers |
109 |
+ |
110 |
+ eautoreconf |
111 |
+ gnome2_src_prepare |
112 |
+} |
113 |
+ |
114 |
+src_configure() { |
115 |
+ gnome2_src_configure \ |
116 |
+ $(usex debug --enable-debug ' ') \ |
117 |
+ $(use_enable doc docbook-docs) \ |
118 |
+ $(use_enable pam locking) \ |
119 |
+ $(use_enable systemd logind) \ |
120 |
+ --with-mit-ext \ |
121 |
+ --with-pam-prefix=/etc \ |
122 |
+ --with-xf86gamma-ext \ |
123 |
+ --with-kbd-layout-indicator |
124 |
+ # Do not use --without-console-kit, it would provide no benefit: there is |
125 |
+ # no build-time or run-time check for consolekit, $PN merely listens to |
126 |
+ # consolekit's messages over dbus. |
127 |
+} |
128 |
+ |
129 |
+pkg_postinst() { |
130 |
+ gnome2_pkg_postinst |
131 |
+ |
132 |
+ if ! has_version x11-misc/xscreensaver; then |
133 |
+ elog "${PN} can use screensavers from x11-misc/xscreensaver" |
134 |
+ fi |
135 |
+ |
136 |
+} |
137 |
|
138 |
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch |
139 |
index 831f9fd..cbf7427 100644 |
140 |
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch |
141 |
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch |
142 |
@@ -1,5 +1,5 @@ |
143 |
---- configure.ac~ 2015-10-16 17:06:50.000000000 +0200 |
144 |
-+++ configure.ac 2016-01-30 13:33:07.595401835 +0100 |
145 |
+--- a/configure.ac~ 2015-10-16 17:06:50.000000000 +0200 |
146 |
++++ b/configure.ac 2016-01-30 13:33:07.595401835 +0100 |
147 |
@@ -58,7 +58,7 @@ |
148 |
gtk+-3.0 >= $GTK_REQUIRED_VERSION |
149 |
dbus-glib-1 >= $DBUS_REQUIRED_VERSION |
150 |
|
151 |
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch |
152 |
new file mode 100644 |
153 |
index 0000000..06048d5 |
154 |
--- /dev/null |
155 |
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch |
156 |
@@ -0,0 +1,21 @@ |
157 |
+--- a/configure.ac~ 2016-05-30 17:09:04.000000000 +0200 |
158 |
++++ b/configure.ac 2016-06-25 17:26:08.614205626 +0200 |
159 |
+@@ -580,9 +580,15 @@ |
160 |
+ dnl logind support |
161 |
+ dnl --------------------------------------------------------------------------- |
162 |
+ |
163 |
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [ |
164 |
+- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no]) |
165 |
+-]) |
166 |
++AC_ARG_ENABLE([logind], |
167 |
++ AS_HELP_STRING([--disable-logind], [Do not check for logind]), |
168 |
++ [enable_logind=$enableval], |
169 |
++ [enable_logind=auto]) |
170 |
++ |
171 |
++have_logind=no |
172 |
++if test x$enable_logind != xno ; then |
173 |
++ PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no]) |
174 |
++fi |
175 |
+ |
176 |
+ if test x$have_logind = xyes ; then |
177 |
+ AC_DEFINE(HAVE_LOGIND, 1, [logind support]) |