Stop using hypertorus.xml patch since it was fixed differently. Bug 154444.

Package-Manager: portage-2.1.2.9

5 files changed, 24 insertions, 29 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 1ceaf6854722..62e7e7885d5d 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.186 2007/06/09 10:39:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.187 2007/06/13 18:44:46 drac Exp $
+
+  13 Jun 2007; Samuli Suominen <drac@gentoo.org> xscreensaver-5.02.ebuild,
+  xscreensaver-5.02-r1.ebuild, xscreensaver-5.02-r2.ebuild:
+  Stop using hypertorus.xml patch since it was fixed differently. Bug 154444.
 
   09 Jun 2007; Samuli Suominen <drac@gentoo.org>
   xscreensaver-5.02-r2.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3bf5bc40a248..3eaf408aae4e 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -32,22 +32,22 @@ EBUILD xscreensaver-5.01-r2.ebuild 4795 RMD160 eba906ba1899b08a68f853120a86f48df
 MD5 0c4b5906c3e34accbd9aa89563932cce xscreensaver-5.01-r2.ebuild 4795
 RMD160 eba906ba1899b08a68f853120a86f48df0cce921 xscreensaver-5.01-r2.ebuild 4795
 SHA256 326dde6bb3df4672f82cce43dafe7bafcf74b3abe76ced06ab7b84f5bce79f53 xscreensaver-5.01-r2.ebuild 4795
