Сравнение xscreensaver-6.06-r2 с xscreensaver-6.07-r2

/usr/portage/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild 2023-10-09 14:52:35.956368513 +0300
13 13
		https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch ->
14 14
			${PN}-6.06-logind-idle-hint.patch
15 15
	)
16
	systemd? (
17
		 https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch ->
18
			${PN}-6.07-xscreensaver.service-start-with-no-splash.patch
19
	)
16 20
"
17 21

  
18 22
# Font license mapping for folder ./hacks/fonts/ as following:
......
21 25
#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
22 26
#   OCRAStd.otf      -- unclear, hence dropped
23 27
#   SpecialElite.ttf -- Apache-2.0
24
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
28
LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
25 29
SLOT="0"
26
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
30
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
27 31
IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama"
28 32
REQUIRED_USE="
29 33
	gles? ( !glx )
......
84 88
PATCHES=(
85 89
	"${FILESDIR}"/${PN}-5.31-pragma.patch
86 90
	"${FILESDIR}"/${PN}-6.01-gentoo.patch
87
	"${FILESDIR}"/${PN}-5.45-gcc.patch
91
	"${FILESDIR}"/${PN}-6.07-gcc.patch
88 92
	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
89 93
#	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
90 94
#	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
......
93 97
	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
94 98
#	"${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
95 99
#	"${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
100
	"${FILESDIR}"/${PN}-6.07-allow-no-pam.patch
101
	"${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch
98 102
)
99 103

  
100 104
DOCS=( README{,.hacking} )
......
105 109
src_prepare() {
106 110
	default
107 111

  
112
	# bug #896440
113
	mv po/ca.po po/ca.po.old || die
114
	iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die
115

  
108 116
	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
117

  
118
	if use systemd; then
119
		# Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver."
120
		# after "systemctl --user enable xscreensaver".
121
		sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \
122
			driver/xscreensaver.service.in || die
123

  
124
		eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch"
125
	fi
126

  
109 127
	strip-linguas -i po/
110 128
	export ALL_LINGUAS="${LINGUAS}"
111 129

  
......
211 229

  
212 230
	if use fonts; then
213 231
		# Do not install fonts with unclear licensing
214
		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
232
		rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die
215 233

  
216 234
		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
217 235
		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
218 236

  
219 237
		font_xfont_config
220 238
	else
221
		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
222
		rmdir -v "${ED}${FONTDIR}" || die #812473
239
		rm -rfv "${ED}${FONTDIR}" || die #812473
223 240
	fi
224 241

  
225 242
	einstalldocs
......
229 246
		pamd_mimic_system ${PN} auth
230 247
	fi
231 248

  
232
	# bugs #809599, #828869
233
	#if ! use gtk; then
234
	#	rm "${ED}/usr/bin/xscreensaver-demo" || die
235
	#fi
236 249
	if use systemd; then
237 250
		systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service"
238 251
	fi
Спасибо!