Add patch to read float resources right, see bug #143662.

(Portage version: 2.1.1_rc1-r2)
 (Signed Manifest commit)

3 files changed, 25 insertions, 194 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 35dfc15bb42f..19da8e242e2a 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX desktop_entries/screensaver-properties.desktop 1000 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 SHA1 f55ab9f6430ee339edc6aab428bc277d1b84e03d SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 files/desktop_entries/screensaver-properties.desktop 1000
@@ -66,6 +69,10 @@ AUX xscreensaver-5.00-gentoo.patch 5690 RMD160 7b33957657e884c4c40e0fe2e2e767b63
 MD5 bb1456cec15a55637099aece5605050b files/xscreensaver-5.00-gentoo.patch 5690
 RMD160 7b33957657e884c4c40e0fe2e2e767b630496d60 files/xscreensaver-5.00-gentoo.patch 5690
 SHA256 cbd703a47df6207a3d7784e984760e03a87de2ed09403ac99433126575fc8e25 files/xscreensaver-5.00-gentoo.patch 5690
+AUX xscreensaver-5.00-get_float_resource.patch 502 RMD160 465d24c7e7f08274245a03819fe234cbda57dfbc SHA1 490a2c0669fbd31b3b48ce37a96e99e56b84acf6 SHA256 b2c11edaa5b4fd74c05c81bf653638f67307887b1935335d2c2bc5b0d14bd1f3
+MD5 31e3cbe0e50786e737e4de8ff9831817 files/xscreensaver-5.00-get_float_resource.patch 502
+RMD160 465d24c7e7f08274245a03819fe234cbda57dfbc files/xscreensaver-5.00-get_float_resource.patch 502
+SHA256 b2c11edaa5b4fd74c05c81bf653638f67307887b1935335d2c2bc5b0d14bd1f3 files/xscreensaver-5.00-get_float_resource.patch 502
 AUX xscreensaver-5.00-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad SHA1 eb2465eb92bc8ad696cb6413cfd0d8c211ad1df6 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d
 MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.00-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.00-nsfw.patch 6673
@@ -90,14 +97,14 @@ EBUILD xscreensaver-4.24.ebuild 5252 RMD160 201f1c49366332b6a53aae34df894faf28cf
 MD5 6b0aae5573e16f608c1a4a9c6f6b2295 xscreensaver-4.24.ebuild 5252
 RMD160 201f1c49366332b6a53aae34df894faf28cf4bee xscreensaver-4.24.ebuild 5252
 SHA256 29fe55752a1b7bcd5dc37d18c41b3daab8fc4238d83f70610330b49bf7a07ca9 xscreensaver-4.24.ebuild 5252
-EBUILD xscreensaver-5.00.ebuild 4708 RMD160 f1afdb9a5d5bbd8f0f8f0f3c48a832e497c96b2c SHA1 7559b1be94b4f7dcccd5978f2a14a5cc7453802c SHA256 5052af65ce3dc979f90cc140b669bc94e46f7a78884f6a5239d97d0212c953b1
-MD5 6ececda19ef28c6068f867a1f85ba19b xscreensaver-5.00.ebuild 4708
-RMD160 f1afdb9a5d5bbd8f0f8f0f3c48a832e497c96b2c xscreensaver-5.00.ebuild 4708
-SHA256 5052af65ce3dc979f90cc140b669bc94e46f7a78884f6a5239d97d0212c953b1 xscreensaver-5.00.ebuild 4708
-MISC ChangeLog 24705 RMD160 2e396570218b9f020caf9f2b41e82b7ab7f96383 SHA1 e49cdc58d6d96abb87b2224be546c1430abb71b7 SHA256 46a6a87f96deb0752f6237d043cedba36bac0533ff885437c3d185a7d7d2899e
-MD5 68de48bb38bed3abdb3c4ce828de6b3e ChangeLog 24705
-RMD160 2e396570218b9f020caf9f2b41e82b7ab7f96383 ChangeLog 24705
-SHA256 46a6a87f96deb0752f6237d043cedba36bac0533ff885437c3d185a7d7d2899e ChangeLog 24705
+EBUILD xscreensaver-5.00-r1.ebuild 4836 RMD160 6dd67fc79a436b4ca855ebd20db6b1a63497131d SHA1 76894384dac2c9df3f28306ef4ad112b228b7c05 SHA256 a67628bb9d10397a5fac62132e9d10d3cc6c659241ef2fc85758272990b0bdf2
+MD5 6492960a60eedc9b38a4f8f5fbd309f0 xscreensaver-5.00-r1.ebuild 4836
+RMD160 6dd67fc79a436b4ca855ebd20db6b1a63497131d xscreensaver-5.00-r1.ebuild 4836
+SHA256 a67628bb9d10397a5fac62132e9d10d3cc6c659241ef2fc85758272990b0bdf2 xscreensaver-5.00-r1.ebuild 4836
+MISC ChangeLog 25030 RMD160 565ae87ed30d18dd78c6090cd5fcb7b44af54b30 SHA1 01358542f36ed257c1c6529830bb713a30fbf328 SHA256 38dae26931e781eb493541b1023ae12ded67e4a35d887ff91a6c6d5e2b94bcbf
+MD5 b9fe4c728be69344f3b0ae09b69ed04d ChangeLog 25030
+RMD160 565ae87ed30d18dd78c6090cd5fcb7b44af54b30 ChangeLog 25030
+SHA256 38dae26931e781eb493541b1023ae12ded67e4a35d887ff91a6c6d5e2b94bcbf ChangeLog 25030
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -111,6 +118,13 @@ SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/di
 MD5 99d549469ab8a46ee2eb889208d1fb3c files/digest-xscreensaver-4.24 256
 RMD160 3a41fe3bf7d8364e1940c2496bee84bfc0892f38 files/digest-xscreensaver-4.24 256
 SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/digest-xscreensaver-4.24 256
