Diff xscreensaver-6.05-r2 with a xscreensaver-6.06-r2

/usr/portage/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild 2023-10-09 14:52:35.956368513 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
inherit autotools flag-o-matic font optfeature pam strip-linguas
6
inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils
7 7

  
8 8
DESCRIPTION="Modular screen saver and locker for the X Window System"
9 9
HOMEPAGE="https://www.jwz.org/xscreensaver/"
10
SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz"
10
SRC_URI="
11
	https://www.jwz.org/xscreensaver/${P}.tar.gz
12
	logind-idle-hint? (
13
		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
14
			${PN}-6.06-logind-idle-hint.patch
15
	)
16
"
11 17

  
12 18
# Font license mapping for folder ./hacks/fonts/ as following:
13 19
#   clacon.ttf       -- MIT
......
17 23
#   SpecialElite.ttf -- Apache-2.0
18 24
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
19 25
SLOT="0"
20
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
21
IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
26
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
27
IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
22 28
REQUIRED_USE="
23 29
	gles? ( !glx )
24 30
	?? ( elogind systemd )
25
	gtk? ( gdk-pixbuf )
26 31
	pam? ( locking )
32
	logind-idle-hint? ( || ( elogind systemd ) )
27 33
"
28 34

  
29 35
COMMON_DEPEND="
......
37 43
	x11-libs/libXt
38 44
	x11-libs/libXxf86vm
39 45
	elogind? ( sys-auth/elogind )
40
	gdk-pixbuf? (
41
		x11-libs/gdk-pixbuf-xlib
42
		>=x11-libs/gdk-pixbuf-2.42.0:2
43
	)
44
	gtk? ( >=x11-libs/gtk+-2.22.0:3 )
46
	x11-libs/gdk-pixbuf-xlib
47
	>=x11-libs/gdk-pixbuf-2.42.0:2
48
	>=x11-libs/gtk+-3.0.0:3
45 49
	jpeg? ( media-libs/libjpeg-turbo:= )
46 50
	locking? ( virtual/libcrypt:= )
47 51
	new-login? (
......
51 55
	virtual/glu
52 56
	virtual/opengl
53 57
	pam? ( sys-libs/pam )
54
	png? ( media-libs/libpng:= )
58
	media-libs/libpng:=
55 59
	systemd? ( >=sys-apps/systemd-221 )
56 60
	>=x11-libs/libXft-2.1.0
57 61
	xinerama? ( x11-libs/libXinerama )
......
82 86
	"${FILESDIR}"/${PN}-6.01-gentoo.patch
83 87
	"${FILESDIR}"/${PN}-5.45-gcc.patch
84 88
	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
85
	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
86
	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
89
#	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
90
#	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
87 91
	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
88
	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
92
#	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
89 93
	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
90
	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
91
	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
94
#	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
95
#	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
96
	"${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch
97
	"${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
92 98
)
93 99

  
94 100
DOCS=( README{,.hacking} )
95 101

  
102
# see https://bugs.gentoo.org/898328
103
QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow )
104

  
96 105
src_prepare() {
97 106
	default
98 107

  
......
127 136
		eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
128 137
	fi
129 138

  
139
	if use logind-idle-hint; then
140
		eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch"
141
	fi
142

  
130 143
	config_rpath_update "${S}"/config.rpath
131 144

  
132 145
	# Must be eauto*re*conf, to force the rebuild
......
151 164
	ECONF_OPTS=(
152 165
		$(use_enable locking)
153 166
		$(use_with elogind)
154
		$(use_with gdk-pixbuf pixbuf)
167
		--with-pixbuf
155 168
		$(use_with gles)
156 169
		$(use_with glx)
157
		$(use_with gtk)
170
		--with-gtk
158 171
		$(use_with new-login login-manager)
159 172
		$(use_with pam)
160 173
		$(use_with suid setuid-hacks)
161 174
		$(use_with systemd)
162 175
		$(use_with xinerama xinerama-ext)
163 176
		--with-jpeg=$(usex jpeg yes no)
164
		--with-png=$(usex png yes no)
177
		--with-png=yes
165 178
		--with-xft=yes
166 179
		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
167 180
		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
......
217 230
	fi
218 231

  
219 232
	# bugs #809599, #828869
220
	if ! use gtk; then
221
		rm "${ED}/usr/bin/xscreensaver-demo" || die
222
	fi
223
	# Makefile installs xscreensaver.service regardless of --without-systemd
224
	if ! use systemd; then
225
		rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
233
	#if ! use gtk; then
234
	#	rm "${ED}/usr/bin/xscreensaver-demo" || die
235
	#fi
236
	if use systemd; then
237
		systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
226 238
	fi
239
	# Makefile installs xscreensaver.service regardless of
240
	# --without-systemd, and if USE=systemd, we will have installed the
241
	# unit file already.
242
	rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
227 243

  
228 244
	# bug #885989
229 245
	fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
......
240 256
	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
241 257
	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
242 258
	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
259

  
260
	xdg_icon_cache_update
243 261
}
244 262

  
245 263
pkg_postrm() {
246 264
	use fonts && font_pkg_postrm
265
	xdg_icon_cache_update
247 266
}
Thank you!