-EBUILD xscreensaver-5.02-r1.ebuild 4665 RMD160 56255b5c32bc39d13dce03f666772b855a508f8d SHA1 df9d2583cb25fedf70e9e7220af8128c75f8662e SHA256 3995dcffd0cf85754573ec78f4e16804b47d1e344d392bf37bb59890c76fa22a
-MD5 0171ca7c0747a4548570aa85c3304ddf xscreensaver-5.02-r1.ebuild 4665
-RMD160 56255b5c32bc39d13dce03f666772b855a508f8d xscreensaver-5.02-r1.ebuild 4665
-SHA256 3995dcffd0cf85754573ec78f4e16804b47d1e344d392bf37bb59890c76fa22a xscreensaver-5.02-r1.ebuild 4665
-EBUILD xscreensaver-5.02-r2.ebuild 4743 RMD160 d6804016af84f89ca484df960dc9d901874cd3a0 SHA1 d1f2bb8e0424c450c9fdb7b06dd39c9d7741c9e7 SHA256 df9e674255e95c0ef4c2cd58eb4dbc9ab6cb3834cbc3e92bda048a432599ccb4
-MD5 317878b5ca7804e5f7da128719c385bb xscreensaver-5.02-r2.ebuild 4743
-RMD160 d6804016af84f89ca484df960dc9d901874cd3a0 xscreensaver-5.02-r2.ebuild 4743
-SHA256 df9e674255e95c0ef4c2cd58eb4dbc9ab6cb3834cbc3e92bda048a432599ccb4 xscreensaver-5.02-r2.ebuild 4743
-EBUILD xscreensaver-5.02.ebuild 4608 RMD160 6e31c496d2666a2dde2f6ff79b501b82f1d7f698 SHA1 d588569f58cb79cf6d0b9981daeb2356df37b3e7 SHA256 433d510dcf39ba4b539692783cd4915c5a5a3876dce124eaa32dd2d7d61ddc8d
-MD5 11d17232397f3864648a39be55209d12 xscreensaver-5.02.ebuild 4608
-RMD160 6e31c496d2666a2dde2f6ff79b501b82f1d7f698 xscreensaver-5.02.ebuild 4608
-SHA256 433d510dcf39ba4b539692783cd4915c5a5a3876dce124eaa32dd2d7d61ddc8d xscreensaver-5.02.ebuild 4608
-MISC ChangeLog 30945 RMD160 f717a502cd7f57f1533b7d4138f28ae0a41bb889 SHA1 92f86585f336342d7f2087728b133b3370697dbc SHA256 ab6eda34569a20a9b019925e16cab31389d388858cd1faf1acac43c69f7802ef
-MD5 180e2cc8c7c26aab6c65555a76b5ce0f ChangeLog 30945
-RMD160 f717a502cd7f57f1533b7d4138f28ae0a41bb889 ChangeLog 30945
-SHA256 ab6eda34569a20a9b019925e16cab31389d388858cd1faf1acac43c69f7802ef ChangeLog 30945
+EBUILD xscreensaver-5.02-r1.ebuild 4572 RMD160 39b2de5bb79b060353ac12399c6a2219b15da9df SHA1 f3fc65dfb47dd50273f00e96403e793f8ed2488f SHA256 961900e8a5eaeff16c54014a5788ffd6db1043c0e665d8da9a2de562611654c1
+MD5 63d019e2a96b0f5e2d599ea821baf36c xscreensaver-5.02-r1.ebuild 4572
+RMD160 39b2de5bb79b060353ac12399c6a2219b15da9df xscreensaver-5.02-r1.ebuild 4572
+SHA256 961900e8a5eaeff16c54014a5788ffd6db1043c0e665d8da9a2de562611654c1 xscreensaver-5.02-r1.ebuild 4572
+EBUILD xscreensaver-5.02-r2.ebuild 4650 RMD160 47ffcf64f394f88ef3e5cb9612568b72f8fee95d SHA1 60170879061d7bb9394095f05a9a917f027bcf07 SHA256 cb2bf098f6fc040752325cecdc46eb81a00f8b2b5bc2170c3274219cb4687fd0
+MD5 b9ce935d57c1a1b6cceb68ace3ba955e xscreensaver-5.02-r2.ebuild 4650
+RMD160 47ffcf64f394f88ef3e5cb9612568b72f8fee95d xscreensaver-5.02-r2.ebuild 4650
+SHA256 cb2bf098f6fc040752325cecdc46eb81a00f8b2b5bc2170c3274219cb4687fd0 xscreensaver-5.02-r2.ebuild 4650
+EBUILD xscreensaver-5.02.ebuild 4515 RMD160 d7082d9644102390e5a33bde445185084b1c6bdf SHA1 f14594ec10f3c78687764b845481ada7ab2de48f SHA256 94d629e5f4c1c67528ac66f2f716d65817deda44d44d59e2b2d5dc186f8f5c6a
+MD5 c15604350570c11f85c114e7dd7810d8 xscreensaver-5.02.ebuild 4515
+RMD160 d7082d9644102390e5a33bde445185084b1c6bdf xscreensaver-5.02.ebuild 4515
+SHA256 94d629e5f4c1c67528ac66f2f716d65817deda44d44d59e2b2d5dc186f8f5c6a xscreensaver-5.02.ebuild 4515
+MISC ChangeLog 31159 RMD160 29bd8b29008af74e5944810c86cf452c4de51c6b SHA1 bada1a53a58dab62fee612e8765c82f1a0b165cd SHA256 1c48878f8494fe33be5a286e6764498e1aa900587a310a78207e2d1480585474
+MD5 7bf506bb4a7c296066b41db576213b21 ChangeLog 31159
+RMD160 29bd8b29008af74e5944810c86cf452c4de51c6b ChangeLog 31159
+SHA256 1c48878f8494fe33be5a286e6764498e1aa900587a310a78207e2d1480585474 ChangeLog 31159
 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360
 MD5 44efda022b0c02da6c8b2096905feae9 metadata.xml 387
 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 metadata.xml 387
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
index 7d83d604a8c2..bf99e3d7975f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild,v 1.4 2007/06/07 18:46:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild,v 1.5 2007/06/13 18:44:46 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -50,9 +50,6 @@ src_unpack() {
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
 
-	# Fix bug #154444 - hypertorus hack:
-	epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
 	epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
 
 	eautoreconf
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
index c43a046e5b6c..d893740650d6 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.2 2007/06/09 10:39:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.3 2007/06/13 18:44:46 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -49,9 +49,6 @@ src_unpack() {
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
 
-	# Fix bug #154444 - hypertorus hack:
-	epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
 	epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
 
 	# bug 180542. fix for segmentation fault with non-interactive pam.
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
index 6c53b8b6f5c1..42b057d701cd 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.10 2007/05/24 12:24:41 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.11 2007/06/13 18:44:46 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -50,9 +50,6 @@ src_unpack() {
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
 
-	# Fix bug #154444 - hypertorus hack:
-	epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
 	eautoreconf
 
 	# change old head/tail to POSIX ones