Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
Date: Wed, 03 Jul 2019 06:40:22
Message-Id: 1562136005.93a0a7911e4641654626df5f7f3a03d8da2676e4.jer@gentoo
1 commit: 93a0a7911e4641654626df5f7f3a03d8da2676e4
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 3 06:38:14 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 3 06:40:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a0a791
7
8 x11-misc/xscreensaver: Version 5.43
9
10 Package-Manager: Portage-2.3.68, Repoman-2.3.16
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-misc/xscreensaver/Manifest | 1 +
14 .../files/xscreensaver-5.43-gentoo.patch | 47 +++++++
15 x11-misc/xscreensaver/xscreensaver-5.43.ebuild | 141 +++++++++++++++++++++
16 3 files changed, 189 insertions(+)
17
18 diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
19 index b0862f16cfa..52403b2de16 100644
20 --- a/x11-misc/xscreensaver/Manifest
21 +++ b/x11-misc/xscreensaver/Manifest
22 @@ -1,3 +1,4 @@
23 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
24 DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
25 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
26 +DIST xscreensaver-5.43.tar.gz 26968319 BLAKE2B 799f37f7851dc717e1bf09d63c83a07aca3c51be138d854c0d904c1d6878ef015e1750c55f7b083b6aa020c6be86e9e5a08c1aa8f47f5d063407d8a151c30d6d SHA512 e745711c5760434652aa6bee99c1060717f15cad5946fba2fa3aadbcb300bec6620935c27d095b6e8a68c06e5bbe6fc1879474674b6d07f04b2af82d05cc383a
27
28 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
29 new file mode 100644
30 index 00000000000..a6978a58e68
31 --- /dev/null
32 +++ b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
33 @@ -0,0 +1,47 @@
34 +--- a/driver/XScreenSaver.ad.in
35 ++++ b/driver/XScreenSaver.ad.in
36 +@@ -31,21 +31,21 @@
37 + *mode: random
38 + *timeout: 0:10:00
39 + *cycle: 0:10:00
40 +-*lockTimeout: 0:00:00
41 ++*lockTimeout: 0:30:00
42 + *passwdTimeout: 0:00:30
43 +-*dpmsEnabled: False
44 ++*dpmsEnabled: True
45 + *dpmsQuickoffEnabled: False
46 + *dpmsStandby: 2:00:00
47 + *dpmsSuspend: 2:00:00
48 + *dpmsOff: 4:00:00
49 +-*grabDesktopImages: True
50 ++*grabDesktopImages: False
51 + *grabVideoFrames: False
52 + *chooseRandomImages: @DEFAULT_IMAGES_P@
53 + ! This can be a local directory name, or the URL of an RSS or Atom feed.
54 + *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
55 + *nice: 10
56 + *memoryLimit: 0
57 +-*lock: False
58 ++*lock: True
59 + *verbose: False
60 + *timestamp: True
61 + *fade: True
62 +@@ -63,7 +63,7 @@
63 + *textLiteral: XScreenSaver
64 + *textFile: @DEFAULT_TEXT_FILE@
65 + *textProgram: fortune
66 +-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
67 ++*textURL: https://planet.gentoo.org/rss20.xml
68 +
69 + *overlayTextForeground: #FFFF00
70 + *overlayTextBackground: #000000
71 +@@ -124,7 +124,8 @@
72 +
73 + ! The format used for printing the date and time in the password dialog box
74 + ! (see the strftime(3) manual page for details.)
75 +-*dateFormat: %d-%b-%y (%a); %I:%M %p
76 ++!*dateFormat: %d-%b-%y (%a); %I:%M %p
77 ++*dateFormat: %x %X
78 + ! For day month date:
79 + ! *dateFormat: %a %b %d, %I:%M %p
80 + ! To show the time only:
81
82 diff --git a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
83 new file mode 100644
84 index 00000000000..57235e1532a
85 --- /dev/null
86 +++ b/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
87 @@ -0,0 +1,141 @@
88 +# Copyright 1999-2019 Gentoo Authors
89 +# Distributed under the terms of the GNU General Public License v2
90 +
91 +EAPI=7
92 +inherit autotools desktop flag-o-matic multilib pam
93 +
94 +DESCRIPTION="A modular screen saver and locker for the X Window System"
95 +HOMEPAGE="https://www.jwz.org/xscreensaver/"
96 +SRC_URI="
97 + ${HOMEPAGE}${P}.tar.gz
98 +"
99 +
100 +LICENSE="BSD"
101 +SLOT="0"
102 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
103 +IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
104 +
105 +COMMON_DEPEND="
106 + >=gnome-base/libglade-2
107 + dev-libs/libxml2
108 + media-libs/netpbm
109 + x11-apps/appres
110 + x11-apps/xwininfo
111 + x11-libs/gdk-pixbuf:2[X]
112 + x11-libs/gtk+:2
113 + x11-libs/libX11
114 + x11-libs/libXext
115 + x11-libs/libXft
116 + x11-libs/libXi
117 + x11-libs/libXmu
118 + x11-libs/libXrandr
119 + x11-libs/libXt
120 + x11-libs/libXxf86misc
121 + x11-libs/libXxf86vm
122 + jpeg? ( virtual/jpeg:0 )
123 + new-login? (
124 + gdm? ( gnome-base/gdm )
125 + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
126 + )
127 + opengl? (
128 + virtual/glu
129 + virtual/opengl
130 + )
131 + pam? ( virtual/pam )
132 + xinerama? ( x11-libs/libXinerama )
133 +"
134 +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
135 +RDEPEND="
136 + ${COMMON_DEPEND}
137 + perl? (
138 + dev-lang/perl
139 + dev-perl/libwww-perl
140 + virtual/perl-Digest-MD5
141 + )
142 + selinux? ( sec-policy/selinux-xscreensaver )
143 +"
144 +DEPEND="
145 + ${COMMON_DEPEND}
146 + dev-util/intltool
147 + sys-devel/bc
148 + sys-devel/gettext
149 + virtual/pkgconfig
150 + x11-base/xorg-proto
151 +"
152 +PATCHES=(
153 + "${FILESDIR}"/${PN}-5.05-interix.patch
154 + "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
155 + "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
156 + "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
157 + "${FILESDIR}"/${PN}-5.31-pragma.patch
158 + "${FILESDIR}"/${PN}-5.43-gentoo.patch
159 +)
160 +
161 +src_prepare() {
162 + sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
163 + strip-linguas -i po/
164 + export ALL_LINGUAS="${LINGUAS}"
165 +
166 + if use new-login && ! use gdm; then #392967
167 + sed -i \
168 + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
169 + configure{,.in} || die
170 + fi
171 +
172 + default
173 +
174 + use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
175 +
176 + eapply_user
177 +
178 + eautoconf
179 + eautoheader
180 +}
181 +
182 +src_configure() {
183 + if use ppc || use ppc64; then
184 + filter-flags -maltivec -mabi=altivec
185 + append-flags -U__VEC__
186 + fi
187 +
188 + unset BC_ENV_ARGS #24568
189 + export RPM_PACKAGE_VERSION=no #368025
190 +
191 + econf \
192 + $(use_with jpeg) \
193 + $(use_with new-login login-manager) \
194 + $(use_with opengl gl) \
195 + $(use_with pam) \
196 + $(use_with suid setuid-hacks) \
197 + $(use_with xinerama xinerama-ext) \
198 + --enable-locking \
199 + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
200 + --with-dpms-ext \
201 + --with-gtk \
202 + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
203 + --with-pixbuf \
204 + --with-proc-interrupts \
205 + --with-randr-ext \
206 + --with-text-file="${EPREFIX}"/etc/gentoo-release \
207 + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
208 + --with-xdbe-ext \
209 + --with-xf86gamma-ext \
210 + --with-xf86vmode-ext \
211 + --with-xinput-ext \
212 + --with-xshm-ext \
213 + --without-gle \
214 + --without-kerberos \
215 + --x-includes="${EPREFIX}"/usr/include \
216 + --x-libraries="${EPREFIX}"/usr/$(get_libdir)
217 +}
218 +
219 +src_install() {
220 + emake install_prefix="${D}" install
221 +
222 + dodoc README{,.hacking}
223 +
224 + use pam && fperms 755 /usr/bin/${PN}
225 + pamd_mimic_system ${PN} auth
226 +
227 + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
228 +}