[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/

[Jeroen Roovers]

commit:     d6f8b5d7f3adf8077e4976d9edbe7714d0c8386f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 15:45:05 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 15:47:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f8b5d7

x11-misc/xscreensaver: Use the 24 May 2016 version 5.35 (bug #596458 by Blake 
Leverett).

Package-Manager: portage-2.3.1
RepoMan-Options: --force

 x11-misc/xscreensaver/Manifest                                          | 2 +-
 .../{xscreensaver-5.35-r1.ebuild => xscreensaver-5.35-r2.ebuild}        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 6a85174..0d2d19f 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1,2 @@
 DIST xscreensaver-5.34.tar.gz 10788657 SHA256 
6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 
58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75
 WHIRLPOOL 
c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419
-DIST xscreensaver-5.35.tar.gz 10502254 SHA256 
477882be0d829050c0883e4d7e3d08603857b019b79ad358948e45158f876e66 SHA512 
c2b9c766b240439b472e9d2d85d2bbdb883fcc1803b1302d8c273e3fa7b3319a245f6d1c8f79c383c2f04ab9d19fc0f7d1302dadbb254e12c46d7309f051cfad
 WHIRLPOOL 
b97e6ebc0e368e75a02fdb793a9ac9c81fb1b505cce3a1b73679143b82efc6561769743aff0b77ee40251d63a0a1b7eb73d8ff7870e663fe9e6c45a1e8fd9594
+DIST xscreensaver-5.35.tar.gz 10502468 SHA256 
1e6c8471a9af4862f38a6dd5c6e61fe12b052d35af44b2941904c6e333586b22 SHA512 
3be3445c8cb4c6f88f713ead2bda4c74387558c7ceb0a2be47925d75b6fba585b9ae4c56c03060eb2e543e29b5b46e65c0d9ef469e73d25eeb5d97ba4ee58dcd
 WHIRLPOOL 
0a528126107d3ba77cd9b051b12c03a833b71ab0f4ede14f99e2ec755ecf72fa9e196daaafe0a64eb1785235b845a3f27f8008c64049c7b9be50fc52872063e1

diff --git a/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
similarity index 98%
rename from x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
index 84045fd..6da7fad 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.35-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.35-r2.ebuild
@@ -85,7 +85,6 @@ src_prepare() {
                "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
                "${FILESDIR}"/${PN}-5.28-comment-style.patch \
                "${FILESDIR}"/${PN}-5.31-pragma.patch \
-               "${FILESDIR}"/${PN}-5.35-comments.patch \
                "${FILESDIR}"/${PN}-5.35-gentoo.patch
 
        use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch