diff options
author | 2007-06-24 14:41:59 +0000 | |
---|---|---|
committer | 2007-06-24 14:41:59 +0000 | |
commit | bb4695ad1ed758ca8ccef5ff85de24db4f47c5a5 (patch) | |
tree | 4060aa72e7a7a7e9b53720e9738f14e3213ee18d /x11-misc | |
parent | Version bump as per bug 182969. Fixed localisation support for the documentat... (diff) | |
download | gentoo-2-bb4695ad1ed758ca8ccef5ff85de24db4f47c5a5.tar.gz gentoo-2-bb4695ad1ed758ca8ccef5ff85de24db4f47c5a5.tar.bz2 gentoo-2-bb4695ad1ed758ca8ccef5ff85de24db4f47c5a5.zip |
old
(Portage version: 2.1.3_rc4)
Diffstat (limited to 'x11-misc')
4 files changed, 0 insertions, 333 deletions
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r2 deleted file mode 100644 index c9457d751787..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r2 +++ /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/files/xscreensaver-5.01-hypertorus.xml.patch b/x11-misc/xscreensaver/files/xscreensaver-5.01-hypertorus.xml.patch deleted file mode 100644 index da9489c65747..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.01-hypertorus.xml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru xscreensaver-5.01.vanilla/hacks/config/hypertorus.xml xscreensaver-5.01/hacks/config/hypertorus.xml ---- xscreensaver-5.01.vanilla/hacks/config/hypertorus.xml 2006-11-08 11:44:38.000000000 +0100 -+++ xscreensaver-5.01/hacks/config/hypertorus.xml 2006-11-08 11:45:29.000000000 +0100 -@@ -8,7 +8,7 @@ - <select id="display-mode"> - <option id="wire" _label="Wireframe Mesh" arg-set="-mode 0"/> - <option id="surface" _label="Solid Surface" arg-set="-mode 1"/> -- <option id="transparent" _label="Transparent Surface"/> -+ <option id="transparent" _label="Transparent Surface" arg-set="-mode 2"/> - </select> - - <select id="appearance"> diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.01-nsfw.patch b/x11-misc/xscreensaver/files/xscreensaver-5.01-nsfw.patch deleted file mode 100644 index 0d1d810dba46..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.01-nsfw.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in xscreensaver-5.00/driver/XScreenSaver.ad.in ---- xscreensaver-5.00.vanilla/driver/XScreenSaver.ad.in 2006-05-24 01:01:34.000000000 +0200 -+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-06-04 11:39:04.000000000 +0200 -@@ -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 -Nru xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h xscreensaver-5.00/driver/XScreenSaver_ad.h ---- xscreensaver-5.00.vanilla/driver/XScreenSaver_ad.h 2006-05-24 01:01:34.000000000 +0200 -+++ xscreensaver-5.00/driver/XScreenSaver_ad.h 2006-06-04 11:39:04.000000000 +0200 -@@ -203,10 +203,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: gears -root \\n\ -@@ -359,7 +355,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 -Nru xscreensaver-5.00.vanilla/hacks/Makefile.in xscreensaver-5.00/hacks/Makefile.in ---- xscreensaver-5.00.vanilla/hacks/Makefile.in 2006-05-24 01:01:36.000000000 +0200 -+++ xscreensaver-5.00/hacks/Makefile.in 2006-06-04 11:39:04.000000000 +0200 -@@ -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 \ -@@ -111,7 +111,7 @@ - fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ - intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \ - boxfit.c interaggregate.c celtic.c --SCRIPTS = vidwhacker webcollage ljlatest -+SCRIPTS = vidwhacker ljlatest - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -139,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 \ -@@ -171,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 \ -@@ -208,7 +208,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 \ -@@ -1520,7 +1520,6 @@ - wander.o: ../config.h - wander.o: $(srcdir)/screenhackI.h - wander.o: $(srcdir)/screenhack.h --webcollage-helper.o: ../config.h - whirlwindwarp.o: ../config.h - whirlwindwarp.o: $(srcdir)/screenhackI.h - whirlwindwarp.o: $(srcdir)/screenhack.h -diff -Nru xscreensaver-5.00.vanilla/hacks/glx/glsnake.c xscreensaver-5.00/hacks/glx/glsnake.c ---- xscreensaver-5.00.vanilla/hacks/glx/glsnake.c 2006-05-03 21:39:21.000000000 +0200 -+++ xscreensaver-5.00/hacks/glx/glsnake.c 2006-06-04 11:40:30.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 -Nru xscreensaver-5.00.vanilla/po/POTFILES.in xscreensaver-5.00/po/POTFILES.in ---- xscreensaver-5.00.vanilla/po/POTFILES.in 2006-05-24 01:01:41.000000000 +0200 -+++ xscreensaver-5.00/po/POTFILES.in 2006-06-04 11:39:04.000000000 +0200 -@@ -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/xscreensaver-5.01-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild deleted file mode 100644 index 94816fa5671c..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.01-r2.ebuild +++ /dev/null @@ -1,172 +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.01-r2.ebuild,v 1.13 2007/06/08 15:50:48 drac Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="1.4" - -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="sh" -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 - >=media-libs/gle-3.0.1 ) - 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 - xinerama? ( x11-proto/xineramaproto )" - -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" - - # Fix bug #154444 - hypertorus hack: - epatch "${FILESDIR}/${P}-hypertorus.xml.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) - - # bug 155049 - emake -j1 || 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" - - # 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" || 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 -} |