Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/
Date: Sat, 12 Jun 2021 14:31:43
Message-Id: 1623508258.41d1c598e70315bb6d32459a8aa73084aeba5f2d.sping@gentoo
1 commit: 41d1c598e70315bb6d32459a8aa73084aeba5f2d
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 12 14:28:17 2021 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 12 14:30:58 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d1c598
7
8 x11-misc/xscreensaver: Improve USE=-offensive
9
10 Thanks to Jasmin Buchert most of this patch!
11 Closes: https://bugs.gentoo.org/777807
12 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
13 Package-Manager: Portage-3.0.19, Repoman-3.0.3
14
15 x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild | 173 ++++++++++++++++++++++
16 1 file changed, 173 insertions(+)
17
18 diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
19 new file mode 100644
20 index 00000000000..0553c002d76
21 --- /dev/null
22 +++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
23 @@ -0,0 +1,173 @@
24 +# Copyright 1999-2021 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=7
28 +inherit autotools flag-o-matic l10n multilib optfeature pam
29 +
30 +DESCRIPTION="modular screen saver and locker for the X Window System"
31 +HOMEPAGE="https://www.jwz.org/xscreensaver/"
32 +SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
33 +
34 +LICENSE="BSD"
35 +SLOT="0"
36 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
37 +IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
38 +REQUIRED_USE="
39 + gdk-pixbuf? ( gtk )
40 +"
41 +
42 +COMMON_DEPEND="
43 + >=gnome-base/libglade-2
44 + dev-libs/libxml2
45 + media-libs/netpbm
46 + x11-apps/appres
47 + x11-apps/xwininfo
48 + x11-libs/libX11
49 + x11-libs/libXext
50 + x11-libs/libXft
51 + x11-libs/libXi
52 + x11-libs/libXmu
53 + x11-libs/libXrandr
54 + x11-libs/libXt
55 + x11-libs/libXxf86vm
56 + caps? ( sys-libs/libcap )
57 + gdk-pixbuf? (
58 + x11-libs/gdk-pixbuf-xlib
59 + >=x11-libs/gdk-pixbuf-2.42.0:2
60 + )
61 + gtk? ( x11-libs/gtk+:2 )
62 + jpeg? ( virtual/jpeg:0 )
63 + new-login? (
64 + gdm? ( gnome-base/gdm )
65 + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
66 + )
67 + opengl? (
68 + virtual/glu
69 + virtual/opengl
70 + )
71 + pam? ( sys-libs/pam )
72 + systemd? ( >=sys-apps/systemd-221 )
73 + xinerama? ( x11-libs/libXinerama )
74 +"
75 +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
76 +RDEPEND="
77 + ${COMMON_DEPEND}
78 + media-gfx/fbida
79 + perl? (
80 + dev-lang/perl
81 + dev-perl/libwww-perl
82 + virtual/perl-Digest-MD5
83 + )
84 + selinux? ( sec-policy/selinux-xscreensaver )
85 +"
86 +DEPEND="
87 + ${COMMON_DEPEND}
88 + dev-util/intltool
89 + sys-devel/bc
90 + sys-devel/gettext
91 + virtual/pkgconfig
92 + x11-base/xorg-proto
93 +"
94 +PATCHES=(
95 + "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
96 + "${FILESDIR}"/${PN}-5.45-interix.patch
97 + "${FILESDIR}"/${PN}-5.31-pragma.patch
98 + "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
99 + "${FILESDIR}"/${PN}-5.44-gentoo.patch
100 + "${FILESDIR}"/${PN}-5.45-gcc.patch
101 + "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
102 + "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
103 +)
104 +
105 +src_prepare() {
106 + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
107 + strip-linguas -i po/
108 + export ALL_LINGUAS="${LINGUAS}"
109 +
110 + if use new-login && ! use gdm; then #392967
111 + sed -i \
112 + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
113 + configure{,.ac} || die
114 + fi
115 +
116 + default
117 +
118 + if ! use offensive; then
119 + sed -i \
120 + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
121 + hacks/barcode.c || die
122 + sed -i \
123 + -e 's|erect penis|shuffle board|g' \
124 + -e 's|flaccid penis|flaccid anchor|g' \
125 + -e 's|vagina|engagement ring|g' \
126 + -e 's|Penis|Shuttle|g' \
127 + hacks/glx/glsnake.c || die
128 + sed -i \
129 + 's| Stay.*fucking mask\.$||' \
130 + hacks/glx/covid19.man \
131 + hacks/config/covid19.xml || die
132 + fi
133 +
134 + eapply_user
135 +
136 + eautoconf
137 + eautoheader
138 +}
139 +
140 +src_configure() {
141 + if use ppc || use ppc64; then
142 + filter-flags -maltivec -mabi=altivec
143 + append-flags -U__VEC__
144 + fi
145 +
146 + unset BC_ENV_ARGS #24568
147 + export RPM_PACKAGE_VERSION=no #368025
148 +
149 + econf \
150 + $(use_enable locking) \
151 + $(use_with caps setcap-hacks) \
152 + $(use_with gdk-pixbuf pixbuf) \
153 + $(use_with gtk) \
154 + $(use_with jpeg) \
155 + $(use_with new-login login-manager) \
156 + $(use_with opengl gl) \
157 + $(use_with pam) \
158 + $(use_with suid setuid-hacks) \
159 + $(use_with systemd) \
160 + $(use_with xinerama xinerama-ext) \
161 + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
162 + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
163 + --with-dpms-ext \
164 + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
165 + --with-proc-interrupts \
166 + --with-randr-ext \
167 + --with-text-file="${EPREFIX}"/etc/gentoo-release \
168 + --with-xdbe-ext \
169 + --with-xf86gamma-ext \
170 + --with-xf86vmode-ext \
171 + --with-xinput-ext \
172 + --with-xshm-ext \
173 + --without-gle \
174 + --without-kerberos \
175 + --without-motif \
176 + --x-includes="${EPREFIX}"/usr/include \
177 + --x-libraries="${EPREFIX}"/usr/$(get_libdir)
178 +}
179 +
180 +src_install() {
181 + emake install_prefix="${D}" install
182 +
183 + dodoc README{,.hacking}
184 +
185 + if use pam; then
186 + fperms 755 /usr/bin/${PN}
187 + pamd_mimic_system ${PN} auth
188 + fi
189 +
190 + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
191 +}
192 +
193 +pkg_postinst() {
194 + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
195 + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
196 +}