Version bump #90175 by Peter Gordon.

Package-Manager: portage-2.0.51.20

6 files changed, 285 insertions, 3 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index d36314123b8a..75a2f14794f6 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/svgalib
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.55 2005/02/06 21:05:38 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.56 2005/04/24 07:52:43 vapier Exp $
+
+*svgalib-1.9.21 (24 Apr 2005)
+
+  24 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/svgalib-1.9.21-gentoo.patch, +files/svgalib-1.9.21-linux2.6.patch,
+  +svgalib-1.9.21.ebuild:
+  Version bump #90175 by Peter Gordon.
 
   06 Feb 2005; Mike Frysinger <vapier@gentoo.org>
   +files/svgalib-1.9.19-gcc4.patch, svgalib-1.9.19-r3.ebuild:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index afd6f4bee01b..d2de7a032c55 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,6 +1,7 @@
-MD5 3a27ede8cf7f6e532ae195ce191a7a73 ChangeLog 10119
+MD5 dbacf65e9d53cb0a929e8166bac92ab7 ChangeLog 10342
 MD5 04477db6e2e3d6a9e52f1d7a90037db6 svgalib-1.9.19-r3.ebuild 5400
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 bc58b35dab262996a35dd870442e3782 svgalib-1.9.21.ebuild 3929
 MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
 MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458
 MD5 909fa2160bfb4ca66f2f73400a711431 files/svgalib-1.9.19-devfs.patch 440
@@ -10,4 +11,7 @@ MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.pat
 MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
 MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
 MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776
+MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21 66
 MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
+MD5 8305fd946083dbe190a4fc42512e0e13 files/svgalib-1.9.21-gentoo.patch 3122
+MD5 669918046939615fbe96031aa10be6d2 files/svgalib-1.9.21-linux2.6.patch 1550
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
diff --git a/media-libs/svgalib/svgalib-1.9.21.ebuild b/media-libs/svgalib/svgalib-1.9.21.ebuild
new file mode 100644
index 000000000000..2a694b512ded
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.21.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.21.ebuild,v 1.1 2005/04/24 07:52:43 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"
+
+DEPEND=""
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_PARAMS="KDIR=${KV_DIR}"
+BUILD_TARGETS="default"
+MODULESD_SVGALIB_HELPER_ADDITIONS="probeall  /dev/svga  svgalib_helper"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Misc makefile clean ups
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	# Get it to work with kernel 2.6
+	epatch "${FILESDIR}"/${PN}-1.9.21-linux2.6.patch
+
+	# -fPIC does work for lrmi, see bug #51698
+	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch
+
+	# Don't let the ebuild screw around with ld.so.conf #64829
+	epatch "${FILESDIR}"/${PN}-1.9.19-dont-touch-ld.conf.patch
+}
+
+src_compile() {
+	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 -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!"
+
+	use build || 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 || linux-mod_src_install
+
+	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
+
+	if [[ -e ${ROOT}/dev/.devfsd ]] ; then
+		insinto /etc/devfs.d
+		newins "${FILESDIR}"/svgalib.devfs svgalib
+	elif [[ -e ${ROOT}/dev/.udev ]] ; then
+		dodir /etc/udev/permissions.d
+		echo "svga*:root:video:0660" > \
+			"${D}"/etc/udev/permissions.d/30-${PN}.permissions
+	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
+
+	mv "${D}"/usr/man/* "${D}"/usr/share/man
+	rmdir "${D}"/usr/man
+}
+
+pkg_postinst() {
+	if [[ -e ${ROOT}/dev/.devfsd ]] ; then
+		ebegin "Restarting devfsd to reread devfs rules"
+		killall -HUP devfsd
+		eend $?
+	elif [[ -e ${ROOT}/dev/.udev ]] ; then
+		ebegin "Restarting udev to reread udev rules"
+		udevstart
+		eend $?
+	fi
+
+	linux-mod_pkg_postinst
+}