From 19506d02d8a45100bbd775e782b453a49c7c0b69 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 30 Dec 2007 19:39:32 +0000 Subject: Version bump. Use global use flag for setuid screensavers. Use up to date .desktop file from tarball patched to f.d.o desktop entry standard. Pass --with-x-app-defaults to econf instead of moving files around in D. Remove old version. Package-Manager: portage-2.1.4_rc11 --- x11-misc/xscreensaver/ChangeLog | 15 +- x11-misc/xscreensaver/Manifest | 54 +++---- .../xscreensaver/files/digest-xscreensaver-5.02-r2 | 3 - .../xscreensaver/files/digest-xscreensaver-5.04 | 3 + .../files/xscreensaver-5.02-gdmflexiserver.patch | 12 -- .../files/xscreensaver-5.02-nsfw.patch | 158 --------------------- .../xscreensaver/files/xscreensaver-5.02-pam.patch | 13 -- .../files/xscreensaver-5.04-desktop-entry.patch | 14 ++ .../files/xscreensaver-5.04-nsfw.patch | 158 +++++++++++++++++++++ x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild | 157 -------------------- x11-misc/xscreensaver/xscreensaver-5.04.ebuild | 122 ++++++++++++++++ 11 files changed, 331 insertions(+), 378 deletions(-) delete mode 100644 x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 create mode 100644 x11-misc/xscreensaver/files/digest-xscreensaver-5.04 delete mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch delete mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch delete mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch create mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch create mode 100644 x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch delete mode 100644 x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild create mode 100644 x11-misc/xscreensaver/xscreensaver-5.04.ebuild (limited to 'x11-misc') diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 5300cf5245fb..080f56310d0d 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,19 @@ # 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.204 2007/11/20 05:25:55 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.205 2007/12/30 19:39:31 drac Exp $ + +*xscreensaver-5.04 (30 Dec 2007) + + 30 Dec 2007; Samuli Suominen + -files/xscreensaver-5.02-gdmflexiserver.patch, + -files/xscreensaver-5.02-nsfw.patch, -files/xscreensaver-5.02-pam.patch, + +files/xscreensaver-5.04-desktop-entry.patch, + +files/xscreensaver-5.04-nsfw.patch, -xscreensaver-5.02-r2.ebuild, + +xscreensaver-5.04.ebuild: + Version bump. Use global use flag for setuid screensavers. Use up to date + .desktop file from tarball patched to f.d.o desktop entry standard. Pass + --with-x-app-defaults to econf instead of moving files around in D. Remove + old version. 20 Nov 2007; Joshua Kinard xscreensaver-5.03.ebuild: Stable on mips, per #195253. diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index b9ab35b29d74..ec4bdfb132fe 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,58 +1,44 @@ ------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 SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd files/desktop_entries/screensaver-properties.desktop 1000 -AUX xscreensaver-5.02-gdmflexiserver.patch 502 RMD160 0464f2947b45a35fa5637b2a2a9844643ee0abd5 SHA1 d9816a534afdc7aaf29ea85ec5ccfcf25e90fafb SHA256 be09476349915072b2ebf6343aff9557b556a90bcb599b63e1f90ce1a85c58ae -MD5 bd96031a45071588407c6a224ba35fd1 files/xscreensaver-5.02-gdmflexiserver.patch 502 -RMD160 0464f2947b45a35fa5637b2a2a9844643ee0abd5 files/xscreensaver-5.02-gdmflexiserver.patch 502 -SHA256 be09476349915072b2ebf6343aff9557b556a90bcb599b63e1f90ce1a85c58ae files/xscreensaver-5.02-gdmflexiserver.patch 502 AUX xscreensaver-5.02-gentoo.patch 5731 RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 SHA1 8f3a08256907d0fe45eb75140843c9db8db3de88 SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73 MD5 ab024a914f004a958a01c6f61be3f3c9 files/xscreensaver-5.02-gentoo.patch 5731 RMD160 01d82a320dfcddfa0b5870c395d2334dc49e8af4 files/xscreensaver-5.02-gentoo.patch 5731 SHA256 a5055ebfd350d236daa6625700dfdf1e638aea90f5472a3d700020c3ea303d73 files/xscreensaver-5.02-gentoo.patch 5731 -AUX xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 SHA1 25060506a26d6e406622fcc38b6c7899e662b0e8 SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40 -MD5 2ff74ddf7eaa13452ded84caeed509f6 files/xscreensaver-5.02-nsfw.patch 7020 -RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 files/xscreensaver-5.02-nsfw.patch 7020 -SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40 files/xscreensaver-5.02-nsfw.patch 7020 -AUX xscreensaver-5.02-pam.patch 358 RMD160 94fe95bd7c37afd5917cff9e313cbbf90e553efb SHA1 15851e6da8df5aa50158786a1400b676556ed104 SHA256 2bd73cdea88eed6fa2ee31de2a9eaf76435a0110ac3c12bdb0062e74cca4c958 -MD5 77f3bc0683305f7f2312b5b64d36d4f7 files/xscreensaver-5.02-pam.patch 358 -RMD160 94fe95bd7c37afd5917cff9e313cbbf90e553efb files/xscreensaver-5.02-pam.patch 358 -SHA256 2bd73cdea88eed6fa2ee31de2a9eaf76435a0110ac3c12bdb0062e74cca4c958 files/xscreensaver-5.02-pam.patch 358 AUX xscreensaver-5.03-nsfw.patch 6541 RMD160 7730170a441d7666233cdfe66dbebc738116f5d2 SHA1 bf0309dcbafed19cf178b6b38d46ebd45f80d865 SHA256 5d91ce4e3c654ea98c7d3c453a108f6eaf7057d23e5e52dc0567a80f9fb7879a MD5 28b5da14aa37fa68673a6a389b332618 files/xscreensaver-5.03-nsfw.patch 6541 RMD160 7730170a441d7666233cdfe66dbebc738116f5d2 files/xscreensaver-5.03-nsfw.patch 6541 SHA256 5d91ce4e3c654ea98c7d3c453a108f6eaf7057d23e5e52dc0567a80f9fb7879a files/xscreensaver-5.03-nsfw.patch 6541 -DIST xscreensaver-5.02.tar.gz 5371759 RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 SHA1 3e02f516efc25755f1a89f5af3983423f639f82b SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d +AUX xscreensaver-5.04-desktop-entry.patch 636 RMD160 b784667858307267ef146d353616897277f1ee84 SHA1 12073dea7320220e7971058a0022054c7dff37e1 SHA256 85e23a898aced1f7497f71fed00d7556be7378ff5e755655b5ead3c15d7d8743 +MD5 1aeb373d5be04735f27203a2aa5b34d1 files/xscreensaver-5.04-desktop-entry.patch 636 +RMD160 b784667858307267ef146d353616897277f1ee84 files/xscreensaver-5.04-desktop-entry.patch 636 +SHA256 85e23a898aced1f7497f71fed00d7556be7378ff5e755655b5ead3c15d7d8743 files/xscreensaver-5.04-desktop-entry.patch 636 +AUX xscreensaver-5.04-nsfw.patch 7068 RMD160 c03aaa7bc15d1813db382318cb017e8c33e98d99 SHA1 7239231e337540c2c99802951bf6e681e2c68297 SHA256 01a8a4495175c56888a0648a898475fde9ea67d1887ecb78624e57cf1def38fb +MD5 3c1ec7cf5084e4f4c0114c6484a80d8d files/xscreensaver-5.04-nsfw.patch 7068 +RMD160 c03aaa7bc15d1813db382318cb017e8c33e98d99 files/xscreensaver-5.04-nsfw.patch 7068 +SHA256 01a8a4495175c56888a0648a898475fde9ea67d1887ecb78624e57cf1def38fb files/xscreensaver-5.04-nsfw.patch 7068 DIST xscreensaver-5.03.tar.gz 5412089 RMD160 f28aca829982c9b9b1989f03309e48fdbdc8e2de SHA1 e283a52faf6148273a82a9e5c9ed70c5722cdcb8 SHA256 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26 -EBUILD xscreensaver-5.02-r2.ebuild 4551 RMD160 9b33dcfdc20c1963b1a3334cffb5812ce81b3dce SHA1 bd4eec4e3ae36bb9e24f15585e23236c62e998de SHA256 d6ee0323fcec042ed8d53a74880940d99e765f474b0a1d62def723f5e995ac92 -MD5 c270e07b5dd2ed1f2167ccca3f53945f xscreensaver-5.02-r2.ebuild 4551 -RMD160 9b33dcfdc20c1963b1a3334cffb5812ce81b3dce xscreensaver-5.02-r2.ebuild 4551 -SHA256 d6ee0323fcec042ed8d53a74880940d99e765f474b0a1d62def723f5e995ac92 xscreensaver-5.02-r2.ebuild 4551 +DIST xscreensaver-5.04.tar.gz 5438905 RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 SHA1 1733ba7ee46b758453ef9ded0fc4ee084b7420a9 SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7 EBUILD xscreensaver-5.03.ebuild 4475 RMD160 72bfbe6fd349d3d35af9ce7d1501dff553a56187 SHA1 8b623c40d88d037f7aad8c9e36a5850f46b3200d SHA256 f7279fa3d14a512710a653bcdabc27258eeaff267b3cf2d1f8916e0e6b0c91dd MD5 1f7365b42242eefaba3aa81b4d26f2c1 xscreensaver-5.03.ebuild 4475 RMD160 72bfbe6fd349d3d35af9ce7d1501dff553a56187 xscreensaver-5.03.ebuild 4475 SHA256 f7279fa3d14a512710a653bcdabc27258eeaff267b3cf2d1f8916e0e6b0c91dd xscreensaver-5.03.ebuild 4475 -MISC ChangeLog 33267 RMD160 933a6eafed6b5f4234410d0ec062442ed6a3a7d2 SHA1 6346e4d7e0fc1fc5e30308732a6bb2a6687a171a SHA256 c5b988d0e01becff1f515a508f9c54626eb35ecdabc6b897dc702ed9bb7cf713 -MD5 2e81588b7fa092e41c4844e6ea948b8f ChangeLog 33267 -RMD160 933a6eafed6b5f4234410d0ec062442ed6a3a7d2 ChangeLog 33267 -SHA256 c5b988d0e01becff1f515a508f9c54626eb35ecdabc6b897dc702ed9bb7cf713 ChangeLog 33267 +EBUILD xscreensaver-5.04.ebuild 3274 RMD160 7d54cdf1afcbad4555c1c29c950e5fab02778da1 SHA1 0fc565f2a1eb84d22fa9cfebcdbe05651e79ea0c SHA256 fcfe50d512f004fb3093725a980163091a8f3d04bebd65ff4ac2e4b762c8099e +MD5 16e2106a058c61d50becd4716e823463 xscreensaver-5.04.ebuild 3274 +RMD160 7d54cdf1afcbad4555c1c29c950e5fab02778da1 xscreensaver-5.04.ebuild 3274 +SHA256 fcfe50d512f004fb3093725a980163091a8f3d04bebd65ff4ac2e4b762c8099e xscreensaver-5.04.ebuild 3274 +MISC ChangeLog 33863 RMD160 fcccf5956b32c5fd3f22d55fea36d4ca7a216227 SHA1 aa8dee0a8ba35f17c24ba9b2d00bb40bb031f5bb SHA256 7ea847f4b874a793d85fe299f41f430a8925dab9f9831afada4fbf14ac6cd011 +MD5 f113e496e7962cf52c89e0ba1b769a52 ChangeLog 33863 +RMD160 fcccf5956b32c5fd3f22d55fea36d4ca7a216227 ChangeLog 33863 +SHA256 7ea847f4b874a793d85fe299f41f430a8925dab9f9831afada4fbf14ac6cd011 ChangeLog 33863 MISC metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 SHA1 debca11d5df5829ba86249140fdb4f4a42d3103c SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360 MD5 44efda022b0c02da6c8b2096905feae9 metadata.xml 387 RMD160 c34d8cf1f88cf45e7d0b6503f403ab8b8db11b20 metadata.xml 387 SHA256 5ae2b87a5da10d0ec7099d2f48602c4d9c09e0247c0ff85856cf4b944d761360 metadata.xml 387 -MD5 36502656b074298bd4f82303278ce293 files/digest-xscreensaver-5.02-r2 256 -RMD160 91196636c0d193376f6ce7a21720ae4385d60e64 files/digest-xscreensaver-5.02-r2 256 -SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/digest-xscreensaver-5.02-r2 256 MD5 82caac3ed6f83a07288c64daefb57193 files/digest-xscreensaver-5.03 256 RMD160 359617a69dbf49adb94994d5828c9bf9a7735ecd files/digest-xscreensaver-5.03 256 SHA256 5a1407b2a4cd6433097013d06427db0ba73592f23a15d972285a14947b7792a2 files/digest-xscreensaver-5.03 256 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHXxgvp/wUKkr7RBoRAoqgAKC02BeG3N3Z9035H9HOvtY6QMWSHQCgrp1i -nAwGorSTHZLXYwWE+tse4xc= -=xgPF ------END PGP SIGNATURE----- +MD5 b48d8afa06fc12cf43d33b5f9cb6f22c files/digest-xscreensaver-5.04 256 +RMD160 ef7d8b9178c60895c1ef1c2760c06f0e9dd39765 files/digest-xscreensaver-5.04 256 +SHA256 4fee30538d1e9c3bc37019decd789a0cb1ad497e33f2c2928ffa1a183a7b0cb4 files/digest-xscreensaver-5.04 256 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 deleted file mode 100644 index fdfae96d63a8..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz 5371759 -RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 xscreensaver-5.02.tar.gz 5371759 -SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d xscreensaver-5.02.tar.gz 5371759 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.04 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.04 new file mode 100644 index 000000000000..94087f25dcdf --- /dev/null +++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.04 @@ -0,0 +1,3 @@ +MD5 1d27b5ddecdb49c806d1e91ca82fc43e xscreensaver-5.04.tar.gz 5438905 +RMD160 cf8c59a1aff1139c8d205bb734a17bc706f75287 xscreensaver-5.04.tar.gz 5438905 +SHA256 d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7 xscreensaver-5.04.tar.gz 5438905 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch deleted file mode 100644 index 01638d6c2503..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xscreensaver-5.02.orig/configure.in xscreensaver-5.02/configure.in ---- xscreensaver-5.02.orig/configure.in 2007-04-17 07:56:11.000000000 +0300 -+++ xscreensaver-5.02/configure.in 2007-05-11 12:02:20.000000000 +0300 -@@ -2265,7 +2265,7 @@ - - have_login_manager=no - with_login_manager_req=unspecified --default_login_manager='gdmflexiserver -l' -+default_login_manager='gdmflexiserver -ls' - - AC_ARG_WITH(login-manager, - [ --with-login-manager Put a "New Login" button on the unlock dialog that diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch deleted file mode 100644 index ac7a1cf2b9aa..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.02-nsfw.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -ur xscreensaver-5.02.orig/driver/XScreenSaver.ad.in xscreensaver-5.02/driver/XScreenSaver.ad.in ---- xscreensaver-5.02.orig/driver/XScreenSaver.ad.in 2007-04-21 06:33:17.000000000 +0300 -+++ xscreensaver-5.02/driver/XScreenSaver.ad.in 2007-05-01 21:36:47.000000000 +0300 -@@ -302,10 +302,6 @@ - fiberlamp -root \n\ - boxfit -root \n\ - celtic -root \n\ --- default-n: webcollage -root \n\ --- default-n: "WebCollage (whacked)" \ -- webcollage -root -filter \ -- 'vidwhacker -stdin -stdout' \n\ - - default-n: vidwhacker -root \n\ - \ - @GL_KLUDGE@ GL: gears -root \n\ -@@ -488,7 +484,6 @@ - *hacks.xanalogtv.name: XAnalogTV - *hacks.xspirograph.name: XSpiroGraph - *hacks.nerverot.name: NerveRot --*hacks.webcollage.name: WebCollage - *hacks.vidwhacker.name: VidWhacker - *hacks.morph3d.name: Morph3D - *hacks.bubble3d.name: Bubble3D -diff -ur xscreensaver-5.02.orig/hacks/glx/glsnake.c xscreensaver-5.02/hacks/glx/glsnake.c ---- xscreensaver-5.02.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 -+++ xscreensaver-5.02/hacks/glx/glsnake.c 2007-05-01 21:35:04.000000000 +0300 -@@ -565,21 +565,6 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, -- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, -- ZERO, ZERO } -- }, -- { "flaccid penis", -- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, -- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, -- ZERO, ZERO } -- }, -- { "vagina", -- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, -- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, -- PIN, RIGHT, ZERO } -- }, - { "mask", - { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN, - ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO, -@@ -995,9 +980,6 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } -- }, - { "PictureComingSoon", - { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO } - }, -diff -ur xscreensaver-5.02.orig/hacks/Makefile.in xscreensaver-5.02/hacks/Makefile.in ---- xscreensaver-5.02.orig/hacks/Makefile.in 2007-04-21 06:33:23.000000000 +0300 -+++ xscreensaver-5.02/hacks/Makefile.in 2007-05-01 21:33:28.000000000 +0300 -@@ -102,7 +102,7 @@ - blaster.c bumps.c ripples.c xspirograph.c \ - nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \ - rotzoomer.c whirlygig.c speedmine.c vermiculate.c \ -- xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \ -+ xpm-pixmap.c twang.c apollonian.c \ - euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \ - anemone.c halftone.c metaballs.c eruption.c popsquares.c \ - barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \ -@@ -110,9 +110,8 @@ - mismunch.c pacman.c pacman_ai.c pacman_level.c \ - fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ - intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ -- boxfit.c interaggregate.c celtic.c webcollage-cocoa.m \ -- webcollage-helper-cocoa.m --SCRIPTS = vidwhacker webcollage ljlatest -+ boxfit.c interaggregate.c celtic.c -+SCRIPTS = vidwhacker ljlatest - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -140,7 +139,7 @@ - blaster.o bumps.o ripples.o xspirograph.o \ - nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \ - rotzoomer.o whirlygig.o speedmine.o vermiculate.o \ -- xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \ -+ xpm-pixmap.o twang.o apollonian.o \ - euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \ - anemone.o halftone.o metaballs.o eruption.o popsquares.o \ - barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \ -@@ -148,8 +147,7 @@ - mismunch.o pacman.o pacman_ai.o pacman_level.o \ - fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ - intermomentary.o fireworkx.o fiberlamp.o boxfit.o \ -- interaggregate.o celtic.o webcollage-cocoa.o \ -- webcollage-helper-cocoa.o -+ interaggregate.o celtic.o - - NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ - drift flag flame forest vines galaxy grav greynetic halo \ -@@ -173,7 +171,7 @@ - celtic \ - @JPEG_EXES@ - SEXES = sonar --JPEG_EXES = webcollage-helper -+JPEG_EXES = - EXES = $(NEXES) $(SEXES) - - HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ -@@ -209,7 +207,7 @@ - spotlight.man squiral.man starfish.man strange.man \ - swirl.man t3d.man thornbird.man triangle.man truchet.man \ - twang.man vermiculate.man vidwhacker.man vines.man \ -- wander.man webcollage.man whirlwindwarp.man whirlygig.man \ -+ wander.man whirlwindwarp.man whirlygig.man \ - worm.man xflame.man xjack.man xlyap.man xmatrix.man \ - xrayswarm.man xspirograph.man xsublim.man \ - zoom.man halftone.man eruption.man metaballs.man \ -@@ -978,10 +976,6 @@ - xsublim: xsublim.o $(HACK_OBJS_1) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS_1) $(HACK_LIBS) - --webcollage-helper: webcollage-helper.o -- $(CC_HACK) -o $@ $@.o $(XPM_LIBS) $(JPEG_LIBS) -- -- - ############################################################################## - # - # DO NOT DELETE: updated by make distdepend -@@ -2476,17 +2470,6 @@ - wander.o: $(UTILS_SRC)/usleep.h - wander.o: $(UTILS_SRC)/visual.h - wander.o: $(UTILS_SRC)/yarandom.h --webcollage-cocoa.o: ../config.h --webcollage-cocoa.o: $(srcdir)/screenhackI.h --webcollage-cocoa.o: $(srcdir)/screenhack.h --webcollage-cocoa.o: $(UTILS_SRC)/colors.h --webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h --webcollage-cocoa.o: $(UTILS_SRC)/hsv.h --webcollage-cocoa.o: $(UTILS_SRC)/resources.h --webcollage-cocoa.o: $(UTILS_SRC)/usleep.h --webcollage-cocoa.o: $(UTILS_SRC)/visual.h --webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h --webcollage-helper.o: ../config.h - whirlwindwarp.o: ../config.h - whirlwindwarp.o: $(srcdir)/screenhackI.h - whirlwindwarp.o: $(srcdir)/screenhack.h -diff -ur xscreensaver-5.02.orig/po/POTFILES.in xscreensaver-5.02/po/POTFILES.in ---- xscreensaver-5.02.orig/po/POTFILES.in 2007-04-21 06:33:29.000000000 +0300 -+++ xscreensaver-5.02/po/POTFILES.in 2007-05-01 21:35:33.000000000 +0300 -@@ -203,7 +203,6 @@ - hacks/config/vidwhacker.xml - hacks/config/vines.xml - hacks/config/wander.xml --hacks/config/webcollage.xml - hacks/config/whirlwindwarp.xml - hacks/config/whirlygig.xml - hacks/config/worm.xml diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch deleted file mode 100644 index c4653727b2db..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xscreensaver-5.02.orig/driver/lock.c xscreensaver-5.02/driver/lock.c ---- xscreensaver-5.02.orig/driver/lock.c 2007-04-20 13:15:56.000000000 +0300 -+++ xscreensaver-5.02/driver/lock.c 2007-06-06 21:48:51.000000000 +0300 -@@ -2066,7 +2066,8 @@ - } - } - -- destroy_passwd_window (si); -+ if (si->pw_data) -+ destroy_passwd_window (si); - } - - diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch new file mode 100644 index 000000000000..aff293d6e999 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-desktop-entry.patch @@ -0,0 +1,14 @@ +diff -ur xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in xscreensaver-5.04/driver/screensaver-properties.desktop.in +--- xscreensaver-5.04.orig/driver/screensaver-properties.desktop.in 2003-12-15 13:16:12.000000000 +0200 ++++ xscreensaver-5.04/driver/screensaver-properties.desktop.in 2007-12-30 21:00:15.000000000 +0200 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Exec=xscreensaver-demo +-Icon=xscreensaver.xpm ++Icon=xscreensaver + Terminal=false + _Name=Screensaver + _Comment=Change screensaver properties + Type=Application +-Categories=Application;Settings;Appearance;AdvancedSettings; ++Categories=Settings;DesktopSettings;Security; diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch new file mode 100644 index 000000000000..f56f75d5d764 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.04-nsfw.patch @@ -0,0 +1,158 @@ +diff -ur xscreensaver-5.04.orig/driver/XScreenSaver.ad.in xscreensaver-5.04/driver/XScreenSaver.ad.in +--- xscreensaver-5.04.orig/driver/XScreenSaver.ad.in 2007-11-13 10:36:00.000000000 +0200 ++++ xscreensaver-5.04/driver/XScreenSaver.ad.in 2007-12-30 21:13:12.000000000 +0200 +@@ -305,10 +305,6 @@ + cwaves -root \n\ + m6502 -root \n\ + abstractile -root \n\ +-- default-n: webcollage -root \n\ +-- default-n: "WebCollage (whacked)" \ +- webcollage -root -filter \ +- 'vidwhacker -stdin -stdout' \n\ + - default-n: vidwhacker -root \n\ + \ + @GL_KLUDGE@ GL: gears -root \n\ +@@ -495,7 +491,6 @@ + *hacks.xanalogtv.name: XAnalogTV + *hacks.xspirograph.name: XSpiroGraph + *hacks.nerverot.name: NerveRot +-*hacks.webcollage.name: WebCollage + *hacks.vidwhacker.name: VidWhacker + *hacks.morph3d.name: Morph3D + *hacks.bubble3d.name: Bubble3D +diff -ur xscreensaver-5.04.orig/hacks/glx/glsnake.c xscreensaver-5.04/hacks/glx/glsnake.c +--- xscreensaver-5.04.orig/hacks/glx/glsnake.c 2006-05-03 22:39:21.000000000 +0300 ++++ xscreensaver-5.04/hacks/glx/glsnake.c 2007-12-30 21:15:41.000000000 +0200 +@@ -565,21 +565,6 @@ + ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, + ZERO, PIN, ZERO } + }, +- { "erect penis", /* thanks benno */ +- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, +- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, +- ZERO, ZERO } +- }, +- { "flaccid penis", +- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, +- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, +- ZERO, ZERO } +- }, +- { "vagina", +- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, +- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, +- PIN, RIGHT, ZERO } +- }, + { "mask", + { ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, ZERO, ZERO, PIN, + ZERO, ZERO, PIN, ZERO, PIN, ZERO, PIN, ZERO, ZERO, PIN, ZERO, +@@ -995,9 +980,6 @@ + { "Parrot", + { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } + }, +- { "Penis", +- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } +- }, + { "PictureComingSoon", + { LEFT, LEFT, ZERO, RIGHT, LEFT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, PIN, LEFT, RIGHT, PIN, RIGHT, RIGHT, PIN, RIGHT, LEFT, ZERO, RIGHT, RIGHT, ZERO } + }, +diff -ur xscreensaver-5.04.orig/hacks/Makefile.in xscreensaver-5.04/hacks/Makefile.in +--- xscreensaver-5.04.orig/hacks/Makefile.in 2007-11-13 10:39:36.000000000 +0200 ++++ xscreensaver-5.04/hacks/Makefile.in 2007-12-30 21:19:15.000000000 +0200 +@@ -103,7 +103,7 @@ + blaster.c bumps.c ripples.c xspirograph.c \ + nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \ + rotzoomer.c whirlygig.c speedmine.c vermiculate.c \ +- xpm-pixmap.c webcollage-helper.c twang.c apollonian.c \ ++ xpm-pixmap.c twang.c apollonian.c \ + euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \ + anemone.c halftone.c metaballs.c eruption.c popsquares.c \ + barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \ +@@ -112,9 +112,8 @@ + fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ + intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ + boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \ +- asm6502.c abstractile.c \ +- webcollage-cocoa.m webcollage-helper-cocoa.m +-SCRIPTS = vidwhacker webcollage ljlatest ++ asm6502.c abstractile.c ++SCRIPTS = vidwhacker ljlatest + + # Programs that are mentioned in XScreenSaver.ad, and that have XML files, + # but that are not shipped with xscreensaver itself. +@@ -142,7 +141,7 @@ + blaster.o bumps.o ripples.o xspirograph.o \ + nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \ + rotzoomer.o whirlygig.o speedmine.o vermiculate.o \ +- xpm-pixmap.o webcollage-helper.o twang.o apollonian.o \ ++ xpm-pixmap.o twang.o apollonian.o \ + euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \ + anemone.o halftone.o metaballs.o eruption.o popsquares.o \ + barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \ +@@ -150,8 +149,8 @@ + mismunch.o pacman.o pacman_ai.o pacman_level.o \ + fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ + intermomentary.o fireworkx.o fiberlamp.o boxfit.o \ +- interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \ +- webcollage-helper-cocoa.o m6502.0 asm6502.o abstractile.o ++ interaggregate.o celtic.o cwaves.o \ ++ m6502.0 asm6502.o abstractile.o + + NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ + drift flag flame forest vines galaxy grav greynetic halo \ +@@ -175,7 +174,7 @@ + celtic cwaves m6502 abstractile \ + @JPEG_EXES@ + SEXES = sonar +-JPEG_EXES = webcollage-helper ++JPEG_EXES = + EXES = $(NEXES) $(SEXES) + + HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ +@@ -211,7 +210,7 @@ + spotlight.man squiral.man starfish.man strange.man \ + swirl.man t3d.man thornbird.man triangle.man truchet.man \ + twang.man vermiculate.man vidwhacker.man vines.man \ +- wander.man webcollage.man whirlwindwarp.man whirlygig.man \ ++ wander.man whirlwindwarp.man whirlygig.man \ + worm.man xflame.man xjack.man xlyap.man xmatrix.man \ + xrayswarm.man xspirograph.man xsublim.man \ + zoom.man halftone.man eruption.man metaballs.man \ +@@ -988,9 +987,6 @@ + xsublim: xsublim.o $(HACK_OBJS_1) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS_1) $(HACK_LIBS) + +-webcollage-helper: webcollage-helper.o +- $(CC_HACK) -o $@ $@.o $(XPM_LIBS) $(JPEG_LIBS) +- + + ############################################################################## + # +@@ -2521,17 +2517,6 @@ + wander.o: $(UTILS_SRC)/usleep.h + wander.o: $(UTILS_SRC)/visual.h + wander.o: $(UTILS_SRC)/yarandom.h +-webcollage-cocoa.o: ../config.h +-webcollage-cocoa.o: $(srcdir)/screenhackI.h +-webcollage-cocoa.o: $(srcdir)/screenhack.h +-webcollage-cocoa.o: $(UTILS_SRC)/colors.h +-webcollage-cocoa.o: $(UTILS_SRC)/grabscreen.h +-webcollage-cocoa.o: $(UTILS_SRC)/hsv.h +-webcollage-cocoa.o: $(UTILS_SRC)/resources.h +-webcollage-cocoa.o: $(UTILS_SRC)/usleep.h +-webcollage-cocoa.o: $(UTILS_SRC)/visual.h +-webcollage-cocoa.o: $(UTILS_SRC)/yarandom.h +-webcollage-helper.o: ../config.h + whirlwindwarp.o: ../config.h + whirlwindwarp.o: $(srcdir)/screenhackI.h + whirlwindwarp.o: $(srcdir)/screenhack.h +diff -ur xscreensaver-5.04.orig/po/POTFILES.in xscreensaver-5.04/po/POTFILES.in +--- xscreensaver-5.04.orig/po/POTFILES.in 2007-11-13 10:39:40.000000000 +0200 ++++ xscreensaver-5.04/po/POTFILES.in 2007-12-30 21:19:50.000000000 +0200 +@@ -210,7 +210,6 @@ + hacks/config/vines.xml + hacks/config/voronoi.xml + hacks/config/wander.xml +-hacks/config/webcollage.xml + hacks/config/whirlwindwarp.xml + hacks/config/whirlygig.xml + hacks/config/worm.xml diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild deleted file mode 100644 index fcb1509db07c..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# 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.13 2007/06/27 06:02:39 corsair Exp $ - -inherit eutils flag-o-matic pam fixheadtails autotools - -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" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="gnome jpeg insecure-savers new-login offensive opengl pam xinerama" - -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 ) - xinerama? ( x11-libs/libXinerama ) - 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 - sys-devel/gettext - dev-util/intltool - xinerama? ( x11-proto/xineramaproto )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-gdmflexiserver.patch - epatch "${FILESDIR}"/${P}-pam.patch - - # disable offensive screensavers. - use offensive || epatch "${FILESDIR}/${P}-nsfw.patch" - - eautoreconf - - # change head and tail calls 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-dpms-ext \ - --with-xf86vmode-ext \ - --with-xf86gamma-ext \ - --with-proc-interrupts \ - --with-xpm \ - --with-xshm-ext \ - --with-xdbe-ext \ - --enable-locking \ - --with-gtk \ - --without-kerberos \ - --without-gle \ - $(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 jpeg) - - # bug 155049 - emake -j1 || die "emake failed." -} - -src_install() { - [[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin" - - emake install_prefix="${D}" install || die "emake 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" - - # Allways install Settings .desktop for enviroments following - # freedesktop.org standard, e.g. xfce-base/xfdesktop and rox-base/xdg-menu - domenu "${FILESDIR}/desktop_entries/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" -} - -pkg_postinst() { - if ! use new-login; then - elog - elog "You have chosen to not use the new-login USE flag." - elog "This is a new USE flag which enables individuals to" - elog "create new logins when the screensaver is active," - elog "allowing others to use their account, even though the" - elog "screen is locked to another account. If you want this" - elog "feature, please recompile with USE=\"new-login\"." - elog - 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 -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.04.ebuild b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild new file mode 100644 index 000000000000..5264f063c7e0 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.04.ebuild @@ -0,0 +1,122 @@ +# 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.04.ebuild,v 1.1 2007/12/30 19:39:31 drac Exp $ + +inherit eutils flag-o-matic pam fixheadtails autotools + +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" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="jpeg new-login offensive opengl pam suid xinerama" + +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 ) + xinerama? ( x11-libs/libXinerama ) + 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 + sys-devel/gettext + dev-util/intltool + xinerama? ( x11-proto/xineramaproto )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-5.02-gentoo.patch + + # Update spec. using desktop-file-validate. + epatch "${FILESDIR}"/${P}-desktop-entry.patch + + # disable offensive screensavers. + use offensive || epatch "${FILESDIR}"/${P}-nsfw.patch + + eautoreconf + + # change head and tail calls 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-x-app-defaults=/usr/share/X11/app-defaults \ + --with-hackdir=/usr/lib/misc/xscreensaver \ + --with-configdir=/usr/share/xscreensaver/config \ + --x-libraries=/usr/$(get_libdir) \ + --x-includes=/usr/include \ + --with-dpms-ext \ + --with-xf86vmode-ext \ + --with-xf86gamma-ext \ + --with-proc-interrupts \ + --with-xpm \ + --with-xshm-ext \ + --with-xdbe-ext \ + --enable-locking \ + --with-gtk \ + --without-kerberos \ + --without-gle \ + $(use_with suid setuid-hacks) \ + $(use_with new-login login-manager) \ + $(use_with xinerama xinerama-ext) \ + $(use_with pam) \ + $(use_with opengl gl) \ + $(use_with jpeg) + + # Fix bug 155049. + emake -j1 || die "emake failed." +} + +src_install() { + emake install_prefix="${D}" install || die "emake install failed." + + dodoc README* + + 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 + elog + elog "You have chosen to not use the new-login USE flag." + elog "This is a new USE flag which enables individuals to" + elog "create new logins when the screensaver is active," + elog "allowing others to use their account, even though the" + elog "screen is locked to another account. If you want this" + elog "feature, please recompile with USE=\"new-login\"." + elog + fi +} -- cgit v1.2.3-65-gdbad