Add a patch for hypertorus hack, see bug #154444.

Package-Manager: portage-2.1.2_rc1-r5

3 files changed, 18 insertions, 199 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4184b07501e8..16fba9dae9ab 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -45,6 +45,10 @@ AUX xscreensaver-5.01-gentoo.patch 6361 RMD160 39a88128072ce5a16e14ef92ceb8a5b10
 MD5 ace9e196f6ff547af4d792225ad50597 files/xscreensaver-5.01-gentoo.patch 6361
 RMD160 39a88128072ce5a16e14ef92ceb8a5b106e92eef files/xscreensaver-5.01-gentoo.patch 6361
 SHA256 f8398a05d1b17a35a4247e2c24ea36d90b63f0772e2bcacc3482879c15073fe2 files/xscreensaver-5.01-gentoo.patch 6361
+AUX xscreensaver-5.01-hypertorus.xml.patch 681 RMD160 7b45181f7bc68f4545cdf60dbe2941eefab3353c SHA1 93b851f4097dc9a3efabf433dc711bf61ada95b0 SHA256 86dbb79f434281f83c95fd701540fa50098af60973ed1346fdc4df7578133bc9
+MD5 56c73f13853fa3f6d23b2404622fc5c7 files/xscreensaver-5.01-hypertorus.xml.patch 681
+RMD160 7b45181f7bc68f4545cdf60dbe2941eefab3353c files/xscreensaver-5.01-hypertorus.xml.patch 681
+SHA256 86dbb79f434281f83c95fd701540fa50098af60973ed1346fdc4df7578133bc9 files/xscreensaver-5.01-hypertorus.xml.patch 681
 AUX xscreensaver-5.01-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad SHA1 eb2465eb92bc8ad696cb6413cfd0d8c211ad1df6 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d
 MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673
@@ -60,14 +64,14 @@ EBUILD xscreensaver-5.00-r1.ebuild 4775 RMD160 c7d9ba7680f4ae63ae8cd3b4968d59e69
 MD5 eeeec7ff45fc56fa91cc9776999663b6 xscreensaver-5.00-r1.ebuild 4775
 RMD160 c7d9ba7680f4ae63ae8cd3b4968d59e69f1e1b91 xscreensaver-5.00-r1.ebuild 4775
 SHA256 920ccb253cde9dc394036926694395e8bc1fa885f6ef7cc2b1d83242da6d72aa xscreensaver-5.00-r1.ebuild 4775
-EBUILD xscreensaver-5.01-r1.ebuild 4835 RMD160 90a8c7be5f46de909a1c3799e22632045fc62ec6 SHA1 bacdfbb9841082cafef25b4633ca53192b4a53ee SHA256 9bac0c7b454573c95c6e04009874c1f5518b64b31d01be20304249dc7e2d7ee1
-MD5 5bdd0a63e7ce229023eed8d51a25fe00 xscreensaver-5.01-r1.ebuild 4835
-RMD160 90a8c7be5f46de909a1c3799e22632045fc62ec6 xscreensaver-5.01-r1.ebuild 4835
-SHA256 9bac0c7b454573c95c6e04009874c1f5518b64b31d01be20304249dc7e2d7ee1 xscreensaver-5.01-r1.ebuild 4835
-MISC ChangeLog 26914 RMD160 4654c4cb7524b81f44c23735adc5f1ef4a13501c SHA1 0f7ceb7129b0e5553fd8065ee5758b2500ad2193 SHA256 6006ec4395aae2e03e8ae36a1e1808adafa3ab6362e20eb8b2fbf9ed32af4b56
-MD5 88aa9d9f840ac47ccd69ee380a03077b ChangeLog 26914
-RMD160 4654c4cb7524b81f44c23735adc5f1ef4a13501c ChangeLog 26914
-SHA256 6006ec4395aae2e03e8ae36a1e1808adafa3ab6362e20eb8b2fbf9ed32af4b56 ChangeLog 26914
+EBUILD xscreensaver-5.01-r2.ebuild 4922 RMD160 76aa8a194623921c0435e8ecada6c58e2c427a1f SHA1 9ca5d0b2ce5871fb585d6246c579d1ebd82c8d00 SHA256 e019f823e11ce39eb722b89245d971646ecf681b74fb7d8231b04cbddf11f218
+MD5 691eb2536d4e1aa3038cc42eb0f207fa xscreensaver-5.01-r2.ebuild 4922
+RMD160 76aa8a194623921c0435e8ecada6c58e2c427a1f xscreensaver-5.01-r2.ebuild 4922
+SHA256 e019f823e11ce39eb722b89245d971646ecf681b74fb7d8231b04cbddf11f218 xscreensaver-5.01-r2.ebuild 4922
+MISC ChangeLog 27218 RMD160 3c69d754e57a3531ab80fe3ae0747ba002737c6d SHA1 377b3890e41c175401cbdf72bead3967bd3b4c58 SHA256 ac04b9417efe41bfbdc1eb97ddfb5387af71cad55975648c4d3ec7d691a837e3
+MD5 81ffce8f3977faca65f48e239c531638 ChangeLog 27218
+RMD160 3c69d754e57a3531ab80fe3ae0747ba002737c6d ChangeLog 27218
+SHA256 ac04b9417efe41bfbdc1eb97ddfb5387af71cad55975648c4d3ec7d691a837e3 ChangeLog 27218
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -78,13 +82,13 @@ SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/di
 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
