Fixed CFLAFS typo. Removed empty /usr/man directory as per bug #46565. Remove old versions (a patch was too big)

9 files changed, 0 insertions, 1865 deletions

diff --git a/media-libs/svgalib/files/digest-svgalib-1.4.3-r4 b/media-libs/svgalib/files/digest-svgalib-1.4.3-r4
deleted file mode 100644
index 073a736da8f9..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.4.3-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7d2778e3beebc07dd7c74668f6887c6f svgalib-1.4.3.tar.gz 840282
-MD5 84ae3a6515b24a657ba9118af1c2cfce svgalib-1.4.3-r128.c.bz2 8633
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.17-r3 b/media-libs/svgalib/files/digest-svgalib-1.9.17-r3
deleted file mode 100644
index c9f9b62846dc..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.9.17-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1599bb3222899d39ce1a2af36670a98 svgalib-1.9.17.tar.gz 921750
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch b/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch
deleted file mode 100644
index dd6d1b4b4b47..000000000000
--- a/media-libs/svgalib/files/svgalib-1.4.3-gcc3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/vga.c.old	2003-06-26 18:01:47.778102000 -0400
-+++ ./src/vga.c	2003-06-26 17:57:40.108102000 -0400
-@@ -3914,7 +3914,7 @@
- 
- #define ML_GETINT(x) \
- 	ptr = strtok(NULL, " "); if(!ptr) break; \
--	mmt.##x = atoi(ptr);
-+	mmt.x = atoi(ptr);
- 
- 	    ML_GETINT(HDisplay);
- 	    ML_GETINT(HSyncStart);
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-gentoo.diff b/media-libs/svgalib/files/svgalib-1.4.3-gentoo.diff
deleted file mode 100644
index 2a77705dd4a9..000000000000
--- a/media-libs/svgalib/files/svgalib-1.4.3-gentoo.diff
+++ /dev/null
@@ -1,297 +0,0 @@
---- svgalib-1.4.3.orig/src/Makefile	Tue May 29 07:36:53 2001
-+++ svgalib-1.4.3/src/Makefile	Thu Jun 28 10:25:30 2001
-@@ -14,7 +14,7 @@
- # Compiler Section (overrides Makefile.cfg)
- #----------------------------------------------------------------------
- 
--INCLUDES += -I$(srcdir)/src
-+INCLUDES += -I$(srcdir)/src -I$(srcdir)/src/config
- 
- #----------------------------------------------------------------------
- # Rules Section
---- svgalib-1.4.3.orig/utils/Makefile	Wed Jul 21 09:41:18 1999
-+++ svgalib-1.4.3/utils/Makefile	Thu Jun 28 10:25:30 2001
-@@ -13,10 +13,11 @@
- # Compiler Section (overrides Makefile.cfg)
- #----------------------------------------------------------------------
- 
--CFLAGS = $(WARN) $(OPTIMIZE) -I../include
-+INCLUDES=-I../include
-+CFLAGS = $(WARN) $(OPTIMIZE) $(INCLUDES)
- #Use the next one for the Alpha/AXP if you need it
- #LDFLAGS = -L../staticlib 
--LIBS = -lvga -lm
-+LIBS = -L$(srcdir)/sharedlib -lvga -lm
- 
- #----------------------------------------------------------------------
- # Rules Section
-@@ -56,7 +57,7 @@
- 	$(INSTALLPROG) $(UTILPROGS) $(UTILINSTALLDIR)
- 
- .depend:
--	gcc -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
-+	gcc $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
- 
- #
- # include a dependency file if one exists
---- svgalib-1.4.3.orig/Makefile	Wed Apr 18 10:35:51 2001
-+++ svgalib-1.4.3/Makefile	Thu Jun 28 10:25:12 2001
-@@ -109,11 +109,11 @@
- .PHONY: indent-gnu configaout
-
- installheaders:
--	@echo Installing header files in $(includedir).
--	@if [ -f /usr/include/vga.h ]; then \
--		rm -f /usr/include/vga.h /usr/include/vgagl.h; \
--		echo Old header files in /usr/include removed.; \
--	fi
-+#	@echo Installing header files in $(includedir).
-+#	@if [ -f /usr/include/vga.h ]; then \
-+#		rm -f /usr/include/vga.h /usr/include/vgagl.h; \
-+#		echo Old header files in /usr/include removed.; \
-+#	fi
- 	mkdir -p $(includedir)
- 	@cp $(srcdir)/src/vga.h $(includedir)/vga.h
- 	@chmod a+r $(includedir)/vga.h
-@@ -134,11 +134,11 @@
- 		chmod a+r $(libdir)/$$foo; \
- 	done
- endif
--	@if [ -f /usr/lib/libvga.sa ]; then \
--		rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
--		echo Old stubs in /usr/lib removed.; \
--	fi
--	@rm -f $(OBSOLETESHAREDIMAGES)
-+#	@if [ -f /usr/lib/libvga.sa ]; then \
-+#		rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
-+#		echo Old stubs in /usr/lib removed.; \
-+#	fi
-+#	@rm -f $(OBSOLETESHAREDIMAGES)
- ifndef KEEPSHAREDLIBS
- 	@echo "Removing shared library images (old & current)..."
- 	@for i in $(OBSOLETELDIRS); do \
-@@ -153,7 +153,7 @@
- 		(cd $(sharedlibdir); \
- 		 ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
- 	done
--	@ldconfig
-+#	@ldconfig
- 
- ifdef INSTALLAOUTDIR
- 
-@@ -180,10 +180,10 @@
- 
- installstaticlib: static
- 	@echo Installing static libraries in $(libdir).
--	@rm -f /usr/lib/libvga.a
-+#	@rm -f /usr/lib/libvga.a
- 	@$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
- 	@chmod a+r $(libdir)/libvga.a
--	@rm -f /usr/lib/libvgagl.a
-+#	@rm -f /usr/lib/libvgagl.a
- 	@$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
- 	@chmod a+r $(libdir)/libvgagl.a
- 
-@@ -192,14 +192,14 @@
- 		echo No $(bindir) directory, creating it.; \
- 		mkdir $(bindir); \
- 	fi
--	@if [ -f /usr/bin/restorefont ]; then \
--		echo Removing old utilities in /usr/bin.; \
--		for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
--	fi
--	@if [ -f /usr/bin/convfont ]; then \
--		echo Removing inappropriate utilities in /usr/bin.; \
--		rm -f /usr/bin/convfont /usr/bin/setmclk; \
--	fi
-+#	@if [ -f /usr/bin/restorefont ]; then \
-+#		echo Removing old utilities in /usr/bin.; \
-+#		for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
-+#	fi
-+#	@if [ -f /usr/bin/convfont ]; then \
-+#		echo Removing inappropriate utilities in /usr/bin.; \
-+#		rm -f /usr/bin/convfont /usr/bin/setmclk; \
-+#	fi
- 	@echo Installing textmode utilities in $(bindir):
- 	@echo "restorefont:      Save/restore textmode font."
- 	@cp utils/restorefont $(bindir)
-@@ -225,22 +225,22 @@
- 		mkdir $(datadir); \
- 		chmod go-w $(datadir); \
- 	fi
--	@if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
--	fi
--	@if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
--	fi
--	@if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
--	fi
--	@if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
--		echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
--		echo and changing $(datadir)/libvga.config appropriately. ; \
--	fi
-+#	@if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
-+#	fi
-+#	@if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
-+#	fi
-+#	@if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
-+#	fi
-+#	@if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
-+#		echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
-+#		echo and changing $(datadir)/libvga.config appropriately. ; \
-+#	fi
- 	@if [ ! -f $(datadir)/libvga.config ]; then \
- 		echo Installing default configuration file in $(datadir).; \
- 		cp $(confdir)/libvga.config $(datadir)/libvga.config; \
-@@ -261,7 +261,7 @@
- installman:
- 	(cd doc; $(MAKE) -f $(srcdir)/doc/Makefile srcdir="$(srcdir)" install )
- 	 
--install: uninstall $(INSTALLAOUTLIB) installheaders $(INSTALLSHAREDLIB) installconfig \
-+install: $(INSTALLAOUTLIB) installheaders $(INSTALLSHAREDLIB) installconfig \
- 	$(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN)
- 	@echo
- 	@echo
-@@ -402,15 +402,23 @@
- 	@rm -f sharedlib/DISTRIBUTION
- 	(cd $(dir $@); \
- 	 $(MAKE) -f $(srcdir)/src/Makefile $(notdir $@) \
--	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-+	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" ; \
-+	 ln -sf libvga.so.$(VERSION) libvga.so \
- 	)
- 
- endif	# a.out
- 
--sharedlib/libvgagl.a sharedlib/libvgagl.so.$(VERSION): $(SHAREDDIRS)
-+sharedlib/libvgagl.a: $(SHAREDDIRS)
- 	(cd $(dir $@); \
- 	 $(MAKE) -f $(srcdir)/gl/Makefile $(notdir $@) \
- 	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-+	)
-+
-+sharedlib/libvgagl.so.$(VERSION): $(SHAREDDIRS)
-+	(cd $(dir $@); \
-+	 $(MAKE) -f $(srcdir)/gl/Makefile $(notdir $@) \
-+	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" ; \
-+	 ln -sf libvgagl.so.$(VERSION) libvgagl.so \
- 	)
- 
- demoprogs: $(PREDEMO) $(DEMODIRS)
---- svgalib-1.4.3.orig/Makefile.cfg	Tue May 29 07:39:13 2001
-+++ svgalib-1.4.3/Makefile.cfg	Thu Jun 28 10:25:12 2001
-@@ -25,7 +25,7 @@
- # Common prefix for installation directories.
- # NOTE: This directory must exist when you start the install.
- TOPDIR=
--prefix = $(TOPDIR)/usr/local
-+prefix = $(TOPDIR)/usr
- exec_prefix = $(prefix)
- 
- # Directory where the shared stubs and static library will be installed.
-@@ -38,13 +38,13 @@
- bindir = $(exec_prefix)/bin
- 
- # Directory where the run-time configuration files will be installed.
--datadir = $(TOPDIR)/etc/vga
-+datadir = $(TOPDIR)/etc/svgalib
- 
- # Directory where the header files will be installed.
- includedir = $(prefix)/include
- 
- # Directory where the man files will be installed.
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
- 
- # Target binary format.
- # TARGET_FORMAT = a.out
-@@ -82,7 +82,7 @@
- # BACKGROUND = y
- 
- # Uncomment this if you want to compile and install the static libs.
--# INSTALLSTATICLIB = installstaticlib
-+INSTALLSTATICLIB = installstaticlib
- 
- # Comment this out if you don't want to install the shared libs.
- # If you do not install the shared nor the static libs, 'make static'
-@@ -94,12 +94,12 @@
- # a.out image is available install it in the first directory named something
- # like *aout/ in /etc/ld.so.conf.
- # If you want this, do not comment out the next line:
--INSTALLAOUTLIB = installaoutcompat
-+# INSTALLAOUTLIB = installaoutcompat
- 
- # Comment this out if you want to keep old shared images. Old header files,
- # library stubs and static libraries CANNOT be kept in public locations
- # except when you rename them yourself.
--# KEEPSHAREDLIBS = keep
-+KEEPSHAREDLIBS = keep
- 
- # Comment this out if you don't want to compile and install the utilities.
- INSTALLUTILS = installutils
-@@ -126,15 +126,15 @@
- INCLUDE_ET4000_DRIVER = y
- INCLUDE_CIRRUS_DRIVER = y
- INCLUDE_TVGA_DRIVER = y
--#INCLUDE_OAK_DRIVER = y
--#INCLUDE_EGA_DRIVER = y
-+INCLUDE_OAK_DRIVER = y
-+INCLUDE_EGA_DRIVER = y
- INCLUDE_MACH32_DRIVER = y
- INCLUDE_S3_DRIVER = y
--#INCLUDE_ET3000_DRIVER = y
--#INCLUDE_GVGA6400_DRIVER = y
--#INCLUDE_ARK_DRIVER = y
--#INCLUDE_ATI_DRIVER = y
--#INCLUDE_ALI_DRIVER = y
-+INCLUDE_ET3000_DRIVER = y
-+INCLUDE_GVGA6400_DRIVER = y
-+INCLUDE_ARK_DRIVER = y
-+INCLUDE_ATI_DRIVER = y
-+INCLUDE_ALI_DRIVER = y
- INCLUDE_CHIPS_DRIVER = y
- INCLUDE_APM_DRIVER = y
- INCLUDE_NV3_DRIVER = y
-@@ -256,10 +256,8 @@
- endif
- 
- 
--ifndef CFLAGS
-+ifndef OPTIMIZE
- 	OPTIMIZE = -fomit-frame-pointer -O2 -fno-strength-reduce -pipe -g
--else
--	OPTIMIZE := $(CFLAGS)
- endif
- 
- # You might want to add -m386 here if you have a recently installed 
-@@ -270,9 +268,9 @@
- CFLAGS   = $(WARN) $(DLLFLAGS) $(INCLUDES) $(OPTIMIZE) $(DEFINES)
- # ELF doesn't like -N. It is beneficial for small tools with a.out
- ifeq (a.out, $(TARGET_FORMAT))
--	LDFLAGS   = -N -s
-+	LDFLAGS   = -N
- else
--	LDFLAGS   = -s
-+	LDFLAGS   =
- endif
- 
- # Uncomment the following if you are compiling a.out shared libraries
-@@ -289,6 +287,6 @@
- 
- # Utilites used.
- AR	  = ar
--INSTALL_PROGRAM	= install -c -s -m 755 -o root -g bin
-+INSTALL_PROGRAM	= install -c -m 755 -o root -g bin
- INSTALL_SHLIB	= install -c -m 755 -o root -g bin
- INSTALL_DATA	= install -c -m 644 -o root -g bin
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch
deleted file mode 100644
index d806b7228578..000000000000
--- a/media-libs/svgalib/files/svgalib-1.4.3-linux2.6.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- src/et6000.c.orig	2004-01-09 18:24:37.640905848 -0500
-+++ src/et6000.c	2004-01-09 18:25:33.637393088 -0500
-@@ -12,3 +12,2 @@
- #include "driver.h"
--#include <linux/pci.h>
- #include "timing.h"
diff --git a/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch b/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch
deleted file mode 100644
index a20329957284..000000000000
--- a/media-libs/svgalib/files/svgalib-1.4.3-userpriv.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -u -r svgalib-1.4.3old/demos/Makefile svgalib-1.4.3/demos/Makefile
---- svgalib-1.4.3old/demos/Makefile	2000-08-06 11:30:21.000000000 +0100
-+++ svgalib-1.4.3/demos/Makefile	2003-03-16 14:53:11.000000000 +0000
-@@ -44,21 +44,15 @@
- 
- .c:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $* $*.c $(LIBS)
--	chown 0 $*
--	chmod 4755 $*
- 
- rwpage: rwpage.pp
- 	$(PC) -Rintel rwpage.pp
- 
- testaccel: testaccel.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o testaccel testaccel.c $(LIBS) -lm
--	chown 0 testaccel
--	chmod 4755 testaccel
- 
- accel: accel.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o accel accel.c $(LIBS) -lm
--	chown 0 accel
--	chmod 4755 accel
- 
- clean:	cleanbin
- 	rm -f .depend *.o *~ *.bak
-diff -u -r svgalib-1.4.3old/threeDKit/Makefile svgalib-1.4.3/threeDKit/Makefile
---- svgalib-1.4.3old/threeDKit/Makefile	1998-04-15 19:50:24.000000000 +0100
-+++ svgalib-1.4.3/threeDKit/Makefile	2003-03-16 14:53:58.000000000 +0000
-@@ -39,13 +39,9 @@
- 
- plane: planukit.o planinit.o $(OBJECTS) $(LVGADEP)
- 	$(CC) $(LDFLAGS) -o plane planukit.o planinit.o $(OBJECTS) $(LIBS)
--	chown root plane
--	chmod u+s plane
- 
- wrapdemo: wrapdemo.o $(OBJECTS) $(LVGADEP)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o wrapdemo wrapdemo.c $(OBJECTS) $(LIBS)
--	chown root wrapdemo
--	chmod u+s wrapdemo
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c -o $*.o $<
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch
deleted file mode 100644
index b91aba28fe07..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-diff -urN svgalib-1.9.17/Makefile svgalib-1.9.17.gentoo/Makefile
---- svgalib-1.9.17/Makefile	2002-12-09 17:33:14.000000000 +0200
-+++ svgalib-1.9.17.gentoo/Makefile	2002-12-26 03:05:36.000000000 +0200
-@@ -78,10 +78,10 @@
- 
- installheaders:
- 	@echo Installing header files in $(includedir).
--	@if [ -f /usr/include/vga.h ]; then \
--		rm -f /usr/include/vga.h /usr/include/vgagl.h; \
--		echo Old header files in /usr/include removed.; \
--	fi
-+#	@if [ -f /usr/include/vga.h ]; then \
-+#		rm -f /usr/include/vga.h /usr/include/vgagl.h; \
-+#		echo Old header files in /usr/include removed.; \
-+#	fi
- 	@mkdir -p $(includedir)
- 	@cp $(srcdir)/src/vga.h $(includedir)/vga.h
- 	@chmod a+r $(includedir)/vga.h
-@@ -95,10 +95,10 @@
- 	@chmod a+r $(includedir)/vgakeyboard.h
- 
- installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
--	@if [ -f /usr/lib/libvga.sa ]; then \
--		rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
--		echo Old stubs in /usr/lib removed.; \
--	fi
-+#	@if [ -f /usr/lib/libvga.sa ]; then \
-+#		rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
-+#		echo Old stubs in /usr/lib removed.; \
-+#	fi
- ifndef KEEPSHAREDLIBS
- 	@echo "Removing shared library images (old & current)..."
- 	@for i in $(OBSOLETELDIRS); do \
-@@ -112,16 +112,16 @@
- 		(cd $(sharedlibdir); \
- 		 ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
- 	done
--	@./fixldsoconf
--	@ldconfig
-+#	@./fixldsoconf
-+#	@ldconfig
- 
- installstaticlib: static
- 	@echo Installing static libraries in $(libdir).
- 	@mkdir -p $(libdir)
--	@rm -f /usr/lib/libvga.a
-+#	@rm -f /usr/lib/libvga.a
- 	@$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
- 	@chmod a+r $(libdir)/libvga.a
--	@rm -f /usr/lib/libvgagl.a
-+#	@rm -f /usr/lib/libvgagl.a
- 	@$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
- 	@chmod a+r $(libdir)/libvgagl.a
- 
-@@ -130,14 +130,14 @@
- 		echo No $(bindir) directory, creating it.; \
- 		mkdir -p $(bindir); \
- 	fi
--	@if [ -f /usr/bin/restorefont ]; then \
--		echo Removing old utilities in /usr/bin.; \
--		for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
--	fi
--	@if [ -f /usr/bin/convfont ]; then \
--		echo Removing inappropriate utilities in /usr/bin.; \
--		rm -f /usr/bin/convfont /usr/bin/setmclk; \
--	fi
-+#	@if [ -f /usr/bin/restorefont ]; then \
-+#		echo Removing old utilities in /usr/bin.; \
-+#		for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
-+#	fi
-+#	@if [ -f /usr/bin/convfont ]; then \
-+#		echo Removing inappropriate utilities in /usr/bin.; \
-+#		rm -f /usr/bin/convfont /usr/bin/setmclk; \
-+#	fi
- 	@echo Installing textmode utilities in $(bindir):
- 	@echo "restorefont:      Save/restore textmode font."
- 	@cp utils/restorefont $(bindir)
-@@ -163,22 +163,22 @@
- 		mkdir $(datadir); \
- 		chmod go-w $(datadir); \
- 	fi
--	@if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
--	fi
--	@if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
--	fi
--	@if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
--		echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
--		mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
--	fi
--	@if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
--		echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
--		echo and changing $(datadir)/libvga.config appropriately. ; \
--	fi
-+#	@if [ \( -f /usr/local/lib/libvga.config -a ! -f $(datadir)/libvga.config \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.config to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
-+#	fi
-+#	@if [ \( -f /usr/local/lib/libvga.et4000 -a ! -f $(datadir)/libvga.et4000 \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.et4000 to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.et4000 $(datadir)/libvga.et4000; \
-+#	fi
-+#	@if [ \( -f /usr/local/lib/libvga.ega -a ! -f $(datadir)/libvga.ega \) ]; then \
-+#		echo "Moving old config file /usr/local/lib/libvga.ega to $(datadir)." ; \
-+#		mv -f /usr/local/lib/libvga.ega $(datadir)/libvga.ega; \
-+#	fi
-+#	@if [ \( -f /etc/mach32.eeprom -a ! -f $(datadir)/mach32.eeprom \) ]; then \
-+#		echo Consider moving your /etc/mach32.eeprom file to $(datadir) ; \
-+#		echo and changing $(datadir)/libvga.config appropriately. ; \
-+#	fi
- 	@if [ ! -f $(datadir)/libvga.config ]; then \
- 		echo Installing default configuration file in $(datadir).; \
- 		cp $(confdir)/libvga.config $(datadir)/libvga.config; \
-@@ -208,8 +208,8 @@
- lib3dkit-install:
- 	(cd threeDKit/; $(MAKE) install)
- 	 
--install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \
--	$(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) installmodule $(INSTALLDEV) \
-+install: installheaders $(INSTALLSHAREDLIB) installconfig \
-+	$(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) installmodule \
- 	lib3dkit-install
- 	@echo
- 	@echo
-@@ -286,15 +286,23 @@
- 	@rm -f sharedlib/DISTRIBUTION
- 	(cd $(dir $@); \
- 	 $(MAKE) -f $(srcdir)/src/Makefile $(notdir $@) \
--	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
-+	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" ; \
-+	 ln -sf libvga.so.$(VERSION) libvga.so \
- 	)
- 
--sharedlib/libvgagl.a sharedlib/libvgagl.so.$(VERSION): $(SHAREDDIRS)
-+sharedlib/libvgagl.a: $(SHAREDDIRS)
- 	(cd $(dir $@); \
- 	 $(MAKE) -f $(srcdir)/gl/Makefile $(notdir $@) \
- 	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" \
- 	)
- 
-+sharedlib/libvgagl.so.$(VERSION): $(SHAREDDIRS)
-+	(cd $(dir $@); \
-+	 $(MAKE) -f $(srcdir)/gl/Makefile $(notdir $@) \
-+	 	srcdir="$(srcdir)" DLLFLAGS="$(DLLFLAGS)" ; \
-+	 ln -sf libvgagl.so.$(VERSION) libvgagl.so \
-+	)
-+
- demoprogs: $(PREDEMO) $(DEMODIRS)
- 	@for dir in $(DEMODIRS); do \
- 		if [ -d $(srcdir)/$$dir ]; then \
-diff -urN svgalib-1.9.17/Makefile.cfg svgalib-1.9.17.gentoo/Makefile.cfg
---- svgalib-1.9.17/Makefile.cfg	2002-12-03 11:53:56.000000000 +0200
-+++ svgalib-1.9.17.gentoo/Makefile.cfg	2002-12-26 03:07:28.000000000 +0200
-@@ -44,7 +44,7 @@
- # Common prefix for installation directories.
- # NOTE: This directory must exist when you start the install.
- TOPDIR=
--prefix = $(TOPDIR)/usr/local
-+prefix = $(TOPDIR)/usr
- exec_prefix = $(prefix)
- 
- # Directory where the shared stubs and static library will be installed.
-@@ -57,13 +57,13 @@
- bindir = $(exec_prefix)/bin
- 
- # Directory where the run-time configuration files will be installed.
--datadir = $(TOPDIR)/etc/vga
-+datadir = $(TOPDIR)/etc/svgalib
- 
- # Directory where the header files will be installed.
- includedir = $(prefix)/include
- 
- # Directory where the man files will be installed.
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
- 
- # Target binary format.
- TARGET_FORMAT = elf
-@@ -93,7 +93,7 @@
- # LIBC_MEMCPY = y
- 
- # Uncomment this if you want to compile and install the static libs.
--# INSTALLSTATICLIB = installstaticlib
-+INSTALLSTATICLIB = installstaticlib
- 
- # Comment this out if you don't want to install the shared libs.
- # If you do not install the shared nor the static libs, 'make static'
-@@ -104,7 +104,7 @@
- # Comment this out if you want to keep old shared images. Old header files,
- # library stubs and static libraries CANNOT be kept in public locations
- # except when you rename them yourself.
--# KEEPSHAREDLIBS = keep
-+KEEPSHAREDLIBS = keep
- 
- # Comment this out if you don't want to compile and install the utilities.
- INSTALLUTILS = installutils
-@@ -281,10 +281,8 @@
- endif
- 
- 
--ifndef CFLAGS
--	OPTIMIZE = -fomit-frame-pointer -O2 -fno-strength-reduce -pipe -g
--else
--	OPTIMIZE := $(CFLAGS)
-+ifndef OPTIMIZE
-+	OPTIMIZE = -fomit-frame-pointer -O2 -fno-strength-reduce -pipe
- endif
- 
- # You might want to add -m386 here if you have a recently installed 
-@@ -292,15 +290,15 @@
- # generous alignment padding of function entry-points for the 486.
- WARN     = -Wall -Wstrict-prototypes
- INCLUDES = -I$(srcdir)/include -I.
--CFLAGS   = $(WARN) $(DLLFLAGS) $(INCLUDES) $(OPTIMIZE) $(DEFINES) 
-+CFLAGS   += $(WARN) $(DLLFLAGS) $(INCLUDES) $(OPTIMIZE) $(DEFINES)
--LDFLAGS   = -s
-+LDFLAGS   =
- 
- # additional flags for shared lib.
- DLLFLAGS = -fPIC
- 
- # Utilites used.
- AR	  = ar
--INSTALL_PROGRAM	= install -c -s -m 755 -o root -g bin
-+INSTALL_PROGRAM	= install -c -m 755 -o root -g bin
- INSTALL_SHLIB	= install -c -m 755 -o root -g bin
- INSTALL_DATA	= install -c -m 644 -o root -g bin
- 
-diff -urN svgalib-1.9.17/kernel/svgalib_helper/Makefile svgalib-1.9.17.gentoo/kernel/svgalib_helper/Makefile
---- svgalib-1.9.17/kernel/svgalib_helper/Makefile	2002-10-28 18:25:47.000000000 +0200
-+++ svgalib-1.9.17.gentoo/kernel/svgalib_helper/Makefile	2002-12-26 03:04:43.000000000 +0200
-@@ -35,8 +35,8 @@
- install: device modules_install
- 
- modules_install: $(TARGET).o
--	mkdir -p /lib/modules/$(VER)/kernel/misc 
--	install -m 0644 -c $(TARGET).o /lib/modules/$(VER)/kernel/misc
-+	mkdir -p $(TOPDIR)/lib/modules/$(VER)/misc 
-+	install -m 0644 -c $(TARGET).o $(TOPDIR)/lib/modules/$(VER)/misc
- 
- device:
- 	rm -f /dev/svgalib_helper* /dev/svga /dev/svga?
-diff -urN svgalib-1.9.17/src/Makefile svgalib-1.9.17.gentoo/src/Makefile
---- svgalib-1.9.17/src/Makefile	2002-07-06 19:59:26.000000000 +0200
-+++ svgalib-1.9.17.gentoo/src/Makefile	2002-12-26 02:57:40.000000000 +0200
-@@ -461,10 +461,6 @@
- vga.o: vga.c
- 	$(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
- 
--#lrmi must NOT be compiled as -fPIC
--lrmi.o: lrmi.c
--	$(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
--
- $(RAMDAC): %.o: %.c
- 	$(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
- 
-diff -urN svgalib-1.9.17/threeDKit/Makefile svgalib-1.9.17.gentoo/threeDKit/Makefile
---- svgalib-1.9.17/threeDKit/Makefile	2002-07-26 16:16:10.000000000 +0200
-+++ svgalib-1.9.17.gentoo/threeDKit/Makefile	2002-12-26 02:57:40.000000000 +0200
-@@ -14,7 +14,7 @@
- # Compiler Section (overrides Makefile.cfg)
- #----------------------------------------------------------------------
- 
--INCLUDES += -I$(srcdir)/src
-+INCLUDES += -I$(srcdir)/src -I$(srcdir)/gl
- 
- #----------------------------------------------------------------------
- # Rules Section
-diff -urN svgalib-1.9.17/utils/Makefile svgalib-1.9.17.gentoo/utils/Makefile
---- svgalib-1.9.17/utils/Makefile	1999-07-21 18:41:18.000000000 +0200
-+++ svgalib-1.9.17.gentoo/utils/Makefile	2002-12-26 02:57:40.000000000 +0200
-@@ -13,10 +13,11 @@
- # Compiler Section (overrides Makefile.cfg)
- #----------------------------------------------------------------------
- 
--CFLAGS = $(WARN) $(OPTIMIZE) -I../include
-+INCLUDES=-I../include
-+CFLAGS = $(WARN) $(OPTIMIZE) $(INCLUDES)
- #Use the next one for the Alpha/AXP if you need it
- #LDFLAGS = -L../staticlib 
--LIBS = -lvga -lm
-+LIBS = -L$(srcdir)/sharedlib -L$(srcdir)/staticlib -lvga -lm
- 
- #----------------------------------------------------------------------
- # Rules Section
-@@ -56,7 +57,7 @@
- 	$(INSTALLPROG) $(UTILPROGS) $(UTILINSTALLDIR)
- 
- .depend:
--	gcc -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
-+	gcc $(INCLUDES) -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
- 
- #
- # include a dependency file if one exists
---- svgalib-1.9.17/demos/lineart.c	2003-08-03 14:13:02.000000000 +0200
-+++ svgalib-1.9.17.gentoo/demos/lineart.c	2003-08-03 14:13:09.000000000 +0200
-@@ -19,7 +19,7 @@
-   
-   if(mode == 0)
-     {
--      printf("Usage:linp [mode mode ...]\n
-+      printf("Usage:linp [mode mode ...]\n\
-               where mode is an integer.\n");
-       return;
-     }
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
deleted file mode 100644
index daa224563392..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
+++ /dev/null
@@ -1,1114 +0,0 @@
-diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/Makefile svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/Makefile
---- svgalib-1.9.17/kernel/svgalib_helper/Makefile	2002-10-28 18:25:47.000000000 +0200
-+++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/Makefile	2003-08-03 14:34:40.000000000 +0200
-@@ -1,45 +1,69 @@
- include ../../Makefile.cfg
- 
--MODVER = $(shell grep CONFIG_MODVERSIONS $(INCLUDEDIR)/linux/autoconf.h)
-+ifndef INCLUDEDIR
-+INCLUDEDIR = /lib/modules/$(shell uname -r)/build/include
-+endif
-+
-+MODVER = $(shell grep CONFIG_MODVERSIONS $(INCLUDEDIR)/linux/autoconf.h 2>/dev/null)
- 
- ifeq ($(MODVER),)
- 	@echo INCLUDEDIR is not set up correctly
- 	exit 1
- endif
- 
--CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE -Wall $(DEBFLAGS) 
--CFLAGS += -I$(INCLUDEDIR)
--CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
--
--ifeq (1,$(findstring 1,$(MODVER)))
--	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
--endif
--
- # Extract version number from headers.
--VER = $(shell awk -F\" '/REL/ {print $$2}' $(INCLUDEDIR)/linux/version.h)
-+VER = $(shell awk -F\" '/REL/ {print $$2}' $(INCLUDEDIR)/linux/version.h 2>/dev/null)
- 
- # Use version of current running kernel
- ifeq ($(VER),)
- 	VER = $(shell uname -r)
- endif
- 
-+VER_MAJOR = $(shell echo $(VER) | cut -d. -f1)
-+VER_MINOR = $(shell echo $(VER) | cut -d. -f2)
-+
-+INCLUDES += -I$(INCLUDEDIR)
-+INCLUDES += -I$(INCLUDEDIR)/asm/mach-default
-+                                                                                                                            
-+#CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE -Wall $(DEBFLAGS)
-+CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE $(DEBFLAGS) -nostdinc -iwithprefix include
-+ifeq (2,$(VER_MAJOR))
-+	ifeq (6,$(VER_MINOR))
-+		CFLAGS += -DKBUILD_MODNAME="svgalib_helper"
-+	endif
-+endif
-+CFLAGS += $(INCLUDES)
-+CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
-+                                                                                                                            
-+ifeq (1,$(findstring 1,$(MODVER)))
-+	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
-+endif
-+
- TARGET = svgalib_helper
- OBJS = $(TARGET).o
-+ifeq (2,$(VER_MAJOR))
-+	ifeq (6,$(VER_MINOR))
-+		OBJS = $(TARGET).ko
-+	endif
-+endif
- SRC = main.c interrupt.c i810.c
- 
--all: .depend $(TARGET).o
-+all: .depend $(OBJS)
- 
- $(TARGET).o: $(SRC:.c=.o)
- 	$(LD) -r $^ -o $@
- 
-+$(TARGET).ko: $(TARGET).o
-+	$(LD) -d -r $^ -o $@
-+
- install: device modules_install
- 
--modules_install: $(TARGET).o
-+modules_install: $(OBJS)
- 	mkdir -p $(TOPDIR)/lib/modules/$(VER)/misc 
--	install -m 0644 -c $(TARGET).o $(TOPDIR)/lib/modules/$(VER)/misc
-+	install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/misc
- 
- device:
--	rm -f /dev/svgalib_helper* /dev/svga /dev/svga?
-+	rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
- 	mknod -m 666 /dev/svga c $(SVGALIB_HELPER_MAJOR) 0
- 	mknod -m 666 /dev/svga1 c $(SVGALIB_HELPER_MAJOR) 1
- 	mknod -m 666 /dev/svga2 c $(SVGALIB_HELPER_MAJOR) 2
-@@ -47,7 +71,7 @@ device:
- 	mknod -m 666 /dev/svga4 c $(SVGALIB_HELPER_MAJOR) 4
- 
- clean:
--	rm -f *.o *~ core .depend *.bak *.orig
-+	rm -f *.ko *.o *~ core .depend *.bak *.orig
- 
- depend .depend dep:
- 	$(CC) $(CFLAGS) -M *.c > $@
-diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel25compat.h svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel25compat.h
---- svgalib-1.9.17/kernel/svgalib_helper/kernel25compat.h	2002-09-10 20:20:13.000000000 +0200
-+++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel25compat.h	1970-01-01 02:00:00.000000000 +0200
-@@ -1,20 +0,0 @@
--#define minor(x) MINOR(x)
--
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
--#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(start,ofs,len,prot)
--#else
--#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(vma,start,ofs,len,prot)
--#endif
--
--#ifndef _LINUX_DEVFS_FS_KERNEL_H
--static inline int devfs_register_chrdev (unsigned int major, const char *name,
--                                         struct file_operations *fops)
--{
--    return register_chrdev (major, name, fops);
--}
--static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
--{
--    return unregister_chrdev (major, name);
--}
--#endif
--
-diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h
---- svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h	1970-01-01 02:00:00.000000000 +0200
-+++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h	2003-08-03 14:33:28.000000000 +0200
-@@ -0,0 +1,46 @@
-+#ifndef minor
-+#define minor(x) MINOR(x)
-+#endif
-+
-+#ifndef KERNEL_VERSION
-+#  include <linux/version.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+
-+# ifdef KERNEL_2_6
-+#  undef KERNEL_2_6
-+# endif
-+
-+#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(start,ofs,len,prot)
-+# ifndef IRQ_NONE
-+   typedef void irqreturn_t;
-+# endif
-+#else
-+
-+# ifndef KERNEL_2_6
-+#  define KERNEL_2_6
-+# endif
-+
-+#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(vma,start,ofs,len,prot)
-+
-+#include <linux/interrupt.h>
-+
-+# ifdef CONFIG_DEVFS_FS
-+typedef void* devfs_handle_t;
-+# endif
-+
-+#endif
-+
-+#ifndef _LINUX_DEVFS_FS_KERNEL_H
-+static inline int devfs_register_chrdev (unsigned int major, const char *name,
-+                                         struct file_operations *fops)
-+{
-+    return register_chrdev (major, name, fops);
-+}
-+static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
-+{
-+    return unregister_chrdev (major, name);
-+}
-+#endif
-+
-diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/main.c svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/main.c
---- svgalib-1.9.17/kernel/svgalib_helper/main.c	2002-09-10 20:20:23.000000000 +0200
-+++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/main.c	2003-08-03 14:35:53.000000000 +0200
-@@ -1,6 +1,12 @@
--#include <linux/module.h>
-+#include <linux/config.h>
-+
-+#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-+# define MODVERSIONS
-+#endif
- 
- #include <linux/kernel.h> /* printk() */
-+#include <linux/module.h>
-+
- #include <linux/slab.h> /* kmalloc() */
- #include <linux/fs.h>     /* everything... */
- #include <linux/errno.h>  /* error codes */
-@@ -15,7 +21,7 @@
- #include <linux/sched.h>
- #include <linux/wait.h>
- 
--#include "kernel25compat.h"
-+#include "kernel26compat.h"
- 
- #include <asm/uaccess.h>
- #include <asm/system.h>   /* cli(), *_flags */
-@@ -39,7 +45,7 @@ static struct sh_pci_device *sh_pci_devs
- 
- static int irqs[MAX_NR_DEVICES];
- 
--#ifdef CONFIG_DEVFS_FS
-+#if (defined CONFIG_DEVFS_FS) && (!defined KERNEL_2_6)
- static devfs_handle_t devfs_handle;
- #endif
- 
-@@ -47,11 +53,11 @@ static int check_io_range(port,device) {
-     return 1;
- }
- 
--static struct pci_dev *get_pci_dev(int pcipos, int minor) {
-+static struct pci_dev *get_pci_dev(int pcipos, int _minor) {
-     
--    if(minor>=num_devices) return NULL;
--    if(minor>0) {
--        return sh_pci_devs[minor]->dev;
-+    if(_minor>=num_devices) return NULL;
-+    if(_minor>0) {
-+        return sh_pci_devs[_minor]->dev;
-     } else {
-         if(pcipos>0 && pcipos<num_devices)
-             return sh_pci_devs[pcipos]->dev;
-@@ -60,11 +66,11 @@ static struct pci_dev *get_pci_dev(int p
- 
- }
- 
--static int get_dev(int pcipos, int minor) {
-+static int get_dev(int pcipos, int _minor) {
-     
--    if(minor>=num_devices) return 0;
--    if(minor>0) {
--        return minor;
-+    if(_minor>=num_devices) return 0;
-+    if(_minor>0) {
-+        return _minor;
-     } else {
-         int i;
-         int b, d;
-@@ -81,20 +87,33 @@ static int get_dev(int pcipos, int minor
- static volatile int vsync=0;
- static wait_queue_head_t vsync_wait;
- 
--static void vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-+static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
- {
-     struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
- 
-     if((char *)dev==sdev_id) {
--        if(!vga_test_vsync(dev))return;    
-+        if(!vga_test_vsync(dev))
-+#ifndef KERNEL_2_6
-+            return;
-+#else
-+            return IRQ_NONE;
-+#endif
-         vga_ack_vsync(dev);
-     } else {
--        if(!dev->test_vsync(dev)) return;
-+        if(!dev->test_vsync(dev))
-+#ifndef KERNEL_2_6
-+            return;
-+#else
-+            return IRQ_NONE;
-+#endif
-         dev->ack_vsync(dev);
-     }
- 
-     vsync=0;
-     wake_up_interruptible(&vsync_wait);
-+#ifdef KERNEL_2_6
-+    return IRQ_HANDLED;
-+#endif
- }
- 
- 
-@@ -103,10 +122,10 @@ static int svgalib_helper_ioctl( struct 
- 
-     io_t iov;
-     pcic_t pciv;
--    int minor = minor(inode->i_rdev);
-+    int _minor = minor(inode->i_rdev);
-     struct pci_dev *pdev;
-     io_string_t iostr;
--    int i, ret;
-+    int i = 0, ret;
-     u8 pb;
-     u16 pw;
-     u32 pl;
-@@ -126,7 +145,7 @@ static int svgalib_helper_ioctl( struct 
-             if (iostr.length>4096) return -EINVAL;
- 	    if ( (outb_str = kmalloc(iostr.length, GFP_KERNEL )) == NULL ) return -ENOMEM;
- 	    copy_from_user(outb_str,iostr.string,iostr.length);
--	    if(check_io_range(iostr.port,minor))
-+        if(check_io_range(iostr.port,_minor))
- 	        for(i=0; i<iostr.length; i++)
-                     outb(outb_str[i], iostr.port);
-                 else ret = -EPERM;
-@@ -135,28 +154,28 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSOUTB):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                outb(iov.val,iov.port);
-                else ret = -EPERM;
-         break;
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSOUTW):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                outw(iov.val,iov.port);
-                else ret = -EPERM;
-         break;
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSOUTL):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                outl(iov.val,iov.port);
-                else ret = -EPERM;
-         break;
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGINB):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                iov.val=inb(iov.port);
-                else ret = -EPERM;
-            copy_to_user((char *)arg,&iov,sizeof(iov));
-@@ -164,7 +183,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGINW):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                iov.val=inw(iov.port);
-                else ret = -EPERM;
-            copy_to_user((char *)arg,&iov,sizeof(iov));
-@@ -172,7 +191,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGINL):
-            copy_from_user(&iov,(char *)arg,sizeof(iov));
--           if(check_io_range(iov.port,minor))
-+           if(check_io_range(iov.port,_minor))
-                iov.val=inl(iov.port);
-                else ret = -EPERM;
-            copy_to_user((char *)arg,&iov,sizeof(iov));
-@@ -213,7 +232,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGPCIINB):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pci_read_config_byte(pdev, pciv.address, &pb);
-             pciv.val=pb;
-@@ -222,7 +241,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGPCIINW):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pci_read_config_word(pdev, pciv.address, &pw);
-             pciv.val=pw;
-@@ -231,7 +250,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGPCIINL):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pci_read_config_dword(pdev, pciv.address, &pl);
-             pciv.val=pl;
-@@ -240,7 +259,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCGPCIAPLEN):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            i = get_dev(pciv.pcipos, minor);
-+            i = get_dev(pciv.pcipos, _minor);
-             if((i==0) | (pciv.address>5)) return -EINVAL;
-             pciv.val=sh_pci_devs[i]->len[pciv.address];
-             copy_to_user((char *)arg,&pciv,sizeof(pciv));
-@@ -248,7 +267,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSPCIOUTB):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pb=pciv.val;
-             pci_write_config_byte(pdev, pciv.address, pb);
-@@ -256,7 +275,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSPCIOUTW):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pw=pciv.val;
-             pci_write_config_word(pdev, pciv.address, pw);
-@@ -264,7 +283,7 @@ static int svgalib_helper_ioctl( struct 
- 
-         case _IOC_NR(SVGALIB_HELPER_IOCSPCIOUTL):
-             copy_from_user(&pciv,(char *)arg,sizeof(pciv));
--            pdev = get_pci_dev(pciv.pcipos, minor);
-+            pdev = get_pci_dev(pciv.pcipos, _minor);
-             if(!pdev) return -EINVAL;
-             pl=pciv.val;
-             pci_write_config_dword(pdev, pciv.address, pl);
-@@ -284,17 +303,17 @@ static int svgalib_helper_ioctl( struct 
-         case _IOC_NR(SVGALIB_HELPER_IOCWAITRETRACE):
- 
-             /* Workaround for nvidia cards, which are not vga compatible */
--            if(!minor && num_devices==2) minor=1;
-+            if(!_minor && num_devices==2) _minor=1;
- 
--            if(minor) {
--                i=sh_pci_devs[minor]->dev->irq;
--                dev_id = sh_pci_devs[minor];
-+            if(_minor) {
-+                i=sh_pci_devs[_minor]->dev->irq;
-+                dev_id = sh_pci_devs[_minor];
-                 if(i==0 || i==-1 || i==255) return -EINVAL;
-             } else dev_id = sdev_id;
-                         
-             vsync=1;
- 
--            if(minor) {
-+            if(_minor) {
-                 request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", dev_id);
-             } else {
-                 i=0;
-@@ -302,16 +321,16 @@ static int svgalib_helper_ioctl( struct 
-                     request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", dev_id);
-             }
- 
--            if(minor) {
--                sh_pci_devs[minor]->enable_vsync(sh_pci_devs[minor]);
-+            if(_minor) {
-+                sh_pci_devs[_minor]->enable_vsync(sh_pci_devs[_minor]);
-             } else {
--                vga_enable_vsync(sh_pci_devs[minor]);
-+                vga_enable_vsync(sh_pci_devs[_minor]);
-             }
- 
-             interruptible_sleep_on(&vsync_wait);
-             
--            if(minor) {
--                if(vsync) sh_pci_devs[minor]->ack_vsync(dev_id);
-+            if(_minor) {
-+                if(vsync) sh_pci_devs[_minor]->ack_vsync(dev_id);
-                 free_irq(i, dev_id);
-             } else {
-                 i=0;
-@@ -331,17 +350,25 @@ static int svgalib_helper_ioctl( struct 
- 
- static int svgalib_helper_open( struct inode *inode, struct file * filp) {
- 
--   int minor = minor(inode->i_rdev);
-+   int _minor = minor(inode->i_rdev);
-    
--   if(minor>=num_devices) return -ENODEV;
-+   if(_minor>=num_devices) return -ENODEV;
-    
-+#ifndef KERNEL_2_6
-    MOD_INC_USE_COUNT;
-+#else
-+   try_module_get(THIS_MODULE);
-+#endif
-    
-    return 0;
- }
- 
- static int svgalib_helper_release( struct inode *inode, struct file *filp) {
-+#ifndef KERNEL_2_6
-    MOD_DEC_USE_COUNT;
-+#else
-+   module_put(THIS_MODULE);
-+#endif
-    
-    return 0;
- }
-@@ -399,14 +426,14 @@ int check_mem(int card, unsigned long st
- static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
-    unsigned long start=vma->vm_start;
-    unsigned long end=vma->vm_end;
--   unsigned long minor = minor(filp->f_dentry->d_inode->i_rdev);
-+   unsigned long _minor = minor(filp->f_dentry->d_inode->i_rdev);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
-    unsigned long ofs=vma->vm_pgoff*PAGE_SIZE;
- #else
-    unsigned long ofs=vma->vm_offset;
- #endif
- 
--   if(check_mem(minor, ofs, end-start)) return -EPERM;
-+   if(check_mem(_minor, ofs, end-start)) return -EPERM;
-    if(remap_cache(vma, ofs, start, end)) return -EAGAIN;
-    return 0;
- }
-@@ -432,14 +459,20 @@ int init_module(void)
-     int result, i, j;
-     struct pci_dev *dev=NULL;
- #ifdef CONFIG_DEVFS_FS
-+# ifndef KERNEL_2_6
-     devfs_handle_t slave_handle;
- #endif
-+#endif
-     /*
-      * Register your major, and accept a dynamic number
-      */
-      
-     printk(KERN_INFO "svgalib_helper: Initializing, version %s\n", versionstr);
-+#ifndef KERNEL_2_6
-     result = devfs_register_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper", &svgalib_helper_fops);
-+#else
-+    result = register_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper", &svgalib_helper_fops);
-+#endif
-     if (result < 0) {
-         printk(KERN_WARNING "svgalib_helper: can't get major %d\n",SVGALIB_HELPER_MAJOR);
-         return result;
-@@ -453,15 +486,26 @@ int init_module(void)
-     for(i=1;i<MAX_NR_DEVICES;i++) sh_pci_devs[i]=NULL;
- 
- #ifdef CONFIG_DEVFS_FS
-+# ifndef KERNEL_2_6
-     devfs_handle = devfs_mk_dir ( NULL, "svga_helper", NULL );
-     devfs_register_series( devfs_handle,
-                "%u", 8, DEVFS_FL_DEFAULT, SVGALIB_HELPER_MAJOR, 0,
-                        S_IFCHR |  S_IRUGO | S_IRWXU, &svgalib_helper_fops, NULL ) ;
-     devfs_mk_symlink( NULL, "svga", 0, "svga_helper/0", &slave_handle, NULL );
-     devfs_auto_unregister( devfs_handle, slave_handle );
-+# else
-+    devfs_mk_dir ("svga_helper");
-+    for (i = 0; i < 8; i++) {
-+        devfs_mk_cdev(MKDEV(SVGALIB_HELPER_MAJOR, i),
-+                S_IFCHR |  S_IRUGO | S_IRWXU, "svga_helper/%d", i);
-+    }
-+    devfs_mk_symlink("svga", "svga_helper/0");
-+# endif
- #endif /* devfsd support */
- 
-+#ifndef KERNEL_2_6
-     if(pci_present()) {
-+#endif
-         while((dev=pci_find_class(PCI_CLASS_DISPLAY_VGA<<8,dev)) && 
-               (num_devices<=MAX_NR_DEVICES)) {
-             if((sh_pci_devs[num_devices]=kmalloc(sizeof(struct sh_pci_device),GFP_KERNEL))==NULL) {
-@@ -496,7 +540,9 @@ int init_module(void)
-             vga_init_vsync(sh_pci_devs[num_devices]);
-             num_devices++;
-         }
-+#ifndef KERNEL_2_6
-     }
-+#endif
-     
-     j=0;
-     for(i=1; i<num_devices;i++) {
-@@ -512,14 +558,20 @@ int init_module(void)
- 
-     init_waitqueue_head(&vsync_wait);
- 
-+#ifndef KERNEL_2_6
-     EXPORT_NO_SYMBOLS;
-+#endif
- 
-     return 0; /* succeed */
- 
-     nomem_error:
-     for(i=0;i<MAX_NR_DEVICES;i++) 
-         if(sh_pci_devs[i])kfree(sh_pci_devs[i]);     
-+#ifndef KERNEL_2_6
-     devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
-+#else
-+    unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
-+#endif
-     return result;
- }
- 
-@@ -532,9 +584,20 @@ void cleanup_module(void)
-         }
-      
- #ifdef CONFIG_DEVFS_FS
-+# ifndef KERNEL_2_6
-     devfs_unregister(devfs_handle);
-+# else
-+    for (i = 0; i < 8; i++)
-+        devfs_remove("svga_helper/%d", i);
-+    devfs_remove("svga_helper");
-+    devfs_remove("svga");
- #endif
-+#endif
-+#ifndef KERNEL_2_6
-     devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
-+#else
-+    unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
-+#endif
- }
- 
- #ifdef MODULE_LICENSE
-diff -ur svgalib-1.9.17/include/vga.h svgalib-1.9.17.kernel2.6/include/vga.h
---- svgalib-1.9.17/include/vga.h	2002-08-04 10:31:07.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/include/vga.h	2004-02-01 21:08:09.000000000 +0000
-@@ -534,6 +534,11 @@
- #define BLITS_SYNC			0
- #define BLITS_IN_BACKGROUND		0x1
- 
-+/* 2.6 Framebuffer code defines this; we don't need it */
-+#ifdef ROP_XOR
-+# undef ROP_XOR
-+#endif
-+
- /* Raster ops. */
- #define ROP_COPY			0	/* Straight copy. */
- #define ROP_OR				1	/* Source OR destination. */
-diff -ur svgalib-1.9.17/src/drivers/ali.c svgalib-1.9.17.kernel2.6/src/drivers/ali.c
---- svgalib-1.9.17/src/drivers/ali.c	2002-04-20 22:48:20.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/ali.c	2004-02-01 21:08:08.000000000 +0000
-@@ -186,7 +186,7 @@
- static int ali_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- 
-     regs = LOOKUPMODE(ali_modes, mode);
-     if (regs == NULL || mode == GPLANE16) {
-diff -ur svgalib-1.9.17/src/drivers/apm.c svgalib-1.9.17.kernel2.6/src/drivers/apm.c
---- svgalib-1.9.17/src/drivers/apm.c	2002-08-04 14:25:51.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/apm.c	2004-02-01 21:08:08.000000000 +0000
-@@ -193,7 +193,7 @@
- 
- static int apm_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/ark.c svgalib-1.9.17.kernel2.6/src/drivers/ark.c
---- svgalib-1.9.17/src/drivers/ark.c	2002-08-04 11:28:35.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/ark.c	2004-02-01 21:08:08.000000000 +0000
-@@ -154,7 +154,7 @@
- 
- static int ark_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeInfo *modeinfo;
-     ModeTiming *modetiming;
- 
-diff -ur svgalib-1.9.17/src/drivers/banshee.c svgalib-1.9.17.kernel2.6/src/drivers/banshee.c
---- svgalib-1.9.17/src/drivers/banshee.c	2002-08-04 11:14:50.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/banshee.c	2004-02-01 21:08:08.000000000 +0000
-@@ -134,7 +134,7 @@
- 
- static int banshee_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/chips.c svgalib-1.9.17.kernel2.6/src/drivers/chips.c
---- svgalib-1.9.17/src/drivers/chips.c	2002-07-25 14:01:11.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/chips.c	2004-02-01 21:08:08.000000000 +0000
-@@ -1035,7 +1035,7 @@
- /*----------------------------------------------------------------------*/
- static int CHIPS_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/cirrus.c svgalib-1.9.17.kernel2.6/src/drivers/cirrus.c
---- svgalib-1.9.17/src/drivers/cirrus.c	2002-08-04 11:31:14.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/cirrus.c	2004-02-01 21:08:08.000000000 +0000
-@@ -387,7 +387,7 @@
- 
- static int cirrus_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/et3000.c svgalib-1.9.17.kernel2.6/src/drivers/et3000.c
---- svgalib-1.9.17/src/drivers/et3000.c	2002-04-20 22:47:53.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/et3000.c	2004-02-01 21:08:08.000000000 +0000
-@@ -151,7 +151,7 @@
- static int et3000_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- 
-     regs = LOOKUPMODE(et3000_modes, mode);
-     if (regs == NULL || mode == GPLANE16)
-diff -ur svgalib-1.9.17/src/drivers/et4000.c svgalib-1.9.17.kernel2.6/src/drivers/et4000.c
---- svgalib-1.9.17/src/drivers/et4000.c	2002-07-25 14:04:57.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/et4000.c	2004-02-01 21:08:08.000000000 +0000
-@@ -561,7 +561,7 @@
- static int et4000_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- 
-     regs = LOOKUPMODE(et4000_modes, mode);
-     if (regs == NULL || mode == GPLANE16)
-diff -ur svgalib-1.9.17/src/drivers/et6000.c svgalib-1.9.17.kernel2.6/src/drivers/et6000.c
---- svgalib-1.9.17/src/drivers/et6000.c	2002-06-14 21:54:33.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/et6000.c	2004-02-01 21:08:08.000000000 +0000
-@@ -708,7 +708,7 @@
- static int  et6000_modeavailable(int mode)
- {
-   int rtn;
--  struct info *info;
-+  struct vgainfo *info;
-   ModeTiming *modetiming;
-   ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/g400.c svgalib-1.9.17.kernel2.6/src/drivers/g400.c
---- svgalib-1.9.17/src/drivers/g400.c	2002-08-08 12:14:52.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/g400.c	2004-02-01 21:08:08.000000000 +0000
-@@ -198,7 +198,7 @@
- 
- static int g400_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/g450c2.c svgalib-1.9.17.kernel2.6/src/drivers/g450c2.c
---- svgalib-1.9.17/src/drivers/g450c2.c	2002-04-30 08:36:18.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/g450c2.c	2004-02-01 21:08:08.000000000 +0000
-@@ -153,7 +153,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/i740.c svgalib-1.9.17.kernel2.6/src/drivers/i740.c
---- svgalib-1.9.17/src/drivers/i740.c	2002-08-04 11:23:11.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/i740.c	2004-02-01 21:08:08.000000000 +0000
-@@ -284,7 +284,7 @@
- 
- static int i740_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/i810.c svgalib-1.9.17.kernel2.6/src/drivers/i810.c
---- svgalib-1.9.17/src/drivers/i810.c	2002-08-04 11:23:51.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/i810.c	2004-02-01 21:08:08.000000000 +0000
-@@ -270,7 +270,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/laguna.c svgalib-1.9.17.kernel2.6/src/drivers/laguna.c
---- svgalib-1.9.17/src/drivers/laguna.c	2002-08-04 11:15:55.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/laguna.c	2004-02-01 21:08:08.000000000 +0000
-@@ -184,7 +184,7 @@
- 
- static int laguna_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/mach32.c svgalib-1.9.17.kernel2.6/src/drivers/mach32.c
---- svgalib-1.9.17/src/drivers/mach32.c	2002-07-25 14:03:11.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/mach32.c	2004-02-01 21:08:08.000000000 +0000
-@@ -1837,7 +1837,7 @@
-     return 0;
- }
- 
--static inline int col2msk(struct info *iptr)
-+static inline int col2msk(struct vgainfo *iptr)
- {
-     switch (iptr->colors) {
-     case 1 << 24:
-@@ -1864,12 +1864,12 @@
-     return 0;
- }
- 
--static inline int col2bypp(struct info *iptr)
-+static inline int col2bypp(struct vgainfo *iptr)
- {
-     return iptr->bytesperpixel;
- }
- 
--static int mach32_log2(struct info *iptr)
-+static int mach32_log2(struct vgainfo *iptr)
- {
-     int res = -1, n = iptr->colors;
- 
-@@ -1885,7 +1885,7 @@
- static void mach32_modfill(const mode_entry * mode, int modemask, int forcein)
- {
-     register int i;
--    register struct info *iptr;
-+    register struct vgainfo *iptr;
-     register unsigned wid, hei;
- 
-     float horz, vert, n_horz, n_vert, cmpvert;
-@@ -3061,7 +3061,7 @@
- }
- 
- static char *
-- colstr(struct info *mode)
-+ colstr(struct vgainfo *mode)
- {
-     static char str[4];
-     if (mode->colors <= 256) {
-diff -ur svgalib-1.9.17/src/drivers/millennium.c svgalib-1.9.17.kernel2.6/src/drivers/millennium.c
---- svgalib-1.9.17/src/drivers/millennium.c	2002-08-04 11:24:30.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/millennium.c	2004-02-01 21:08:08.000000000 +0000
-@@ -628,7 +628,7 @@
- 
- static int mil_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/mx.c svgalib-1.9.17.kernel2.6/src/drivers/mx.c
---- svgalib-1.9.17/src/drivers/mx.c	2002-08-04 11:21:05.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/mx.c	2004-02-01 21:08:08.000000000 +0000
-@@ -181,7 +181,7 @@
- 
- static int mx_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/neo.c svgalib-1.9.17.kernel2.6/src/drivers/neo.c
---- svgalib-1.9.17/src/drivers/neo.c	2002-08-04 11:32:20.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/neo.c	2004-02-01 21:08:08.000000000 +0000
-@@ -442,7 +442,7 @@
- 
- static int neo_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/nv3.c svgalib-1.9.17.kernel2.6/src/drivers/nv3.c
---- svgalib-1.9.17/src/drivers/nv3.c	2002-08-04 10:35:40.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/nv3.c	2004-02-01 21:08:08.000000000 +0000
-@@ -152,7 +152,7 @@
- 
- static int nv3_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/oak.c svgalib-1.9.17.kernel2.6/src/drivers/oak.c
---- svgalib-1.9.17/src/drivers/oak.c	2002-08-04 11:33:29.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/oak.c	2004-02-01 21:08:08.000000000 +0000
-@@ -275,7 +275,7 @@
- static int oak_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- 
-     regs = LOOKUPMODE(oak_modes, mode);
-     if (regs == NULL || mode == GPLANE16) {
-diff -ur svgalib-1.9.17/src/drivers/paradise.c svgalib-1.9.17.kernel2.6/src/drivers/paradise.c
---- svgalib-1.9.17/src/drivers/paradise.c	2002-04-20 22:47:27.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/paradise.c	2004-02-01 21:08:08.000000000 +0000
-@@ -224,7 +224,7 @@
- static int paradise_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- #ifdef DEBUG
-  fprintf(stderr,"paradise_modeavailable\n");
- #endif
-diff -ur svgalib-1.9.17/src/drivers/pm2.c svgalib-1.9.17.kernel2.6/src/drivers/pm2.c
---- svgalib-1.9.17/src/drivers/pm2.c	2002-10-15 14:14:40.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/pm2.c	2004-02-01 21:08:08.000000000 +0000
-@@ -214,7 +214,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/r128.c svgalib-1.9.17.kernel2.6/src/drivers/r128.c
---- svgalib-1.9.17/src/drivers/r128.c	2002-09-04 16:28:10.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/r128.c	2004-02-01 21:08:08.000000000 +0000
-@@ -1024,7 +1024,7 @@
- 
- static int r128_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/rage.c svgalib-1.9.17.kernel2.6/src/drivers/rage.c
---- svgalib-1.9.17/src/drivers/rage.c	2002-08-04 11:20:27.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/rage.c	2004-02-01 21:08:08.000000000 +0000
-@@ -611,7 +611,7 @@
- 
- static int rage_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/rendition.c svgalib-1.9.17.kernel2.6/src/drivers/rendition.c
---- svgalib-1.9.17/src/drivers/rendition.c	2002-08-04 11:22:18.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/rendition.c	2004-02-01 21:08:08.000000000 +0000
-@@ -142,7 +142,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/s3.c svgalib-1.9.17.kernel2.6/src/drivers/s3.c
---- svgalib-1.9.17/src/drivers/s3.c	2002-08-04 11:33:05.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/s3.c	2004-02-01 21:08:08.000000000 +0000
-@@ -484,7 +484,7 @@
- 
- static int s3_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeInfo *modeinfo;
-     ModeTiming *modetiming;
- 
-diff -ur svgalib-1.9.17/src/drivers/savage.c svgalib-1.9.17.kernel2.6/src/drivers/savage.c
---- svgalib-1.9.17/src/drivers/savage.c	2002-10-15 18:06:30.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/savage.c	2004-02-01 21:08:08.000000000 +0000
-@@ -415,7 +415,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/sis.c svgalib-1.9.17.kernel2.6/src/drivers/sis.c
---- svgalib-1.9.17/src/drivers/sis.c	2002-08-04 11:44:41.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/sis.c	2004-02-01 21:08:08.000000000 +0000
-@@ -212,7 +212,7 @@
- 
- static int sis_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/skeleton.h svgalib-1.9.17.kernel2.6/src/drivers/skeleton.h
---- svgalib-1.9.17/src/drivers/skeleton.h	2002-05-17 20:00:00.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/skeleton.h	2004-02-01 21:08:08.000000000 +0000
-@@ -80,7 +80,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/trident.c svgalib-1.9.17.kernel2.6/src/drivers/trident.c
---- svgalib-1.9.17/src/drivers/trident.c	2002-12-10 10:42:52.000000000 +0000
-+++ svgalib-1.9.17.kernel2.6/src/drivers/trident.c	2004-02-01 21:08:08.000000000 +0000
-@@ -290,7 +290,7 @@
- 
- static int modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/drivers/tvga8900.c svgalib-1.9.17.kernel2.6/src/drivers/tvga8900.c
---- svgalib-1.9.17/src/drivers/tvga8900.c	2002-07-25 14:00:31.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/tvga8900.c	2004-02-01 21:08:08.000000000 +0000
-@@ -498,7 +498,7 @@
- static int tvga8900_modeavailable(int mode)
- {
-     const unsigned char *regs;
--    struct info *info;
-+    struct vgainfo *info;
- 
-     regs = LOOKUPMODE(tvga_modes, mode);
-     if (regs == NULL || mode == GPLANE16)
-diff -ur svgalib-1.9.17/src/drivers/vesa.c svgalib-1.9.17.kernel2.6/src/drivers/vesa.c
---- svgalib-1.9.17/src/drivers/vesa.c	2002-08-04 11:32:48.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/drivers/vesa.c	2004-02-01 21:08:08.000000000 +0000
-@@ -139,7 +139,7 @@
- 
- static int vesa_modeavailable(int mode)
- {
--    struct info *info;
-+    struct vgainfo *info;
-     ModeTiming *modetiming;
-     ModeInfo *modeinfo;
- 
-diff -ur svgalib-1.9.17/src/libvga.h svgalib-1.9.17.kernel2.6/src/libvga.h
---- svgalib-1.9.17/src/libvga.h	2002-08-01 10:33:32.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/libvga.h	2004-02-01 21:08:08.000000000 +0000
-@@ -103,7 +103,7 @@
- #define GPLANE16   G640x350x16
- 
- /* graphics mode information */
--struct info {
-+struct vgainfo {
-     int xdim;
-     int ydim;
-     int colors;
-@@ -127,10 +127,10 @@
- extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
- extern unsigned long __svgalib_linear_mem_base, __svgalib_linear_mem_size;
- extern unsigned long __svgalib_mmio_base, __svgalib_mmio_size;
--extern struct info CI;		/* current video parameters */
-+extern struct vgainfo CI;		/* current video parameters */
- extern int COL;			/* current color            */
- extern int CM;			/* current video mode       */
--extern struct info infotable[];
-+extern struct vgainfo infotable[];
- extern int SCREENON;		/* screen visible if != 0 */
- extern unsigned long __svgalib_graph_base;
- extern unsigned char *GM;	/* graphics memory frame */
-diff -ur svgalib-1.9.17/src/vga.c svgalib-1.9.17.kernel2.6/src/vga.c
---- svgalib-1.9.17/src/vga.c	2002-09-05 11:58:24.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/vga.c	2004-02-01 21:08:08.000000000 +0000
-@@ -87,7 +87,7 @@
- /* If == 0 then nothing is defined by the user... */
- int __svgalib_default_mode = 10;
- 
--struct info infotable[] =
-+struct vgainfo infotable[] =
- {
-     {80, 25, 16, 160, 0},	/* VGAlib VGA modes */
-     {320, 200, 16, 40, 0},
-@@ -280,7 +280,7 @@
-     {0, 0, 0, 0, 0}
- };
- 
--#define MAX_MODES (sizeof(infotable) / sizeof(struct info))
-+#define MAX_MODES (sizeof(infotable) / sizeof(struct vgainfo))
- 
- void (*__svgalib_go_to_background) (void) = 0;
- void (*__svgalib_come_from_background) (void) = 0;
-@@ -372,7 +372,7 @@
- static int flip_mode = TEXT;	/* flipped video mode       */
- 
- int CM = TEXT;			/* current video mode       */
--struct info CI;			/* current video parameters */
-+struct vgainfo CI;			/* current video parameters */
- int COL;			/* current color            */
- 
- static int initialized = 0;	/* flag: initialize() called ?  */
-diff -ur svgalib-1.9.17/src/vga.h svgalib-1.9.17.kernel2.6/src/vga.h
---- svgalib-1.9.17/src/vga.h	2002-08-04 10:31:07.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/src/vga.h	2004-02-01 21:08:08.000000000 +0000
-@@ -534,6 +534,11 @@
- #define BLITS_SYNC			0
- #define BLITS_IN_BACKGROUND		0x1
- 
-+/* 2.6 Framebuffer code defines this; we don't need it */
-+#ifdef ROP_XOR
-+# undef ROP_XOR
-+#endif
-+
- /* Raster ops. */
- #define ROP_COPY			0	/* Straight copy. */
- #define ROP_OR				1	/* Source OR destination. */
-diff -ur svgalib-1.9.17/svpmi/svpmi.c svgalib-1.9.17.kernel2.6/svpmi/svpmi.c
---- svgalib-1.9.17/svpmi/svpmi.c	1995-09-30 15:50:30.000000000 +0100
-+++ svgalib-1.9.17.kernel2.6/svpmi/svpmi.c	2004-02-01 21:08:08.000000000 +0000
-@@ -62,7 +62,7 @@
- static int
- svpmi_modeavailable (int mode)
- {
--  struct info *info;
-+  struct vgainfo *info;
-   svpmi_modeentry *sm;
- 
-   if (mode < 10)
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-modversions_h.patch b/media-libs/svgalib/files/svgalib-1.9.17-modversions_h.patch
deleted file mode 100644
index 8c8a3584b77e..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.17-modversions_h.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- svgalib-1.9.17/kernel/svgalib_helper/Makefile.orig	2003-08-06 22:05:18.173676000 +0200
-+++ svgalib-1.9.17/kernel/svgalib_helper/Makefile	2003-08-06 22:05:30.355824032 +0200
-@@ -1,14 +1,13 @@
- include ../../Makefile.cfg
- 
- ifndef INCLUDEDIR
--INCLUDEDIR = /lib/modules/$(shell uname -r)/build/include
-+ INCLUDEDIR = /lib/modules/$(shell uname -r)/build/include
- endif
- 
- MODVER = $(shell grep CONFIG_MODVERSIONS $(INCLUDEDIR)/linux/autoconf.h 2>/dev/null)
- 
- ifeq ($(MODVER),)
--	@echo INCLUDEDIR is not set up correctly
--	exit 1
-+ $(error INCLUDEDIR is not set up correctly)
- endif
- 
- # Extract version number from headers.
-@@ -16,11 +15,12 @@
- 
- # Use version of current running kernel
- ifeq ($(VER),)
--	VER = $(shell uname -r)
-+ VER = $(shell uname -r)
- endif
- 
- VER_MAJOR = $(shell echo $(VER) | cut -d. -f1)
- VER_MINOR = $(shell echo $(VER) | cut -d. -f2)
-+#VER_MICRO = $(shell echo $(VER) | cut -d. -f3 | sed -e 's:[^0-9].*::')
- 
- INCLUDES += -I$(INCLUDEDIR)
- INCLUDES += -I$(INCLUDEDIR)/asm/mach-default
-@@ -28,23 +28,36 @@
- #CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE -Wall $(DEBFLAGS)
- CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE $(DEBFLAGS) -nostdinc -iwithprefix include
- ifeq (2,$(VER_MAJOR))
--	ifeq (6,$(VER_MINOR))
--		CFLAGS += -DKBUILD_MODNAME="svgalib_helper"
--	endif
-+ ifeq (6,$(VER_MINOR))
-+  CFLAGS += -DKBUILD_MODNAME="svgalib_helper"
-+ endif
- endif
- CFLAGS += $(INCLUDES)
- CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
-                                                                                                                             
- ifeq (1,$(findstring 1,$(MODVER)))
--	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
-+ MODHEADER1 = $(shell ls -1 $(INCLUDEDIR)/linux/modversions.h 2>/dev/null)
-+ MODHEADER2 = $(shell ls -1 $(INCLUDEDIR)/config/modversions.h 2>/dev/null)
-+
-+ ifneq ($(MODHEADER1),)
-+  MODHEADER = $(MODHEADER1)
-+ else
-+  ifneq ($(MODHEADER2),)
-+   MODHEADER = $(MODHEADER2)
-+  else
-+   $(error Cannot find modversions.h!)
-+  endif
-+ endif
-+
-+ CFLAGS += -DMODVERSIONS -include $(MODHEADER)
- endif
- 
- TARGET = svgalib_helper
- OBJS = $(TARGET).o
- ifeq (2,$(VER_MAJOR))
--	ifeq (6,$(VER_MINOR))
--		OBJS = $(TARGET).ko
--	endif
-+ ifeq (6,$(VER_MINOR))
-+  OBJS = $(TARGET).ko
-+ endif
- endif
- SRC = main.c interrupt.c i810.c
- 
-@@ -78,5 +91,5 @@
- 
- 
- ifeq (.depend,$(wildcard .depend))
--include .depend
-+ include .depend
- endif