diff options
author | Alastair Tse <liquidx@gentoo.org> | 2004-02-19 11:36:24 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2004-02-19 11:36:24 +0000 |
commit | 4a11d7cc2e7422e82696e13d9d286187dbe9d0c6 (patch) | |
tree | 38800a316a7e3afefa1ea5bc9ef31b7e6fdeb2eb /x11-misc | |
parent | masking unpatched xscreensavers (diff) | |
download | gentoo-2-4a11d7cc2e7422e82696e13d9d286187dbe9d0c6.tar.gz gentoo-2-4a11d7cc2e7422e82696e13d9d286187dbe9d0c6.tar.bz2 gentoo-2-4a11d7cc2e7422e82696e13d9d286187dbe9d0c6.zip |
cleanup older versions
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-4.05-r3 | 1 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-4.10 | 1 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-4.14 | 1 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r1 | 1 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch | 39 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-4.10-klein.c | 424 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild | 106 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-4.10.ebuild | 159 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild | 162 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-4.14.ebuild | 155 |
10 files changed, 0 insertions, 1049 deletions
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.05-r3 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.05-r3 deleted file mode 100644 index abb2ba26d7b8..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.05-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 39b05d4da14158638e501e3bc31c0943 xscreensaver-4.05.tar.gz 2914308 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.10 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.10 deleted file mode 100644 index 111a06f95ddc..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 e12fd9a598feaa46b05ee7121e423330 xscreensaver-4.10.tar.gz 3593957 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.14 deleted file mode 100644 index 496ba8a7d261..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 84ef242bab91fc64a4370cbb90df06ed xscreensaver-4.14.tar.gz 3988251 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r1 deleted file mode 100644 index 496ba8a7d261..000000000000 --- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 84ef242bab91fc64a4370cbb90df06ed xscreensaver-4.14.tar.gz 3988251 diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch deleted file mode 100644 index 4972cd1e2380..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.09-norpm.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- xscreensaver-4.09/configure 2003-03-17 22:29:59.000000000 +0000 -+++ xscreensaver-4.09/configure 2003-05-23 09:36:55.000000000 +0100 -@@ -19592,36 +19592,6 @@ - - # M4 sucks!! - --rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \ -- sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'` -- -- --if test \! -z "$rpmv" ; then -- rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` -- rpmhdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/attraction$@\1@p'` -- -- warning=no -- warnL "There is already an installed RPM of xscreensaver $rpmv" -- warn2 "on this system. You might want to remove it (with" -- warn2 '"rpm -ve xscreensaver") before running "make install"' -- warn2 "from this directory." -- echo "" -- warn2 "Alternately, you could build this version of xscreensaver" -- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' -- warn2 "file is included. See the RPM documentation for more info." -- echo "" -- -- if test "$rpmbdir" = "$rpmhdir" ; then -- warn2 "The RPM version was installed in $rpmbdir/." -- else -- warn2 "The RPM version was installed in $rpmbdir/," -- warn2 "with demos in $rpmhdir/." -- fi -- -- do_dir_warning=yes --fi -- -- - if test "${bindir}" = "${HACKDIR}" ; then - do_dir_warning=yes - fi diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.10-klein.c b/x11-misc/xscreensaver/files/xscreensaver-4.10-klein.c deleted file mode 100644 index b068e3f4e7ff..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-4.10-klein.c +++ /dev/null @@ -1,424 +0,0 @@ -/* -*- Mode: C; tab-width: 4 -*- */ -/* Klein --- Klein Bottle, Moebius and other parametric surfaces - * visualization */ - -/* - * Revision History: - * 2000: written by Andrey Mirtchovski <mirtchov@cpsc.ucalgary.ca - * - * 01-Mar-2003 mirtchov modified as a xscreensaver hack - * - */ - -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ - -#include <X11/Intrinsic.h> - -#ifdef STANDALONE -# define PROGCLASS "Klein" -# define HACK_INIT init_klein -# define HACK_DRAW draw_klein -# define HACK_RESHAPE reshape_klein -# define HACK_HANDLE_EVENT klein_handle_event -# define EVENT_MASK PointerMotionMask -# define klein_opts xlockmore_opts - - -#define DEF_SPIN "True" -#define DEF_WANDER "False" -#define DEF_RANDOM "False" -#define DEF_SPEED "150" - -# define DEFAULTS "*delay: 20000 \n" \ - "*showFPS: False \n" \ - "*wireframe: False \n" \ - "*random: " DEF_RANDOM "\n" \ - "*speed: " DEF_SPEED "\n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - -# include "xlockmore.h" /* from the xscreensaver distribution */ -#else /* !STANDALONE */ -# include "xlock.h" /* from the xlockmore distribution */ -#endif /* !STANDALONE */ - -#ifdef USE_GL - -#include <GL/glu.h> -#include "rotator.h" -#include "gltrackball.h" - -#undef countof -#define countof(x) (sizeof((x))/sizeof((*x))) - -/* surfaces being drawn */ -enum { - KLEIN = 0, - DINI, - ENNEPER, - KUEN, - MOEBIUS, - SEASHELL, - SWALLOWTAIL, - BOHEM, - SURFACE_LAST, -}; - -/* primitives to draw with - * note that we skip the polygons and - * triangle fans -- too slow - * - * also removed triangle_strip and quads -- - * just doesn't look good enough - */ -enum { - MY_POINTS = 0, - MY_LINES, - MY_LINE_LOOP, - MY_PRIM_LAST, -}; - - -static Bool rand; -static int render; -static int speed; -static Bool do_spin; -static Bool do_wander; - -static XrmOptionDescRec opts[] = { - {"-speed", ".speed", XrmoptionSepArg, (caddr_t) 0 }, - { "-spin", ".spin", XrmoptionNoArg, "True" }, - { "+spin", ".spin", XrmoptionNoArg, "False" }, - { "-wander", ".wander", XrmoptionNoArg, "True" }, - { "+wander", ".wander", XrmoptionNoArg, "False" }, - { "-random", ".rand", XrmoptionNoArg, "True" }, - { "+random", ".rand", XrmoptionNoArg, "False" }, -}; - -static argtype vars[] = { - {(caddr_t *) &rand, "rand", "Random", DEF_RANDOM, t_Bool}, - {(caddr_t *) &do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, - {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, - {(caddr_t *) &speed, "speed", "Speed", DEF_SPEED, t_Int}, -}; - - -ModeSpecOpt klein_opts = {countof(opts), opts, countof(vars), vars, NULL}; - - - -typedef struct{ - GLfloat x; - GLfloat y; - GLfloat z; -} GL_VECTOR; - -typedef struct { - GLXContext *glx_context; - Window window; - rotator *rot; - trackball_state *trackball; - Bool button_down_p; - - int render; - int surface; - - float du, dv; - float a, b, c; - -} kleinstruct; - -static kleinstruct *klein = NULL; - - -static void -draw(ModeInfo *mi) -{ - kleinstruct *kp = &klein[MI_SCREEN(mi)]; - static float step = 0.0; - double u, v; - float coord[3]; - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - glEnable(GL_DEPTH_TEST); - glEnable(GL_NORMALIZE); - glEnable(GL_CULL_FACE); - - glPushMatrix(); - - { - double x, y, z; - get_position (kp->rot, &x, &y, &z, !kp->button_down_p); - glTranslatef((x - 0.5) * 10, - (y - 0.5) * 10, - (z - 0.5) * 20); - - gltrackball_rotate (kp->trackball); - - get_rotation (kp->rot, &x, &y, &z, !kp->button_down_p); - glRotatef (x * 360, 1.0, 0.0, 0.0); - glRotatef (y * 360, 0.0, 1.0, 0.0); - glRotatef (z * 360, 0.0, 0.0, 1.0); - } - - glScalef( 4.0, 4.0, 4.0 ); - - glBegin(kp->render); - switch(kp->surface) { - case KLEIN: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = cos(u)*(kp->a + sin(v)*cos(u/2) - - sin(2*v)*sin(u/2)/2); - coord[1] = sin(u)*(kp->a + sin(v)*cos(u/2) - - sin(2*v)*sin(u/2)/2); - coord[2] = sin(u/2)*sin(v) + cos(u/2)*sin(2*v)/2; - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case DINI: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = kp->a*cos(u)*sin(v); - coord[1] = kp->a*sin(u)*sin(v); - coord[2] = kp->a*(cos(v) + sin(tan((v/2))))+0.2*u; - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case ENNEPER: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = kp->a*(u-(u*u*u/3)+u*v*v); - coord[1] = kp->b*(v-(v*v*v/3)+u*u*v); - coord[2] = u*u-v*v; - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case KUEN: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = 2*(cos(u)+u*sin(u))*sin(v)/(1+u*u*sin(v)*sin(v)); - coord[1] = 2*(sin(u)-u*cos(u))*sin(v)/(1+u*u*sin(v)*sin(v)); - coord[2] = sin(tan(v/2))+2*cos(v)/(1+u*u*sin(v)*sin(v)); - - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case MOEBIUS: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = cos(u)+v*cos(u/2)*cos(u); - coord[1] = sin(u)+v*cos(u/2)*sin(u); - coord[2] = v*sin(u/2); - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case SEASHELL: - for(u = 0; u < 2*M_PI; u+=kp->du){ - for(v = 0; v < 2*M_PI; v+=kp->dv){ - coord[0] = kp->a*(1-v/(2*M_PI))*cos(2*v)*(1+cos(u))+sin(kp->c+=0.00001)*cos(2*v); - coord[1] = kp->a*(1-v/(2*M_PI))*sin(2*v)*(1+cos(u))+cos(kp->c+=0.00001)*sin(2*v); - coord[2] = sin(kp->b+=0.00001)*v/(2*M_PI)+kp->a*(1-v/(2*M_PI))*sin(u); - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case SWALLOWTAIL: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = u*pow(v,2) + 3*pow(v,4); - coord[1] = -2*u*v - 4*pow(v,3); - coord[2] = u; - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - case BOHEM: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = kp->a*cos(u); - coord[1] = 1.5*cos(v) + kp->a*sin(u); - coord[2] = sin(v); - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - default: - for(u = -M_PI; u < M_PI; u+=kp->du){ - for(v = -M_PI; v < M_PI; v+=kp->dv){ - coord[0] = sin(u)*kp->a; - coord[1] = cos(u)*kp->a; - coord[2] = sin(u/2)*cos(v) + cos(u/2)*sin(v); - glColor3f(coord[0]+0.7, coord[1]+0.7, coord[2]+0.7); - glVertex3fv(coord); - } - } - break; - } - glEnd(); - glPopMatrix(); - - - kp->a = sin(step+=0.01); - kp->b = cos(step+=0.01); -} - - -/* new window size or exposure */ -void -reshape_klein(ModeInfo *mi, int width, int height) -{ - GLfloat h = (GLfloat) height / (GLfloat) width; - - glViewport(0, 0, (GLint) width, (GLint) height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective (30.0, 1/h, 1.0, 100.0); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - gluLookAt( 0.0, 0.0, 30.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0); - - glClear(GL_COLOR_BUFFER_BIT); -} - - -Bool -klein_handle_event (ModeInfo *mi, XEvent *event) -{ - kleinstruct *kp = &klein[MI_SCREEN(mi)]; - - if (event->xany.type == ButtonPress && event->xbutton.button & Button1) { - kp->button_down_p = True; - gltrackball_start (kp->trackball, event->xbutton.x, event->xbutton.y, MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } else if (event->xany.type == ButtonRelease && event->xbutton.button & Button1) { - kp->button_down_p = False; - return True; - } else if (event->xany.type == MotionNotify && kp->button_down_p) { - gltrackball_track (kp->trackball, event->xmotion.x, event->xmotion.y, MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } - - return False; -} - - -void -init_klein(ModeInfo *mi) -{ - int screen = MI_SCREEN(mi); - kleinstruct *kp; - - if (klein == NULL) { - if ((klein = (kleinstruct *) calloc(MI_NUM_SCREENS(mi), sizeof (kleinstruct))) == NULL) - return; - } - kp = &klein[screen]; - - kp->window = MI_WINDOW(mi); - - { - double spin_speed = 1.0; - double wander_speed = 0.03; - kp->rot = make_rotator (do_spin ? spin_speed : 0, - do_spin ? spin_speed : 0, - do_spin ? spin_speed : 0, - 1.0, - do_wander ? wander_speed : 0, - True); - kp->trackball = gltrackball_init (); - } - - if(rand) { - render = random() % MY_PRIM_LAST; - kp->surface = random() % SURFACE_LAST; - } else { - render = MY_LINE_LOOP; - kp->surface = KLEIN; - } - - switch (render) { - case MY_POINTS: kp->render = GL_POINTS; break; - case MY_LINES: kp->render = GL_LINES; break; - case MY_LINE_LOOP: kp->render = GL_LINE_LOOP; break; - default: - kp->render = GL_LINE_LOOP; - } -/*kp->render=GL_TRIANGLE_FAN;*/ -/*kp->render=GL_POLYGON;*/ - - kp->du = 0.07; - kp->dv = 0.07; - kp->a = kp->b = 1; - kp->c = 0.1; - - - if ((kp->glx_context = init_GL(mi)) != NULL) { - reshape_klein(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); - } else { - MI_CLEARWINDOW(mi); - } -} - -void -draw_klein(ModeInfo * mi) -{ - kleinstruct *kp = &klein[MI_SCREEN(mi)]; - Display *display = MI_DISPLAY(mi); - Window window = MI_WINDOW(mi); - - if (!kp->glx_context) return; - - glDrawBuffer(GL_BACK); - - glXMakeCurrent(display, window, *(kp->glx_context)); - draw(mi); - if (mi->fps_p) do_fps (mi); - glFinish(); - glXSwapBuffers(display, window); -} - -void -release_klein(ModeInfo * mi) -{ - if (klein != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - kleinstruct *kp = &klein[screen]; - - if (kp->glx_context) { - /* Display lists MUST be freed while their glXContext is current. */ - glXMakeCurrent(MI_DISPLAY(mi), kp->window, *(kp->glx_context)); - } - } - (void) free((void *) klein); - klein = NULL; - } - FreeAllGL(mi); -} - - -/*********************************************************/ - -#endif diff --git a/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild deleted file mode 100644 index e2f54b8f334a..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.05-r3.ebuild,v 1.15 2004/01/11 13:53:15 lanius Exp $ - -IUSE="pam gtk motif gnome opengl" - -DESCRIPTION="a modular screensaver for X11" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver/" -LICENSE="BSD" -KEYWORDS="x86 sparc ppc" -SLOT="0" - -DEPEND="virtual/x11 sys-devel/bc - gtk? ( x11-libs/gtk+ ) - motif? ( x11-libs/openmotif ) - opengl? ( virtual/opengl >=media-libs/gle-3.0.1 ) - gnome? ( media-libs/gdk-pixbuf - >=gnome-base/control-center-1.4.0.1-r1 ) - pam? ( >=sys-libs/pam-0.75 ) - dev-libs/libxml2" - -RDEPEND="${DEPEND} - media-libs/netpbm" - -src_unpack() { - - unpack ${A} - cd ${S} - - #use nls && ( \ - # cd po - # patch -p0 < ${FILESDIR}/${P}-gentoo.diff - #) || ( \ - cp Makefile.in Makefile.in.orig - sed "s:hacks/glx po:hacks/glx:" \ - Makefile.in.orig > Makefile.in - #) -} - -src_compile() { - local myconf="" - use gnome \ - && myconf="${myconf} --with-gnome" \ - || myconf="${myconf} --without-gnome" - - use gtk \ - && myconf="${myconf} --with-gtk" \ - || myconf="${myconf} --without-gtk" - - use motif \ - && myconf="${myconf} --with-motif" \ - || myconf="${myconf} --without-motif" - - use pam \ - && myconf="${myconf} --with-pam" \ - || myconf="${myconf} --without-pam" - - use opengl \ - && myconf="${myconf} --with-gl --with-gle" \ - || myconf="${myconf} --without-gl --without-gle" - - export C_INCLUDE_PATH="/usr/include/libxml2/libxml/" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --host="${CHOST}" \ - --x-libraries=/usr/X11R6/lib \ - --x-includes=/usr/X11R6/include \ - --enable-hackdir=/usr/lib/xscreensaver \ - --with-mit-ext \ - --with-dpms-ext \ - --with-xinerama-ext \ - --with-xf86vmode-ext \ - --with-xf86gamma-ext \ - --with-proc-interrupts \ - --with-xpm \ - --with-xshm-ext \ - --with-xdbe-ext \ - --enable-locking \ - ${myconf} || die - - emake || die -} - -src_install() { - - [ -n "$KDEDIR" ] && dodir "$KDEDIR/bin" - - make install_prefix="${D}" install || die - # install correctly in gnome2 - use gnome && ( \ - dodir /usr/share/gnome/capplets - insinto /usr/share/gnome/capplets - doins "driver/screensaver-properties.desktop" - ) - - use gnome && ( \ - insinto /usr/share/pixmaps - newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm - ) - - use pam && ( \ - insinto /etc/pam.d - doins "${FILESDIR}/pam.d/xscreensaver" - ) -} diff --git a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild b/x11-misc/xscreensaver/xscreensaver-4.10.ebuild deleted file mode 100644 index 42fbf1d0d2df..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.10.ebuild,v 1.12 2004/01/11 13:53:15 lanius Exp $ - -IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama" - -DESCRIPTION="a modular screensaver for X11" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver/" - -LICENSE="BSD" -KEYWORDS="x86 ~ppc sparc ~alpha amd64" -SLOT="0" - -# NOTE: the motif interface is not supported/developed anymore -# by xscreensaver devs. so we should deprecate it soon -# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2 -# automatically over gtk1. we need to patch the autoconf stuff -# to correctly allow users to choose gtk1/gtk2. right now it -# only selects the deps. -# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't -# really matter if it isn't there. Maybe we should have a 'games' -# USE flag - -RDEPEND="virtual/x11 - media-libs/netpbm - >=sys-libs/zlib-1.1.4 - gtk? ( >=dev-libs/libxml2-2.5 ) - gtk? ( gtk2? ( >=x11-libs/gtk+-2 - >=gnome-base/libglade-1.99 - >=dev-libs/glib-2 ) ) - gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) ) - gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* - >=media-libs/gdk-pixbuf-0.18 - =gnome-base/libglade-0.17* ) ) - gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4* - >=gnome-base/gnome-libs-1.4 ) ) ) - !gtk? ( x11-libs/openmotif - >=media-libs/gdk-pixbuf-0.18 ) - pam? ( sys-libs/pam ) - kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) ) - jpeg? ( media-libs/jpeg ) - opengl? ( virtual/opengl - >=media-libs/gle-3.0.1 )" - -DEPEND="${RDEPEND} - sys-devel/bc - dev-lang/perl - gtk2? ( dev-util/pkgconfig ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - if [ -n "`use kerberos`" -a -z "`use krb4`" ]; then - ewarn "You have enabled kerberos without krb4 support. Kerberos will be" - ewarn "disabled unless kerberos 4 support has been compiled with your" - ewarn "kerberos libraries. To do that, you should abort now and do:" - ewarn "" - ewarn " USE=\"krb4\" emerge mit-krb5" - ewarn - sleep 2 - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed - epatch ${FILESDIR}/${P}-norpm.patch - # replace msdos formatted file with unix equiv, otherwise it breaks on gcc-2.95 - cp ${FILESDIR}/${P}-klein.c ${S}/hacks/glx/klein.c -} - -src_compile() { - local myconf="" - - myconf="--with-fortune=/usr/bin/fortune" - - use gtk \ - && myconf="${myconf} --without-motif --with-gtk --with-xml" \ - || myconf="${myconf} --with-motif --without-gtk" - - use xinerama \ - && myconf="${myconf} --with-xinerama-ext" \ - || myconf="${myconf} --without-xinerama-ext" - - use pam \ - && myconf="${myconf} --with-pam" \ - || myconf="${myconf} --without-pam" - - use kerberos && use krb4 \ - && myconf="${myconf} --with-kerberos" \ - || myconf="${myconf} --without-kerberos" - - use opengl \ - && myconf="${myconf} --with-gl --with-gle" \ - || myconf="${myconf} --without-gl --without-gle" - - use jpeg \ - && myconf="${myconf} --with-jpeg" \ - || myconf="${myconf} --without-jpeg" - - use nls \ - && myconf="${myconf} --enable-nls" \ - || myconf="${myconf} --disable-nls" - - if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then - if [ -n "`use gnome`" ]; then - myconf="${myconf} --with-gnome --with-pixbuf" - fi - fi - - #export C_INCLUDE_PATH="/usr/include/libxml2/" - econf \ - --enable-hackdir=/usr/lib/xscreensaver \ - --x-libraries=/usr/X11R6/lib \ - --x-includes=/usr/X11R6/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 \ - ${myconf} || die - - emake || die -} - -src_install() { - [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin - - make install_prefix="${D}" install || die - - # install correctly in gnome2 - use gnome && ( \ - dodir /usr/share/gnome/capplets - insinto /usr/share/gnome/capplets - doins driver/screensaver-properties.desktop - ) - - # install symlink to satisfy kde - use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config - - # Remove "extra" capplet - rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop - - use gnome && ( \ - insinto /usr/share/pixmaps - newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm - ) - - use pam && ( \ - insinto /etc/pam.d - doins ${FILESDIR}/pam.d/xscreensaver - ) -} diff --git a/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild deleted file mode 100644 index 758798ace31d..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r1.ebuild,v 1.8 2004/02/07 00:53:54 pylon Exp $ - -IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama icc" - -DESCRIPTION="a modular screensaver for X11" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver/" - -LICENSE="BSD" -KEYWORDS="x86 ppc sparc alpha ~amd64 ia64 hppa" -SLOT="0" - -# NOTE: the motif interface is not supported/developed anymore -# by xscreensaver devs. so we should deprecate it soon -# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2 -# automatically over gtk1. we need to patch the autoconf stuff -# to correctly allow users to choose gtk1/gtk2. right now it -# only selects the deps. -# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't -# really matter if it isn't there. Maybe we should have a 'games' -# USE flag - -RDEPEND="virtual/x11 - media-libs/netpbm - >=sys-libs/zlib-1.1.4 - gtk? ( >=dev-libs/libxml2-2.5 ) - gtk? ( gtk2? ( >=x11-libs/gtk+-2 - >=gnome-base/libglade-1.99 - >=dev-libs/glib-2 ) ) - gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) ) - gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* - =gnome-base/libglade-0.17* ) ) - gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4* - >=media-libs/gdk-pixbuf-0.18 - >=gnome-base/gnome-libs-1.4 ) ) ) - !gtk? ( x11-libs/openmotif ) - pam? ( sys-libs/pam ) - kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) ) - jpeg? ( media-libs/jpeg ) - opengl? ( virtual/opengl - >=media-libs/gle-3.0.1 )" - -DEPEND="${RDEPEND} - sys-devel/bc - dev-lang/perl - gtk2? ( dev-util/pkgconfig ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - if [ -n "`use kerberos`" -a -z "`use krb4`" ]; then - ewarn "You have enabled kerberos without krb4 support. Kerberos will be" - ewarn "disabled unless kerberos 4 support has been compiled with your" - ewarn "kerberos libraries. To do that, you should abort now and do:" - ewarn "" - ewarn " USE=\"krb4\" emerge mit-krb5" - ewarn - sleep 2 - fi -} - -src_unpack() { - unpack ${A} - - # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.10-norpm.patch - # set default fortune to /usr/bin/fortune even if one can't be found - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-fortune.patch - use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-icc.patch - -} - -src_compile() { - local myconf="" - - myconf="--with-fortune=/usr/bin/fortune" - - use gtk \ - && myconf="${myconf} --without-motif --with-gtk --with-xml" \ - || myconf="${myconf} --with-motif --without-gtk --without-gdk-pixbuf" - - use xinerama \ - && myconf="${myconf} --with-xinerama-ext" \ - || myconf="${myconf} --without-xinerama-ext" - - use pam \ - && myconf="${myconf} --with-pam" \ - || myconf="${myconf} --without-pam" - - use kerberos && use krb4 \ - && myconf="${myconf} --with-kerberos" \ - || myconf="${myconf} --without-kerberos" - - use opengl \ - && myconf="${myconf} --with-gl --with-gle" \ - || myconf="${myconf} --without-gl --without-gle" - - use jpeg \ - && myconf="${myconf} --with-jpeg" \ - || myconf="${myconf} --without-jpeg" - - use nls \ - && myconf="${myconf} --enable-nls" \ - || myconf="${myconf} --disable-nls" - - - if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then - if [ -n "`use gnome`" ]; then - myconf="${myconf} --with-gnome --with-pixbuf" - fi - fi - - use icc && export CC=icc - use icc && autoconf - - econf \ - --enable-hackdir=/usr/lib/xscreensaver \ - --x-libraries=/usr/X11R6/lib \ - --x-includes=/usr/X11R6/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 \ - ${myconf} || die - - emake || die -} - -src_install() { - [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin - - make install_prefix="${D}" install || die - - # install correctly in gnome2 - use gnome && ( \ - dodir /usr/share/gnome/capplets - insinto /usr/share/gnome/capplets - doins driver/screensaver-properties.desktop - ) - - # install symlink to satisfy kde - use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config - - # Remove "extra" capplet - rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop - - use gnome && ( \ - insinto /usr/share/pixmaps - newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm - ) - - use pam && ( \ - insinto /etc/pam.d - doins ${FILESDIR}/pam.d/xscreensaver - ) -} diff --git a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14.ebuild deleted file mode 100644 index b0fbccd95927..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14.ebuild,v 1.4 2004/01/11 13:53:15 lanius Exp $ - -IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama" - -DESCRIPTION="a modular screensaver for X11" -SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" -HOMEPAGE="http://www.jwz.org/xscreensaver/" - -LICENSE="BSD" -KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64" -SLOT="0" - -# NOTE: the motif interface is not supported/developed anymore -# by xscreensaver devs. so we should deprecate it soon -# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2 -# automatically over gtk1. we need to patch the autoconf stuff -# to correctly allow users to choose gtk1/gtk2. right now it -# only selects the deps. -# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't -# really matter if it isn't there. Maybe we should have a 'games' -# USE flag - -RDEPEND="virtual/x11 - media-libs/netpbm - >=sys-libs/zlib-1.1.4 - gtk? ( >=dev-libs/libxml2-2.5 ) - gtk? ( gtk2? ( >=x11-libs/gtk+-2 - >=gnome-base/libglade-1.99 - >=dev-libs/glib-2 ) ) - gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) ) - gtk? ( !gtk2? ( =x11-libs/gtk+-1.2* - =gnome-base/libglade-0.17* ) ) - gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4* - >=media-libs/gdk-pixbuf-0.18 - >=gnome-base/gnome-libs-1.4 ) ) ) - !gtk? ( x11-libs/openmotif ) - pam? ( sys-libs/pam ) - kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) ) - jpeg? ( media-libs/jpeg ) - opengl? ( virtual/opengl - >=media-libs/gle-3.0.1 )" - -DEPEND="${RDEPEND} - sys-devel/bc - dev-lang/perl - gtk2? ( dev-util/pkgconfig ) - nls? ( sys-devel/gettext )" - -pkg_setup() { - if [ -n "`use kerberos`" -a -z "`use krb4`" ]; then - ewarn "You have enabled kerberos without krb4 support. Kerberos will be" - ewarn "disabled unless kerberos 4 support has been compiled with your" - ewarn "kerberos libraries. To do that, you should abort now and do:" - ewarn "" - ewarn " USE=\"krb4\" emerge mit-krb5" - ewarn - sleep 2 - fi -} - -src_unpack() { - unpack ${A} - - # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch -} - -src_compile() { - local myconf="" - - myconf="--with-fortune=/usr/bin/fortune" - - use gtk \ - && myconf="${myconf} --without-motif --with-gtk --with-xml" \ - || myconf="${myconf} --with-motif --without-gtk --without-gdk-pixbuf" - - use xinerama \ - && myconf="${myconf} --with-xinerama-ext" \ - || myconf="${myconf} --without-xinerama-ext" - - use pam \ - && myconf="${myconf} --with-pam" \ - || myconf="${myconf} --without-pam" - - use kerberos && use krb4 \ - && myconf="${myconf} --with-kerberos" \ - || myconf="${myconf} --without-kerberos" - - use opengl \ - && myconf="${myconf} --with-gl --with-gle" \ - || myconf="${myconf} --without-gl --without-gle" - - use jpeg \ - && myconf="${myconf} --with-jpeg" \ - || myconf="${myconf} --without-jpeg" - - use nls \ - && myconf="${myconf} --enable-nls" \ - || myconf="${myconf} --disable-nls" - - if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then - if [ -n "`use gnome`" ]; then - myconf="${myconf} --with-gnome --with-pixbuf" - fi - fi - - #export C_INCLUDE_PATH="/usr/include/libxml2/" - econf \ - --enable-hackdir=/usr/lib/xscreensaver \ - --x-libraries=/usr/X11R6/lib \ - --x-includes=/usr/X11R6/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 \ - ${myconf} || die - - emake || die -} - -src_install() { - [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin - - make install_prefix="${D}" install || die - - # install correctly in gnome2 - use gnome && ( \ - dodir /usr/share/gnome/capplets - insinto /usr/share/gnome/capplets - doins driver/screensaver-properties.desktop - ) - - # install symlink to satisfy kde - use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config - - # Remove "extra" capplet - rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop - - use gnome && ( \ - insinto /usr/share/pixmaps - newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm - ) - - use pam && ( \ - insinto /etc/pam.d - doins ${FILESDIR}/pam.d/xscreensaver - ) -} |