Version bump #140448 by Michael Cramer.

(Portage version: 2.1.1_pre2-r8)

7 files changed, 314 insertions, 1 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index b66b192e03f5..93f88e9ae062 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.69 2006/06/20 19:48:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.70 2006/07/16 04:06:12 vapier Exp $
+
+*svgalib-1.9.25 (16 Jul 2006)
+
+  16 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/svgalib-1.9.25-gentoo.patch, +files/svgalib-1.9.25-linux2.6.patch,
+  +svgalib-1.9.25.ebuild:
+  Version bump #140448 by Michael Cramer.
 
   20 Jun 2006; Mike Frysinger <vapier@gentoo.org>
   files/svgalib-1.9.24-linux2.6.patch:
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
index b01ecc6bf94e..53a90c62b444 100644
--- a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1
@@ -1 +1,3 @@
 MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274
+RMD160 b1aa727edfb796c523bcf6123734f8a0dc9e36fa svgalib-1.9.21.tar.gz 950274
+SHA256 5e053650e147ed0d0c16dc3956ec04318d1224628aad1c2d6194fcc1d8d1a2e5 svgalib-1.9.21.tar.gz 950274
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.23 b/media-libs/svgalib/files/digest-svgalib-1.9.23
index bced2d75c1e3..01f6dac06d4e 100644
--- a/media-libs/svgalib/files/digest-svgalib-1.9.23
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.23
@@ -1 +1,3 @@
 MD5 b51f7c791f0a64a856beec283bcdc0ba svgalib-1.9.23.tar.gz 982053
