dont touch ld.so.conf #64829

12 files changed, 38 insertions, 705 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 6f1b70b418e6..164d0facbc97 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.47 2004/09/09 16:17:30 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.48 2004/09/24 01:06:20 vapier Exp $
 
 *svgalib-1.9.19-r1 (09 Sep 2004)
 
+  23 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/svgalib-1.9.19-dont-touch-ld.conf.patch, 
+  svgalib-1.9.19-r1.ebuild:
+  Dont let the ebuild touch /etc/ld.so.conf #64829 by huw jenkins.
+
   09 Sep 2004; Stefan Jones <cretin@gentoo.org> +svgalib-1.9.19-r1.ebuild,
   +files/digest-svgalib-1.9.19-r1, +files/svgalib-1.9.19-pic.patch:
   Fix bug #51698, -fPIC not used to compile lrmi thus prelink complains
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index e2856008f90a..499b432e5d02 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,17 +1,20 @@
-MD5 d7bbbe8abcc227138d856108390731fe svgalib-1.9.19.ebuild 4415
-MD5 2d8df6e2f14737c6e078c9b6727e6f2f svgalib-1.9.19-r1.ebuild 4492
-MD5 fd33dac71cd54e0c49636a35423bd9d4 svgalib-1.9.18-r1.ebuild 4606
-MD5 bae56a490ab8dff15f12ca1d6c55d506 ChangeLog 8483
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a3ae0b86fb61856fed062a639cc186a1 ChangeLog 8680
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
-MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18-r1 66
-MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
-MD5 e6a7509b89c4014c625cf1eaefd994ff files/svgalib-1.9.18-gcc34.patch 322
-MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
-MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
+MD5 1cd357e2780d2dd707001f46d7d045fe svgalib-1.9.19-r1.ebuild 4603
+MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
 MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
-MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19 66
-MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
-MD5 431e1212290d169ae8f928e63c793009 files/svgalib-1.9.19-linux2.6.patch 7834
 MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
