gentoo resync : 16.04.2018

2 files changed, 147 insertions, 0 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 605850f248cc..abacda6897a4 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,7 +9,9 @@ AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf
 DIST xscreensaver-5.36.tar.gz 10600872 BLAKE2B 5039722fa3aae2fdb42fb99516685f0c1fd91112f1104457988d0e7dbeb995266d60e76178a099523c920c07e1b8bc2c73c223a7a2db7b728c599cb1959a6751 SHA512 4f476135bbfdce0593bb6e5a6a48dd474fcce6031214ffbb3d43dc91bb8e1a28b3e59fc960d5f1a9ac0bdd3dc4531da26679bffbe47b7fb00b67ad74295b40f7
 DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61e57f343f0ca59f38c7b8d2c7fa03a5b08a5ee424062bba8a4c95da2ec32d89cbcf3cc84cd112fbd67314d3db56bd0ef SHA512 9bef3caf4eb495bebb4c1818ed0bb222be28a7a8d525e2bce70e92d7617bc8cf89750dfaa8cf7a3cd0c489b4831c95f9ff8a0164579cf047aa63681254c8e443
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
+DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
 EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
 EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
 EBUILD xscreensaver-5.38.ebuild 3540 BLAKE2B 6f7dfeaab87a7d900d467e814acfb0a427628f712285b696bc6076cca54d4128930c9447cfbe6ed229b89b8b2b89d0de2b8016a016537611196335b505c284f5 SHA512 f006dedaa5736993d88a40b2022e91f688e6d022bafca6c3515967a5e87a7922c98792c86aa381a8d04561a6af7e946018d436c92613b55d3e1556ca79670360
+EBUILD xscreensaver-5.39.ebuild 3547 BLAKE2B dee7b483c7739f038d4e7dcab847368942bd3022331bc4f5feddc9afbde7b24b950acb98a954d804d5bd737306340d553e527202a1472f66a9235ec028db5a9c SHA512 8f3d58d58005dd68a764428cd1e3fa62aa2d3d2cddb6ee666dfc808ff8f5724aae17c8eaf716e70045e927aad957d5472f6d8a62c81fb33c0218c51858aa6882
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.39.ebuild b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
new file mode 100644
index 000000000000..53d05029957a
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.39.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+	${HOMEPAGE}${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	eapply \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch \
+		"${FILESDIR}"/${PN}-5.35-gentoo.patch
+
+	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}