+RMD160 49915a5d4b0c2d81d46a721a48bc489747ccb43b svgalib-1.9.23.tar.gz 982053
+SHA256 e3b85c40ac3cf532b4f3496fe477bfd0d077fd1c702b83356548c4375b4fae5a svgalib-1.9.23.tar.gz 982053
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.25 b/media-libs/svgalib/files/digest-svgalib-1.9.25
new file mode 100644
index 000000000000..c3a769adf1e2
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.25
@@ -0,0 +1,3 @@
+MD5 4dda7e779e550b7404cfe118f1d74222 svgalib-1.9.25.tar.gz 987084
+RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 svgalib-1.9.25.tar.gz 987084
+SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 svgalib-1.9.25.tar.gz 987084
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch
new file mode 100644
index 000000000000..5ee2a985b17b
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch
@@ -0,0 +1,42 @@
+--- svgalib-1.9.25/Makefile.cfg
++++ svgalib-1.9.25/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.
+--- svgalib-1.9.25/Makefile
++++ svgalib-1.9.25/Makefile
+@@ -99,8 +99,6 @@
+ 		(cd $(sharedlibdir); \
+ 		 ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
+ 	done
+-	@./fixldsoconf
+-	-ldconfig
+ 
+ installstaticlib: static
+ 	@echo Installing static libraries in $(libdir).
+--- svgalib-1.9.25/threeDKit/Makefile
++++ svgalib-1.9.25/threeDKit/Makefile
+@@ -58,7 +58,6 @@
+ $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
+ 	$(INSTALL_SHLIB) $< $(sharedlibdir)/$<
+ 	(cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` )
+-	-ldconfig
+ 
+ install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders
+ 
+--- svgalib-1.9.25/src/Makefile
++++ svgalib-1.9.25/src/Makefile
+@@ -453,7 +453,6 @@
+ 
+ $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION)
+ 	$(INSTALL_SHLIB) $< $(sharedlibdir)/$<
+-	-ldconfig
+ 
+ install: $(sharedlibdir)/libvga.so.$(VERSION)
+ 
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
new file mode 100644
index 000000000000..d01479c286bc
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
@@ -0,0 +1,108 @@
+	- get rid of warning when linux/device.h doesnt exist
+	- touch up the Makefile to let the ebuild handle the module details
+	- fix support with io remap stuff in newer kernels
+	- dont include headers that dont exist in 2.4.x kernels
+	- use module_param() for 2.6.x and MODULE_PARM() for all others
+	- dont declare all_devices as static since it is exported
+
+--- svgalib/kernel/svgalib_helper/Makefile
++++ svgalib/kernel/svgalib_helper/Makefile
+@@ -25,7 +25,7 @@
+ endif
+ 
+ 
+-CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h)
++CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h 2>/dev/null)
+ 
+ ifneq ($(CLASS_SIMPLE),)
+   CLASS_CFLAGS = -DCLASS_SIMPLE=1
+--- svgalib/kernel/svgalib_helper/Makefile.alt
++++ svgalib/kernel/svgalib_helper/Makefile.alt
+@@ -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/kernel/svgalib_helper/kernel26compat.h
++++ svgalib/kernel/svgalib_helper/kernel26compat.h
+@@ -10,7 +10,7 @@
+ # define PCI_GET_CLASS pci_find_class
+ # define PCI_GET_DEVICE pci_find_device
+ 
+-# 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
+--- svgalib/kernel/svgalib_helper/main.c
++++ svgalib/kernel/svgalib_helper/main.c
+@@ -19,13 +19,18 @@
+ #include <linux/pci.h>
+ #include <linux/devfs_fs_kernel.h>
+ #include <linux/mm.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ #include <linux/thread_info.h>
++#endif
+ #include <linux/smp.h>
+ #include <linux/smp_lock.h>
+ 
+ #include <linux/sched.h>
+ #include <linux/wait.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ #include <linux/syscalls.h>
++#endif
+ 
+ #define __KERNEL_SYSCALLS__
+ #include <linux/unistd.h>
+@@ -55,7 +55,7 @@
+ #include "displaystart.h"
+ 
+ int debug=0;
+-static int all_devices=0;
++int all_devices=0;
+ int num_devices=0;
+ 
+ static char *sdev_id="svgalib_helper";
+@@ -770,10 +770,15 @@
+ 
+ }
+ 
++#ifdef KERNEL_2_6
++module_param(debug, int, 0);
++module_param(all_devices, int, 0);
++#else
+ MODULE_PARM(debug, "i");
+-MODULE_PARM_DESC(debug, "Debug output level.");
+-
+ MODULE_PARM(all_devices, "i");
++#endif
++
++MODULE_PARM_DESC(debug, "Debug output level.");
+ MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class.");
+ 
diff --git a/media-libs/svgalib/svgalib-1.9.25.ebuild b/media-libs/svgalib/svgalib-1.9.25.ebuild
new file mode 100644
index 000000000000..342aa0d379ea
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.25.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25.ebuild,v 1.1 2006/07/16 04:06:12 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-mod
+
+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 no-helper"
+
+DEPEND=""
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_TARGETS="default"
+MODULESD_SVGALIB_HELPER_ADDITIONS="probeall  /dev/svga  svgalib_helper"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Misc makefile clean ups
+	epatch "${FILESDIR}"/${PN}-1.9.25-gentoo.patch
+
+	# Get it to work with kernel 2.6
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
+
+	# -fPIC does work for lrmi, see bug #51698
+	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch
+
+	# Don't strip stuff, let portage do it
+	sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg
+}
+
+src_compile() {
+	use no-helper && export NO_HELPER=y
+
+	export CC=$(tc-getCC)
+
+	# 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 -pPR 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!"
+
+	! use build && ! use no-helper && linux-mod_src_compile
+}
+
+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!"
+	! use build && ! use no-helper && linux-mod_src_install
+
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a staticlib/libvga.a || die "dolib.a libvga"
+	dolib.a gl/libvgagl.a || die "dolib.a libvgagl"
+	dolib.a threeDKit/lib3dkit.a
+	dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so"
+	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
+	for x in lib3dkit libvga libvgagl ; do
+		dosym ${x}.so.${PV} /usr/lib/${x}.so
+		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
+	done
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h
+
+	if best_version '>=sys-fs/udev-045' ; then
+		insinto /etc/udev/rules.d
+		newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib.rules
+	elif best_version sys-fs/udev ; then
+		insinto /etc/udev/permissions.d
+		newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib.permissions
+	elif best_version sys-fs/devfsd ; then
+		insinto /etc/devfs.d
+		newins "${FILESDIR}"/svgalib.devfs svgalib
+	fi
+
+	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
+}
+
+pkg_postinst() {
+	! use build && ! use no-helper && linux-mod_pkg_postinst
+	[[ ${ROOT} != "/" ]] && return 0
+
+	if [[ -e /dev/.devfsd ]] ; then
+		ebegin "Restarting devfsd to reread devfs rules"
+		killall -HUP devfsd
+		eend $?
+	elif [[ -e /dev/.udev ]] ; then
+		ebegin "Restarting udev to reread udev rules"
+		udevstart
+		eend $?
+	fi
+}