Version bump.

Package-Manager: portage-2.0.53_rc6

5 files changed, 263 insertions, 18 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 8b855e55794a..02133e4bba1f 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.62 2005/09/11 19:42:17 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.63 2005/11/01 03:41:32 vapier Exp $
+
+*svgalib-1.9.23 (01 Nov 2005)
+
+  01 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/svgalib-1.9.23-gentoo.patch, +svgalib-1.9.23.ebuild:
+  Version bump.
 
 *svgalib-1.9.21-r1 (11 Sep 2005)
 
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 6bbf5addcdbc..0f89156ebc4d 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fd002269c939e70a3fb8cf85e72d6568 svgalib-1.9.21-r1.ebuild 4470
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 c9619b54463a0330aa164eb8108eaa8e svgalib-1.9.19-r3.ebuild 5480
-MD5 f39abf53bdcd24193dbb18ad35673f15 ChangeLog 11168
-MD5 669918046939615fbe96031aa10be6d2 files/svgalib-1.9.21-linux2.6.patch 1550
-MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
-MD5 a4acf43a776fa24036c8bde9d951ee60 files/svgalib.udev.rules.d 54
-MD5 8305fd946083dbe190a4fc42512e0e13 files/svgalib-1.9.21-gentoo.patch 3122
-MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
-MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
-MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21-r1 66
-MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458
+MD5 02e528c5c66ece4b73554c290dc6f856 ChangeLog 11331
 MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r3 66
-MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
+MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21-r1 66
+MD5 8121635a6e2d2be1c4b2067bc9d659f9 files/digest-svgalib-1.9.23 66
+MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
 MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
 MD5 909fa2160bfb4ca66f2f73400a711431 files/svgalib-1.9.19-devfs.patch 440
-MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
+MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
+MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
 MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776
+MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458
+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
+MD5 690144017f69486a911d88c0932a7d45 files/svgalib-1.9.23-gentoo.patch 2994
+MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
 MD5 80fafe8076ab52d6f02f90b7f9580ddd files/svgalib.udev.perms.d 22
+MD5 a4acf43a776fa24036c8bde9d951ee60 files/svgalib.udev.rules.d 54
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 c9619b54463a0330aa164eb8108eaa8e svgalib-1.9.19-r3.ebuild 5480
+MD5 fd002269c939e70a3fb8cf85e72d6568 svgalib-1.9.21-r1.ebuild 4470
+MD5 2d42280d70d9833840db725d273fb8bd svgalib-1.9.23.ebuild 4361
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ4+FgIKl8Uu19MoRAiqtAJ94t9+bzWuH3dzR8aLyEIFfvvbrVwCfR4zl
-KB/Bvs+zF8rxppP/WckX5Pg=
-=0fQl
+iD8DBQFDZuQMgIKl8Uu19MoRAoEFAJ4syHW6i/NmVCTmhavVNSfZPAVtvQCcCUdQ
+Dqnc+hOLLgEMkfq7gp2X6zs=
+=E/9L
 -----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.23 b/media-libs/svgalib/files/digest-svgalib-1.9.23
new file mode 100644
index 000000000000..bced2d75c1e3
--- /dev/null
+++ b/media-libs/svgalib/files/digest-svgalib-1.9.23
@@ -0,0 +1 @@
+MD5 b51f7c791f0a64a856beec283bcdc0ba svgalib-1.9.23.tar.gz 982053
diff --git a/media-libs/svgalib/files/svgalib-1.9.23-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.23-gentoo.patch
new file mode 100644
index 000000000000..3cd9b2675a5d
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.23-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)
+--- 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.
+@@ -63,7 +63,7 @@
+ includedir = $(prefix)/include
+ 
+ # Directory where the man files will be installed.
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ 
+ # Target binary format.
+ TARGET_FORMAT = elf
+@@ -126,7 +126,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/svgalib-1.9.23.ebuild b/media-libs/svgalib/svgalib-1.9.23.ebuild
new file mode 100644
index 000000000000..78ece91f4c55
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.23.ebuild
@@ -0,0 +1,149 @@
+# 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.23.ebuild,v 1.1 2005/11/01 03:41:32 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_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Misc makefile clean ups
+	epatch "${FILESDIR}"/${PN}-1.9.23-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
+
+	use no-helper && sed -i '/^# NO_HELPER/s:# ::' Makefile.cfg
+
+	# Don't strip stuff, let portage do it
+	sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg
+}
+
+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 -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"
+	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 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
+}