Version bump #90175 by Peter Gordon.

(Portage version: 2.0.51.20)

3 files changed, 131 insertions, 0 deletions

diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21 b/media-libs/svgalib/files/digest-svgalib-1.9.21
new file mode 100644
index 000000000000..b01ecc6bf94e
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.21
@@ -0,0 +1 @@
+MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274
diff --git a/media-libs/svgalib/files/svgalib-1.9.21-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.21-gentoo.patch
new file mode 100644
index 000000000000..3c8796eac391
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.21-gentoo.patch
@@ -0,0 +1,86 @@
+Make install targets more friendly
+--- svgalib-1.9.21/Makefile
++++ svgalib-1.9.21/Makefile
+@@ -78,10 +78,6 @@ default:
+ 
+ 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
+ 	@mkdir -p $(includedir)
+ 	@cp $(SRCDIR)/src/vga.h $(includedir)/vga.h
+ 	@chmod a+r $(includedir)/vga.h
+@@ -95,16 +91,6 @@ installheaders:
+ 	@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
+-ifndef KEEPSHAREDLIBS
+-	@echo "Removing shared library images (old & current)..."
+-	@for i in $(OBSOLETELDIRS); do \
+-	    rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
+-         done
+-endif
+ 	@echo Installing shared library image as \
+ 		$(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
+ 	@for foo in $(notdir $(SHAREDLIBS)); do \
+@@ -118,10 +104,8 @@ endif
+ installstaticlib: static
+ 	@echo Installing static libraries in $(libdir).
+ 	@mkdir -p $(libdir)
+-	@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
+ 	@$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
+ 	@chmod a+r $(libdir)/libvgagl.a
+ 
+@@ -130,14 +114,6 @@ installutils: textutils $(LRMI)
+ 		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
+ 	@echo Installing textmode utilities in $(bindir):
+ 	@echo "restorefont:      Save/restore textmode font."
+ 	@$(INSTALL_PROGRAM) utils/restorefont $(bindir)
+@@ -213,7 +189,7 @@ installdev:
+ lib3dkit-install:
+ 	(cd threeDKit/; $(MAKE) install)
+ 	 
+-install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \
++install: installheaders $(INSTALLSHAREDLIB) installconfig \
+ 	$(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE) $(INSTALLDEV) \
+ 	lib3dkit-install
+ 	@echo
+--- svgalib-1.9.21/Makefile.cfg
++++ svgalib-1.9.21/Makefile.cfg
+@@ -44,7 +44,7 @@ CONFDIR = $(SRCDIR)/src/config
+ # 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.
+@@ -130,7 +130,7 @@ INSTALLMAN = installman
+ # MAKEWHATIS = makewhatis # Beware, this will really need a few minutes!
+ 
+ # Comment this out if you use devfs only and don't want to make svga nodes
+-INSTALLDEV = installdev
++#INSTALLDEV = installdev
+ 
+ # Select which makefile to use to install the module, or comment both out if
+ # you are going to install the kernel module manually
diff --git a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
new file mode 100644
index 000000000000..ba3e84abb83f
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
@@ -0,0 +1,44 @@
+diff -urpwN svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt
+--- svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt   2002-10-28 18:25:47.000000000 +0200
++++ svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt 2003-08-03 14:34:40.000000000 +0200
+@@ -37,7 +37,7 @@
+ CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
+ 
+ ifeq (1,$(findstring 1,$(MODVER)))
+-	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
++	CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1
+ endif
+ 
+ TARGET = svgalib_helper
+@@ -50,7 +50,8 @@
+ 	endif
+ endif
+ 
+-all: .depend $(OBJS)
++modules: $(OBJS)
++all: .depend modules
+ 
+ $(TARGET).o: $(SRC:.c=.o)
+ 	$(LD) -r $^ -o $@
+@@ -61,8 +62,8 @@
+ install: device modules_install
+ 
+ modules_install: $(OBJS)
+-	mkdir -p /lib/modules/$(VER)/kernel/misc 
+-	install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc
++	mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
++	install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc
+ 
+ device:
+ 	rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
+--- svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h.orig	2004-07-20 19:05:13.491390800 -0400
++++ svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h	2004-07-20 19:05:29.217999992 -0400
+@@ -7,7 +7,7 @@
+ #  undef KERNEL_2_6
+ # endif
+ 
+-# if defined (PG_chainlock)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
+ #  define my_io_remap_page_range(vma, start, ofs, len, prot) \
+ 		io_remap_page_range(vma,start,ofs,len,prot)
+ # else