1 |
commit: 59536eabfd3b4026e1136c707b83800c7e64fb3d |
2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 2 04:39:25 2020 +0000 |
4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 2 05:55:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=59536eab |
7 |
|
8 |
mate-extra/mate-screensaver: Sync with ::gentoo |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
12 |
|
13 |
mate-extra/mate-screensaver/Manifest | 1 - |
14 |
.../mate-screensaver-1.22.1.ebuild | 119 --------------------- |
15 |
.../mate-screensaver-1.22.2.ebuild | 2 +- |
16 |
.../mate-screensaver-1.24.0.ebuild | 2 +- |
17 |
4 files changed, 2 insertions(+), 122 deletions(-) |
18 |
|
19 |
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest |
20 |
index 04a6d8f..a90ea63 100644 |
21 |
--- a/mate-extra/mate-screensaver/Manifest |
22 |
+++ b/mate-extra/mate-screensaver/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST mate-screensaver-1.22.1.tar.xz 4942928 BLAKE2B e82b6482ed9ec655bb8bea2795b0e2559cbdfcb2be5f27a2264486a2013b8234cb02292b6ca547f8812e6dc0c74646f51af8a2f8d7baf2f28bf1b688508350d5 SHA512 7ffb94d88095ff5580862fe9c958a2e4af7a424d40dc5e0f3c1da49a258035179573721fc7052710624916678e953a6347a898b53ff872a49e022987b8c02904 |
25 |
DIST mate-screensaver-1.22.2.tar.xz 4943380 BLAKE2B 20d28ee7496af9fd9ac23d4f083eaee716eb97e1c3a9b921fc6b3655cfe4c6dc6e482827eb7fad40fbfd5dfb705bcac57aff3bf60e232b84562e496a7a56c354 SHA512 6d28f7261556d59af0bdb8c59ac13fc042c9c5b4cce47e7f6d4148041eb7f05d5cb062f85f05dddb51d009e4aebac31c21fc1243c0e07813adc050fede134ef3 |
26 |
DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0 |
27 |
|
28 |
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 07f6449..0000000 |
31 |
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,119 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit mate readme.gentoo-r1 |
40 |
- |
41 |
-if [[ ${PV} != 9999 ]]; then |
42 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
43 |
-fi |
44 |
- |
45 |
-DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" |
46 |
- |
47 |
-LICENSE="GPL-2+ HPND LGPL-2+" |
48 |
-SLOT="0" |
49 |
-IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd" |
50 |
-REQUIRED_USE="?? ( elogind systemd )" |
51 |
- |
52 |
-DOC_CONTENTS=" |
53 |
- Information for converting screensavers is located in |
54 |
- /usr/share/doc/${PF}/xss-conversion.txt* |
55 |
-" |
56 |
- |
57 |
-COMMON_DEPEND=" |
58 |
- >=dev-libs/dbus-glib-0.71:0 |
59 |
- >=dev-libs/glib-2.50:2 |
60 |
- gnome-base/dconf |
61 |
- >=mate-base/libmatekbd-1.17.0 |
62 |
- >=mate-base/mate-desktop-1.17.0 |
63 |
- >=mate-base/mate-menus-1.21.0 |
64 |
- >=sys-apps/dbus-0.30 |
65 |
- >=x11-libs/gdk-pixbuf-2.14:2 |
66 |
- >=x11-libs/libX11-1 |
67 |
- x11-libs/cairo |
68 |
- >=x11-libs/gtk+-3.22:3 |
69 |
- x11-libs/libXext |
70 |
- x11-libs/libXrandr |
71 |
- x11-libs/libXScrnSaver |
72 |
- x11-libs/libXxf86misc |
73 |
- x11-libs/libXxf86vm |
74 |
- x11-libs/libxklavier |
75 |
- x11-libs/pango |
76 |
- virtual/libintl |
77 |
- consolekit? ( sys-auth/consolekit ) |
78 |
- libnotify? ( >=x11-libs/libnotify-0.7:0 ) |
79 |
- opengl? ( virtual/opengl ) |
80 |
- pam? ( gnome-base/gnome-keyring sys-libs/pam ) |
81 |
- !pam? ( kernel_linux? ( sys-apps/shadow ) ) |
82 |
- elogind? ( sys-auth/elogind ) |
83 |
- systemd? ( sys-apps/systemd:= ) |
84 |
- !!<gnome-extra/gnome-screensaver-3" |
85 |
- |
86 |
-RDEPEND="${COMMON_DEPEND} |
87 |
- >=mate-base/mate-session-manager-1.6" |
88 |
- |
89 |
-DEPEND="${COMMON_DEPEND} |
90 |
- >=dev-util/intltool-0.50.1 |
91 |
- sys-devel/gettext:* |
92 |
- x11-base/xorg-proto |
93 |
- virtual/pkgconfig:*" |
94 |
- |
95 |
-src_configure() { |
96 |
- local myconf=( |
97 |
- --enable-locking |
98 |
- --with-kbd-layout-indicator |
99 |
- --with-xf86gamma-ext |
100 |
- --with-xscreensaverdir=/usr/share/xscreensaver/config |
101 |
- --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver |
102 |
- $(use_with X x) |
103 |
- $(use_with consolekit console-kit) |
104 |
- $(use_with elogind) |
105 |
- $(use_with libnotify) |
106 |
- $(use_with opengl libgl) |
107 |
- $(use_with systemd) |
108 |
- $(use_enable debug) |
109 |
- $(use_enable pam) |
110 |
- ) |
111 |
- |
112 |
- mate_src_configure "${myconf[@]}" |
113 |
-} |
114 |
- |
115 |
-src_install() { |
116 |
- mate_src_install |
117 |
- |
118 |
- # Install the conversion script in the documentation. |
119 |
- dodoc "${S}"/data/migrate-xscreensaver-config.sh |
120 |
- dodoc "${S}"/data/xscreensaver-config.xsl |
121 |
- dodoc "${FILESDIR}"/xss-conversion.txt |
122 |
- |
123 |
- # Non PAM users will need this suid to read the password hashes. |
124 |
- # OpenPAM users will probably need this too when |
125 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=370847 |
126 |
- # is fixed. |
127 |
- if ! use pam ; then |
128 |
- fperms u+s /usr/libexec/mate-screensaver-dialog |
129 |
- fi |
130 |
- |
131 |
- readme.gentoo_create_doc |
132 |
-} |
133 |
- |
134 |
-pkg_postinst() { |
135 |
- mate_pkg_postinst |
136 |
- |
137 |
- if has_version "<x11-base/xorg-server-1.5.3-r4" ; then |
138 |
- ewarn "You have a too old xorg-server installation. This will cause" |
139 |
- ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." |
140 |
- echo |
141 |
- fi |
142 |
- |
143 |
- if has_version "<x11-misc/xscreensaver-4.22-r2" ; then |
144 |
- ewarn "You have xscreensaver installed, you probably want to disable it." |
145 |
- ewarn "To prevent a duplicate screensaver entry in the menu, you need to" |
146 |
- ewarn "build xscreensaver with -gnome in the USE flags." |
147 |
- ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" |
148 |
- echo |
149 |
- fi |
150 |
- |
151 |
- readme.gentoo_print_elog |
152 |
-} |
153 |
|
154 |
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild |
155 |
index 5c25978..fbe8e82 100644 |
156 |
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild |
157 |
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild |
158 |
@@ -6,7 +6,7 @@ EAPI=6 |
159 |
inherit mate readme.gentoo-r1 |
160 |
|
161 |
if [[ ${PV} != 9999 ]]; then |
162 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
163 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
164 |
fi |
165 |
|
166 |
DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" |
167 |
|
168 |
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild |
169 |
index 37afee1..91e4469 100644 |
170 |
--- a/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild |
171 |
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild |
172 |
@@ -6,7 +6,7 @@ EAPI=6 |
173 |
inherit mate readme.gentoo-r1 |
174 |
|
175 |
if [[ ${PV} != 9999 ]]; then |
176 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
177 |
+ KEYWORDS="amd64 ~arm ~arm64 x86" |
178 |
fi |
179 |
|
180 |
DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" |