-MD5 25589d3b5c32825b66ba9676e0d2ad01 files/digest-xscreensaver-5.00 256
-RMD160 b132ef56665cf2e1c437724a4d908d0457210ab6 files/digest-xscreensaver-5.00 256
-SHA256 d8690348f22d988fb3f25fc858fd7c83a1be057c7a4feda8ba9114a6d0aa0f5f files/digest-xscreensaver-5.00 256
+MD5 25589d3b5c32825b66ba9676e0d2ad01 files/digest-xscreensaver-5.00-r1 256
+RMD160 b132ef56665cf2e1c437724a4d908d0457210ab6 files/digest-xscreensaver-5.00-r1 256
+SHA256 d8690348f22d988fb3f25fc858fd7c83a1be057c7a4feda8ba9114a6d0aa0f5f files/digest-xscreensaver-5.00-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE+qW+go/w9rxVVVERAi9wAKDCb66huOvLiYgbrTXW7VwfRv1UVQCglsyW
+8N3BfoNGF04thgyaBntHyjY=
+=cxGR
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.00 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.00
deleted file mode 100644
index a3b7450ad65a..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c26877fb0acd508b9a726dce6a77f78 xscreensaver-5.00.tar.gz 5263478
-RMD160 7630ff42cfd24557cf1459902ddc6256004fc938 xscreensaver-5.00.tar.gz 5263478
-SHA256 976e888bead1185ce3116a92df2829f9fe93061d0539f5d8036ca0ddc016d80f xscreensaver-5.00.tar.gz 5263478
diff --git a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
deleted file mode 100644
index ee86609282ff..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00.ebuild,v 1.5 2006/07/21 08:17:22 nelchael Exp $
-
-inherit eutils flag-o-matic pam fixheadtails autotools
-
-IUSE="gnome jpeg insecure-savers new-login nls offensive opengl pam xinerama"
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		x11-apps/appres
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
-	media-libs/netpbm
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-1.99
-	>=dev-libs/glib-2
-	pam? ( virtual/pam )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl
-	          >=media-libs/gle-3.0.1 )
-	!arm? ( new-login? ( gnome-base/gdm ) )"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
-	sys-devel/bc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-# simple workaround for the flurry screensaver
-filter-flags -mabi=altivec
-filter-flags -maltivec
-append-flags -U__VEC__
-
-pkg_setup() {
-
-	if use arm && use new-login; then
-		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
-		ewarn "available for the arm platform. please disable this use flag"
-		die "new-login USE is not supported on arm"
-	fi
-
-}
-
-src_unpack() {
-
-	unpack "${A}"
-	cd "${S}"
-
-	# Bug fixes:
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
-
-	eautoreconf
-
-	# change old head/tail to POSIX ones
-	ht_fix_all
-
-}
-
-src_compile() {
-
-	unset BC_ENV_ARGS
-	econf \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-includes=/usr/include \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		--with-gtk \
-		--with-xml \
-		--without-kerberos \
-		$(use_with insecure-savers setuid-hacks) \
-		$(use_with new-login login-manager) \
-		$(use_with xinerama xinerama-ext) \
-		$(use_with pam) \
-		$(use_with opengl gl) $(use_with opengl gle) \
-		$(use_with jpeg) \
-		$(use_enable nls) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
-
-	make install_prefix="${D}" install || die "make install failed"
-
-	dodoc README
-
-	# install correctly in gnome, including info about configuration preferences
-	if use gnome ; then
-
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-
-		newicon "${S}/utils/images/logo-50.xpm" xscreensaver.xpm
-
-		dodir /usr/share/control-center-2.0/capplets
-		insinto /usr/share/control-center-2.0/capplets
-		newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
-
-	fi
-
-	# Remove "extra" capplet
-	rm -f "${D}/usr/share/applications/gnome-screensaver-properties.desktop"
-
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
-
-	# Fix bug #135549:
-	rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
-	rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
-	dodir /usr/share/man/man6x
-	mv "${D}/usr/share/man/man6/worm.6" \
-		"${D}/usr/share/man/man6x/worm.6x"
-
-}
-
-pkg_postinst() {
-
-	if ! use new-login; then
-		einfo
-		einfo "You have chosen to not use the new-login USE flag."
-		einfo "This is a new USE flag which enables individuals to"
-		einfo "create new logins when the screensaver is active,"
-		einfo "allowing others to use their account, even though the"
-		einfo "screen is locked to another account. If you want this"
-		einfo "feature, please recompile with USE=\"new-login\"."
-		einfo
-	fi
-
-	if use insecure-savers;then
-		ewarn
-		ewarn "You have chosen USE=insecure-savers. While upstream"
-		ewarn "has made every effort to make sure these savers do not"
-		ewarn "abuse their setuid root status, the possibilty exists that"
-		ewarn "someone will exploit xscreensaver and will be able to gain"
-		ewarn "root privileges. You have been warned."
-		ewarn
-	fi
-
-	ewarn
-	ewarn "In XScreenSaver 5.00 API was changed. All third party screen savers"
-	ewarn "need to be ported to the new API. Until then they will not work."
-	ewarn
-	epause
-
-}