-MD5 89fc92ae4e5d4497f70455ee093619f0 files/digest-xscreensaver-5.01-r1 256
-RMD160 53c251e5b5844a380105b5fdb5a61bab05723fa2 files/digest-xscreensaver-5.01-r1 256
-SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/digest-xscreensaver-5.01-r1 256
+MD5 89fc92ae4e5d4497f70455ee093619f0 files/digest-xscreensaver-5.01-r2 256
+RMD160 53c251e5b5844a380105b5fdb5a61bab05723fa2 files/digest-xscreensaver-5.01-r2 256
+SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/digest-xscreensaver-5.01-r2 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTH0PamhnQswr0vIRAp0YAJ9uVyzpq/9qUQXNXhIh5z+cZtwW4wCfazNU
-X7qZ9hGYnMmBVTHDK9f3uZU=
-=hM4N
+iD8DBQFFUbg2go/w9rxVVVERAtB7AJ0UZIbWES04f1vZUp9dslLLgym3nQCfWLlm
+yOmN+sSmFPkRYqTHpP8+CjY=
+=GaDe
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r1
deleted file mode 100644
index c9457d751787..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b60abc52b39591750f48f9c9f20c4167 xscreensaver-5.01.tar.gz 5270954
-RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b xscreensaver-5.01.tar.gz 5270954
-SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf xscreensaver-5.01.tar.gz 5270954
diff --git a/x11-misc/xscreensaver/xscreensaver-5.01-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01-r1.ebuild
deleted file mode 100644
index 2f4abc2b7039..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.01-r1.ebuild
+++ /dev/null
@@ -1,182 +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.01-r1.ebuild,v 1.1 2006/10/28 12:29:24 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 ~x86-fbsd"
-SLOT="0"
-
-RDEPEND="x11-libs/libXxf86misc
-	x11-apps/xwininfo
-	x11-apps/appres
-	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 )
-	xinerama? ( x11-libs/libXinerama )
-	!arm? ( new-login? ( gnome-base/gdm ) )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	x11-proto/scrnsaverproto
-	x11-proto/recordproto
-	x11-proto/xf86miscproto
-	sys-devel/bc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-proto/xineramaproto )"
-
-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() {
-
-	# simple workaround for the flurry screensaver
-	filter-flags -mabi=altivec
-	filter-flags -maltivec
-	append-flags -U__VEC__
-
-	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"
-
-	# Fix bug #152250:
-	dodir "/usr/share/X11/app-defaults"
-	mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
-		"${D}/usr/share/X11/app-defaults/XScreenSaver" || die "mv failed"
-
-}
-
-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
-
-}