new version

9 files changed, 422 insertions, 68 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 438c45dd60d4..2a843689c4fa 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,8 +1,19 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.9 2002/12/13 12:38:48 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.10 2002/12/26 01:27:42 azarah Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+*svgalib-1.9.17 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> svgalib-1.4.3-r4.ebuild :
+  Update version.
+
+*svgalib-1.4.3-r4 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> svgalib-1.4.3-r4.ebuild :
+  Update r128 driver, bug #10987.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
  
 *svgalib-1.4.3-r3 (03 Dec 2002)
 
diff --git a/media-libs/svgalib/files/digest-svgalib-1.4.3-r2 b/media-libs/svgalib/files/digest-svgalib-1.4.3-r2
deleted file mode 100644
index 0d27a405e4c3..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.4.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d2778e3beebc07dd7c74668f6887c6f svgalib-1.4.3.tar.gz 840282
diff --git a/media-libs/svgalib/files/digest-svgalib-1.4.3-r1 b/media-libs/svgalib/files/digest-svgalib-1.4.3-r4
index 0d27a405e4c3..5575b0d42a6c 100644
--- a/media-libs/svgalib/files/digest-svgalib-1.4.3-r1
+++ b/media-libs/svgalib/files/digest-svgalib-1.4.3-r4
@@ -1 +1,2 @@
 MD5 7d2778e3beebc07dd7c74668f6887c6f svgalib-1.4.3.tar.gz 840282
+MD5 199703b258bc862b10e729e705154753 r128.c 35401
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.17 b/media-libs/svgalib/files/digest-svgalib-1.9.17
new file mode 100644
index 000000000000..c9f9b62846dc
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.17
@@ -0,0 +1 @@
+MD5 e1599bb3222899d39ce1a2af36670a98 svgalib-1.9.17.tar.gz 921750
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch
new file mode 100644
index 000000000000..a0cc7ed6abbf
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.17-gentoo.patch
@@ -0,0 +1,297 @@
+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
diff --git a/media-libs/svgalib/svgalib-1.4.3-r1.ebuild b/media-libs/svgalib/svgalib-1.4.3-r1.ebuild
deleted file mode 100644
index a26a2aa09714..000000000000
--- a/media-libs/svgalib/svgalib-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r1.ebuild,v 1.5 2002/12/09 04:26:14 manson Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a library for running svga graphics on the console"
-SRC_URI="http://www.svgalib.org/${P}.tar.gz"
-HOMEPAGE="http://www.svgalib.org/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 -ppc -sparc "
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-
-	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || die
-	# Build the gl stuff tpp
-	make OPTIMIZE="${CFLAGS}" -C gl || die
-	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
-
-	cp Makefile Makefile.orig
-	sed 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
-	 	Makefile.orig > Makefile
-}
-
-src_install () {
-
-	dodir /etc/{vga,svga} /usr/{include,lib,bin,share/man}
-	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a gl/libvgagl.a
-	dolib.so gl/libvgagl.so.${PV}
-	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-
-	insinto /usr/include
-	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
-	doins src/keyboard/vgakeyboard.h
-
-	cd doc
-	dodoc 0-README CHANGES* DESIGN NEWS TODO
-	docinto txt
-	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
-
-}
diff --git a/media-libs/svgalib/svgalib-1.4.3-r2.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index 01c3a0239790..8fc2d3fc44d1 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r2.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
@@ -1,24 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r2.ebuild,v 1.2 2002/12/09 04:26:14 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.1 2002/12/26 01:27:42 azarah Exp $
 
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
 DESCRIPTION="A library for running svga graphics on the console"
+SRC_URI="http://www.svgalib.org/${P}.tar.gz
+	http://www.arava.co.il/matan/svgalib/r128.c"
 HOMEPAGE="http://www.svgalib.org/"
-LICENSE="BSD"
-
-DEPEND="virtual/glibc"
 
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 -ppc -sparc "
 
-S=${WORKDIR}/${P}
-SRC_URI="http://www.svgalib.org/${P}.tar.gz"
+DEPEND="virtual/glibc"
 
 
 src_unpack() {
-	unpack ${A}
+
+	unpack ${P}.tar.gz
+	
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	# Update r128 driver, bug #10987.
+	cp -f ${DISTDIR}/r128.c ${S}/src
 }
 
 src_compile() {
@@ -35,7 +44,7 @@ src_compile() {
 		Makefile.orig > Makefile
 }
 
-src_install () {
+src_install() {
 
 	dodir /etc/{vga,svga} /usr/{include,lib,bin,share/man}
 	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
@@ -44,6 +53,7 @@ src_install () {
 	dolib.a gl/libvgagl.a
 	dolib.so gl/libvgagl.so.${PV}
 	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+	preplib
 
 	insinto /usr/include
 	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
@@ -67,5 +77,5 @@ src_install () {
 	dodoc 0-README CHANGES* DESIGN NEWS TODO
 	docinto txt
 	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
-
 }
+
diff --git a/media-libs/svgalib/svgalib-1.9.16.ebuild b/media-libs/svgalib/svgalib-1.9.16.ebuild
index ab5cbdc261b7..a52c4039b204 100644
--- a/media-libs/svgalib/svgalib-1.9.16.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.16.ebuild,v 1.2 2002/12/09 04:26:14 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.16.ebuild,v 1.3 2002/12/26 01:27:42 azarah Exp $
 
 IUSE=""
 
@@ -82,6 +82,6 @@ src_install() {
 
 pkg_postinst() {
 
-	 [ "${ROOT}" = "/" ] && /sbin/update-modules &> /dev/null
+	 [ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
 }
 
diff --git a/media-libs/svgalib/svgalib-1.9.17.ebuild b/media-libs/svgalib/svgalib-1.9.17.ebuild
new file mode 100644
index 000000000000..6ca01782fbaa
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.17.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.17.ebuild,v 1.1 2002/12/26 01:27:42 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="A library for running svga graphics on the console"
+SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.svgalib.org/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 -ppc -sparc "
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+
+	unpack ${A}
+	
+	cd ${S};
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+
+	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || die
+	# Build the gl stuff tpp
+	make OPTIMIZE="${CFLAGS}" -C gl || die
+	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
+	rm -f src/svgalib_helper.h
+	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} || die
+	cp -a src/libvga.so.${PV} sharedlib/
+	make OPTIMIZE="${CFLAFS}" LDFLAGS='-L ../sharedlib' \
+		-C threeDKit lib3dkit.a || die
+	make INCLUDEDIR="/usr/src/linux/include" -C kernel/svgalib_helper
+	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L ../sharedlib' demoprogs || die
+	cp Makefile Makefile.orig
+	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
+	 	Makefile.orig > Makefile
+}
+
+src_install() {
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a gl/libvgagl.a
+	dolib.a threeDKit/lib3dkit.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+	preplib
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h
+
+	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
+
+	cd ${S}/demos
+	exeinto /usr/lib/svgalib/demos
+	local DEMO_PROGS="fun testgl speedtest mousetest vgatest scrolltest \
+		testlinear \
+		keytest testaccel accel forktest eventtest spin bg_test printftest \
+		joytest mjoytest bankspeed lineart linearspeed addmodetest \
+		svidtune linearfork vgatweak"
+	doexe ${DEMO_PROGS}
+
+	cd ${S}/threeDKit
+	exeinto /usr/lib/svgalib/theeDKit
+	local THREED_PROGS="plane wrapdemo"
+	doexe ${THREED_PROGS}
+
+	cd ${S}/doc
+	dodoc CHANGES DESIGN TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+}
+
+pkg_postinst() {
+
+	 [ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
+}
+