-MD5 c6ccf439f748f710447c61fe41801a3c files/svgalib-1.9.18-linux2.6-v2.patch 7842
+MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
+MD5 431e1212290d169ae8f928e63c793009 files/svgalib-1.9.19-linux2.6.patch 7834
+MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
+MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBU3McHTu7gpaalycRAr8FAKDTfeU3KaAXYfsqnx6I9uPfm08iJwCgm2Gn
+yH+KnbblyASBrzAhk3n/HBs=
+=sDZa
+-----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.18-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.18-r1
deleted file mode 100644
index 0c2fdc8d9e53..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.9.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a1dc3dbf3182fb560959678dfba6181 svgalib-1.9.18.tar.gz 933786
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.19 b/media-libs/svgalib/files/digest-svgalib-1.9.19
deleted file mode 100644
index a0902968e62f..000000000000
--- a/media-libs/svgalib/files/digest-svgalib-1.9.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44e5063c9a22e9554088e125b0df7593 svgalib-1.9.19.tar.gz 935305
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-gcc33.patch b/media-libs/svgalib/files/svgalib-1.9.18-gcc33.patch
deleted file mode 100644
index e6c450b8d158..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.18-gcc33.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- svgalib-1.9.18/demos/lineart.c.orig	2004-02-22 23:34:04.093602664 +0200
-+++ svgalib-1.9.18/demos/lineart.c	2004-02-22 23:32:00.317419504 +0200
-@@ -19,8 +19,8 @@
-   
-   if(mode == 0)
-     {
--      printf("Usage:linp [mode mode ...]\n
--              where mode is an integer.\n");
-+      printf("Usage:linp [mode mode ...]\n"\
-+             "where mode is an integer.\n");
-       return;
-     }
-   if(! vga_hasmode(mode)) {
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-gcc34.patch b/media-libs/svgalib/files/svgalib-1.9.18-gcc34.patch
deleted file mode 100644
index f28da82b7d5d..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.18-gcc34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- svgalib-1.9.18/src/drivers/pm2.c.orig	2004-04-28 01:23:17.159246280 -0400
-+++ svgalib-1.9.18/src/drivers/pm2.c	2004-04-28 01:23:25.671952152 -0400
-@@ -741,6 +741,7 @@
-             __svgalib_pm2_driverspecs.cursor = pm2v_cursor;
-             break;
-         default:
-+;
-     }
-     
-     if (__svgalib_driver_report) {
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.18-gentoo.patch
deleted file mode 100644
index 859144307d24..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.18-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- svgalib-1.9.18/Makefile	2004-02-22 20:16:50.506825616 +0200
-+++ svgalib-1.9.18/Makefile	2004-02-22 20:18:55.028895384 +0200
-@@ -78,10 +78,6 @@
- 
- 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 @@
- 	@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 @@
- 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 @@
- 		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."
- 	@cp utils/restorefont $(bindir)
-@@ -210,7 +186,7 @@
- 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.18/kernel/svgalib_helper/Makefile	2004-02-22 20:24:57.921727288 +0200
-+++ svgalib-1.9.18/kernel/svgalib_helper/Makefile	2004-02-22 20:23:34.654385848 +0200
-@@ -45,8 +45,8 @@
- svgalib_helper.o: $(svgalib_helper-objs)
- 	$(LD) -r -o $@ $(svgalib_helper-objs)
- 
--install: device modules_install
-+install: 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)/kernel/misc
-+	install -m 0644 -c $(TARGET).o $(TOPDIR)/lib/modules/$(VER)/kernel/misc
---- svgalib-1.9.18/Makefile.cfg	2004-02-22 20:38:09.813341464 +0200
-+++ svgalib-1.9.18/Makefile.cfg	2004-02-22 20:41:45.480555064 +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.
-@@ -126,7 +126,7 @@
- # 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
- 
- #
- # Comment out any driver that you don't want included in the library.
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6-v2.patch b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6-v2.patch
deleted file mode 100644
index 31bc3cb60a91..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6-v2.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-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?
-diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h
---- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h	2003-10-04 15:42:01.000000000 +0200
-+++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h	2004-02-23 00:41:03.176196576 +0200
-@@ -9,9 +12,11 @@
- 
- # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
- 
-+# ifndef IRQ_NONE
- typedef void irqreturn_t;
--# define IRQ_NONE
--# define IRQ_HANDLED
-+#  define IRQ_NONE
-+#  define IRQ_HANDLED
-+# endif
- 
- #else /* Kernel 2.6 */
- 
-@@ -43,9 +43,36 @@ static inline int devfs_unregister_chrde
- }
- #endif
- 
-+#if defined(KERNEL_2_6) && !defined(CONFIG_DEVFS_FS)
-+#  define SLH_SYSFS_REGISTER                                            \
-+     svgalib_helper_class = class_simple_create(THIS_MODULE, "svgalib_helper");
-+
-+#  define SLH_SYSFS_ADD_CONTROL                                         \
-+     class_simple_device_add(svgalib_helper_class,                      \
-+                             MKDEV(SVGALIB_HELPER_MAJOR, 0),            \
-+                             NULL, "svga");
-+
-+#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                           \
-+     class_simple_device_add(svgalib_helper_class,                      \
-+                             MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
-+                             &sh_pci_devs[_minor]->dev->dev, _name);
-+
-+#  define SLH_SYSFS_REMOVE_DEVICE(i)                                    \
-+     class_simple_device_remove(MKDEV(SVGALIB_HELPER_MAJOR, i));
-+
-+#  define SLH_SYSFS_UNREGISTER                                          \
-+     class_simple_destroy(svgalib_helper_class);
-+#else
-+#  define SLH_SYSFS_REGISTER
-+#  define SLH_SYSFS_ADD_CONTROL
-+#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)
-+#  define SLH_SYSFS_REMOVE_DEVICE(i)
-+#  define SLH_SYSFS_UNREGISTER
-+#endif
-+
- 
- /* Our main.c really do not like MINOR from 2.6 kernels ... */
--#if (defined MINOR) && (!defined KERNEL_2_6)
-+#if (defined MINOR)
- # define my_minor(x) MINOR(x)
- #else
- # define my_minor(x) minor(x)
-diff -urpN svgalib-1.9.18/kernel/svgalib_helper/main.c svgalib-1.9.18.new/kernel/svgalib_helper/main.c
---- svgalib-1.9.18/kernel/svgalib_helper/main.c	2003-10-04 12:34:20.000000000 +0200
-+++ svgalib-1.9.18.new/kernel/svgalib_helper/main.c	2004-02-23 00:42:25.490682872 +0200
-@@ -53,6 +53,10 @@ static int irqs[MAX_NR_DEVICES];
- static devfs_handle_t devfs_handle;
- #endif
- 
-+#if defined(KERNEL_2_6) && !defined(CONFIG_DEVFS_FS)
-+struct class_simple *svgalib_helper_class;
-+#endif
-+
- static int check_io_range(int port, int device) {
-     return 1;
- }
-@@ -502,6 +506,7 @@ int init_module(void)
- {
-     int result, i, j;
-     struct pci_dev *dev=NULL;
-+    char name[255];
- #ifdef CONFIG_DEVFS_FS
- # ifndef KERNEL_2_6
-     devfs_handle_t slave_handle;
-@@ -513,9 +518,9 @@ int init_module(void)
-      
-     printk(KERN_INFO "svgalib_helper: Initializing, version %s\n", versionstr);
- 
--	result = devfs_register_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper", &svgalib_helper_fops);
-+    result = devfs_register_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper", &svgalib_helper_fops);
- 
--	if (result < 0) {
-+    if (result < 0) {
-         printk(KERN_WARNING "svgalib_helper: can't get major %d\n",SVGALIB_HELPER_MAJOR);
-         return result;
-     }
-@@ -523,7 +528,7 @@ int init_module(void)
-     if((sh_pci_devs[0]=kmalloc(sizeof(struct sh_pci_device),GFP_KERNEL))==NULL) {
-         goto nomem_error;
-     }
--	
-+
-     memset(sh_pci_devs[0],0,sizeof(struct sh_pci_device));
-     num_devices=1;
-     for(i=1;i<MAX_NR_DEVICES;i++) sh_pci_devs[i]=NULL;
-@@ -537,19 +542,22 @@ int init_module(void)
-     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");
-+    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 */
- 
-+    SLH_SYSFS_REGISTER;
-+    SLH_SYSFS_ADD_CONTROL;
-+
-     if(pci_present()) {
-         while((dev= all_devices ? 
--					pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev) :
--					pci_find_class(PCI_CLASS_DISPLAY_VGA<<8,dev)) && 
-+                                  pci_find_device(PCI_ANY_ID, PCI_ANY_ID, 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) {
-                 goto nomem_error;
-@@ -581,6 +589,10 @@ int init_module(void)
-                 }
-             }
-             vga_init_vsync(sh_pci_devs[num_devices]);
-+
-+            sprintf(name, "svga%d", num_devices);
-+            SLH_SYSFS_ADD_DEVICE(name, num_devices);
-+
-             num_devices++;
-         }
-     }
-@@ -600,39 +612,51 @@ int init_module(void)
-     init_waitqueue_head(&vsync_wait);
- 
- #ifndef KERNEL_2_6
--	EXPORT_NO_SYMBOLS;
-+    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]);
-+    for(i=0;i<MAX_NR_DEVICES;i++) {
-+        if(sh_pci_devs[i]) {
-+            SLH_SYSFS_REMOVE_DEVICE(i);
-+            kfree(sh_pci_devs[i]);
-+        }
-+    }
-+
-+    SLH_SYSFS_REMOVE_DEVICE(0);
-+    SLH_SYSFS_UNREGISTER;
-+    
-+    devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
- 
--	devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
--		
--	return result;
-+    return result;
- }
- 
- void cleanup_module(void)
- {
-     int i;
--    for(i=0;i<MAX_NR_DEVICES;i++) 
-+    for(i=0;i<MAX_NR_DEVICES;i++) {
-         if(sh_pci_devs[i]) {
-+            SLH_SYSFS_REMOVE_DEVICE(i);
-             kfree(sh_pci_devs[i]);
-         }
-+    }
-+
-+    SLH_SYSFS_REMOVE_DEVICE(0);
-+    SLH_SYSFS_UNREGISTER;
-      
- #ifdef CONFIG_DEVFS_FS
- # ifndef KERNEL_2_6
--	devfs_unregister(devfs_handle);
-+    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	
-+    for (i = 0; i < 8; i++)
-+        devfs_remove("svga_helper/%d", i);
-+    devfs_remove("svga_helper");
-+    devfs_remove("svga");
-+# endif
- #endif
--	
-+
-     devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
- 
- }
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch b/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch
new file mode 100644
index 000000000000..f8b909e8e89e
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.19-dont-touch-ld.conf.patch
@@ -0,0 +1,11 @@
+--- svgalib-1.9.19/Makefile.orig	2004-09-23 21:02:54.009100784 -0400
++++ svgalib-1.9.19/Makefile	2004-09-23 21:03:01.353984192 -0400
+@@ -98,8 +98,6 @@
+ 		(cd $(sharedlibdir); \
+ 		 ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
+ 	done
+-	@./fixldsoconf
+-	@ldconfig
+ 
+ installstaticlib: static
+ 	@echo Installing static libraries in $(libdir).
diff --git a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
deleted file mode 100644
index a66fcc571001..000000000000
--- a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.15 2004/08/08 13:30:11 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build"
-
-DEPEND="virtual/libc"
-
-kernel_supports_modules() {
-	grep '^CONFIG_MODULES=y$' /usr/src/linux/.config >& /dev/null
-}
-
-pkg_setup() {
-	! use build && kernel_supports_modules && check_KV
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	# Fix a small gcc33 issue
-	epatch ${FILESDIR}/${P}-gcc33.patch
-
-	# Fix a small gcc34 issue #48930
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	# Get it to work with kernel 2.6
-	epatch ${FILESDIR}/${P}-linux2.6-v2.patch
-
-	# Fix include bug #54198
-	epatch ${FILESDIR}/${P}-utils-include.patch
-
-	# Have lrmi compile with our $CFLAGS
-	epatch ${FILESDIR}/${P}-lrmi-gentoo-cflags.patch
-
-	# Disable kernel module support while building stages #38403
-	#use build && 
-	sed -i 's:installmodule ::' Makefile
-	# for now we dont build the module at all #42522
-}
-
-src_compile() {
-	filter-flags "-fPIC"
-
-	# First build static
-	make OPTIMIZE="${CFLAGS}" static \
-		|| die "Failed to build static libraries!"
-	# Have to remove for shared to build ...
-	rm -f src/svgalib_helper.h
-	# Then build shared ...
-	make OPTIMIZE="${CFLAGS}" shared \
-		|| die "Failed to build shared libraries!"
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \
-		textutils lrmi utils \
-		|| die "Failed to build libraries and utils!"
-	# Build the gl stuff tpp
-	make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
-	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
-		|| die "Failed to build libvgagl.so.${PV}!"
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	rm -f src/svgalib_helper.h
-	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
-		|| die "Failed to build libvga.so.${PV}!"
-	cp -a src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \
-		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
-	# Build demo's ...
-	make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \
-		demoprogs || die "Failed to build demoprogs!"
-
-	if ! use build && kernel_supports_modules
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt INCLUDEDIR="/usr/src/linux/include" \
-					clean modules || die "Failed to alt build kernel module!"
-		else
-			env -u ARCH make || die "Failed to build kernel module!"
-		fi
-		cd ${S}
-	fi
-
-	cp Makefile Makefile.orig
-	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
-	 	Makefile.orig > Makefile
-}
-
-src_install() {
-	local x=
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" \
-		install || die "Failed to install svgalib!"
-	if ! use build && kernel_supports_modules
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt TOPDIR=${D} \
-					INCLUDEDIR="/usr/src/linux/include" \
-					modules_install || die "Failed to install svgalib module!"
-		else
-			insinto /lib/modules/${KV}/kernel/misc
-			doins svgalib_helper.ko
-		fi
-		cd ${S}
-	fi
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a
-	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
-
-	dodir /etc/modules.d
-	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
-
-	exeinto /usr/lib/svgalib/demos
-	for x in ${S}/demos/*
-	do
-		[ -x "${x}" ] && doexe ${x}
-	done
-
-	cd ${S}/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd ${S}
-	dodoc 0-README LICENSE
-	cd ${S}/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
-
-	mv ${D}/usr/man/* ${D}/usr/share/man
-	rmdir ${D}/usr/man
-}
-
-pkg_postinst() {
-	[ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
-	einfo "When upgrading your kernel you'll need to rebuild the kernel module."
-}
diff --git a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
index fff84f942757..5715f39c5ae3 100644
--- a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.2 2004/09/09 21:50:47 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.3 2004/09/24 01:06:20 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,6 +41,9 @@ src_unpack() {
 
 	# -fPIC does work for lrmi, see bug #51698
 	epatch ${FILESDIR}/${P}-pic.patch
+
+	# Don't let the ebuild screw around with ld.so.conf #64829
+	epatch ${FILESDIR}/${P}-dont-touch-ld.conf.patch
 }
 
 src_compile() {
diff --git a/media-libs/svgalib/svgalib-1.9.19.ebuild b/media-libs/svgalib/svgalib-1.9.19.ebuild
deleted file mode 100644
index 5ededbb59601..000000000000
--- a/media-libs/svgalib/svgalib-1.9.19.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19.ebuild,v 1.10 2004/08/08 13:30:11 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build"
-
-DEPEND="virtual/libc"
-
-kernel_supports_modules() {
-	grep '^CONFIG_MODULES=y$' ${ROOT}/usr/src/linux/.config >& /dev/null
-}
-
-pkg_setup() {
-	! use build && kernel_supports_modules && check_KV
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	# Get it to work with kernel 2.6
-	epatch ${FILESDIR}/${P}-linux2.6.patch
-	sed -i '/^KDIR/s:=.*:=${ROOT}/usr/src/linux:' ${S}/kernel/svgalib_helper/Makefile
-
-	# Fix include bug #54198
-	epatch ${FILESDIR}/${PN}-1.9.18-utils-include.patch
-
-	# Have lrmi compile with our $CFLAGS
-	epatch ${FILESDIR}/${PN}-1.9.18-lrmi-gentoo-cflags.patch
-}
-
-src_compile() {
-	filter-flags -fPIC
-
-	# First build static
-	make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
-	# Have to remove for shared to build ...
-	rm -f src/svgalib_helper.h
-	# Then build shared ...
-	make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \
-		textutils lrmi utils \
-		|| die "Failed to build libraries and utils!"
-	# Build the gl stuff tpp
-	make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
-	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
-		|| die "Failed to build libvgagl.so.${PV}!"
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	rm -f src/svgalib_helper.h
-	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
-		|| die "Failed to build libvga.so.${PV}!"
-	cp -a src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \
-		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
-	# Build demo's ...
-	make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \
-		demoprogs || die "Failed to build demoprogs!"
-
-	if ! use build && kernel_supports_modules
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt INCLUDEDIR="${ROOT}/usr/src/linux/include" \
-					clean modules || die "Failed to build kernel module!"
-		else
-			env -u ARCH make || die "Failed to build kernel module!"
-		fi
-		cd ${S}
-	fi
-
-	cp Makefile Makefile.orig
-	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
-	 	Makefile.orig > Makefile
-}
-
-src_install() {
-	local x=
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	make \
-		TOPDIR=${D} OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-		install || die "Failed to install svgalib!"
-	if ! use build && kernel_supports_modules
-	then
-		cd ${S}/kernel/svgalib_helper
-		if [[ `KV_to_int ${KV}` -lt `KV_to_int 2.6.6` ]] ; then
-			env -u ARCH \
-				make -f Makefile.alt TOPDIR=${D} \
-					INCLUDEDIR="${ROOT}/usr/src/linux/include" \
-					modules_install || die "Failed to install svgalib module!"
-		else
-			insinto /lib/modules/${KV}/kernel/misc
-			doins svgalib_helper.ko
-		fi
-		cd ${S}
-	fi
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a
-	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
-
-	dodir /etc/modules.d
-	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
-
-	exeinto /usr/lib/svgalib/demos
-	for x in ${S}/demos/*
-	do
-		[ -x "${x}" ] && doexe ${x}
-	done
-
-	cd ${S}/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd ${S}
-	dodoc 0-README
-	cd ${S}/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
-
-	mv ${D}/usr/man/* ${D}/usr/share/man
-	rmdir ${D}/usr/man
-}
-
-pkg_postinst() {
-	[ "${ROOT}" = "/" ] && /sbin/modules-update &> /dev/null
-	einfo "When upgrading your kernel you'll need to rebuild the kernel module."
-}