Fix udev NAME=%k is superfluous warning, Bug #293963.

Package-Manager: portage-2.2_rc50/cvs/Linux i686

4 files changed, 146 insertions, 2 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index f0d32f567408..9c6550e004ff 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.85 2009/07/23 14:51:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.86 2009/11/22 11:17:35 zzam Exp $
+
+*svgalib-1.9.25-r1 (22 Nov 2009)
+
+  22 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +svgalib-1.9.25-r1.ebuild, +files/svgalib.udev.rules.d.2:
+  Fix udev NAME=%k is superfluous warning, Bug #293963.
 
   23 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> svgalib-1.9.25.ebuild,
   +files/svgalib-1.9.25-glibc210.patch:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index f2ad3d8eb499..218eb9d166f2 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 SHA1 326f4132d7f625d2fd5ae04795da5f2e6f1bc36f SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358
 AUX svgalib-1.9.25-build.patch 2163 RMD160 70255c504d944e173a98604ffb96a8f1839301df SHA1 9f103dd569efc1e4eb7fd2937cbf6edb5f7c9f34 SHA256 f2d5033376e02f4424a7d6252dd442eb2f6b6a3834244d8830248b7c651da361
 AUX svgalib-1.9.25-glibc210.patch 3842 RMD160 23210ad56b8f6491e43aa1e6ffe454272980c4ed SHA1 fd77a6ce10ed5bba54680cc73d81ab1f16ae0f40 SHA256 d8ac6b82406e9d85fbd7ce3f35ee94a3bb77b729352d62f51d51931c46a2a434
 AUX svgalib-1.9.25-linux2.6.28.patch 1672 RMD160 6fb7b32d15c24f927d3d5566cdfacd70ecad212d SHA1 d578c12c05c6d2377972bb7a8f2164f2a9af2d79 SHA256 79e3b78faadc7fc4a0f965e8ce7564c0a391293105a5bcd88ce44a77543af512
 AUX svgalib-1.9.25-linux2.6.patch 9547 RMD160 64a9b66e455da08784f464cda70e250684873441 SHA1 eb5ffc6af7c68e51897ac01c37f538b23b6ac9d0 SHA256 553b4c81a87a9c584377cae2795849b5237ca07e6bf0bef5ffc00ebb0b9a1160
 AUX svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 SHA1 a0851d5de96c9e3933515fcbdb0fb6de9a07339e SHA256 ae60596a1b5fdc0e6cc9d625f363d869f8674e4da631cc341e663b22870f7d81
+AUX svgalib.udev.rules.d.2 44 RMD160 55aa262f106cb98eabe3e6755222b5561da799cd SHA1 37892842ba2c7cb4d71f7e558a20a6dfa26c4204 SHA256 08973143b979ff88ff49701d7173cb6fb9661ea9c8f3911efc031435b648cc96
 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602
+EBUILD svgalib-1.9.25-r1.ebuild 3697 RMD160 d14d6585f3b748efc14f5092543461bccfbab3e6 SHA1 d115d2904cca3d33e2c9202a58a5ee1933e112d5 SHA256 6c07fc33cbe011203a7e037c08035a50bd4f6a95fd79088dea2f37ec95752aa1
 EBUILD svgalib-1.9.25.ebuild 3695 RMD160 577d4aac60da1da240179afdc31b4867352a1d06 SHA1 6b3ee17ecd41e7f6cbec88f307c1a446c332534d SHA256 7c4aba3ad96e37c9c40e5b2ceadcf6d377b8d5202424f72d64297f34b8b4768f
-MISC ChangeLog 15016 RMD160 38863715a35e51a2a5aaa8c0743669481fdc0c0b SHA1 f3b40245d2bdf17f676021efbe0aa82682076c68 SHA256 302563eb94b722bb5240eba1f1ee34714e6bbf14cbb0187ac1ea601555f5323a
+MISC ChangeLog 15216 RMD160 fb41fb2fc59da4fd5f0c62fe62512525f9124bdb SHA1 1ab2e55437f40ae04ab0564bbe8917043ff8e912 SHA256 652e09c6ff10531263ea285403361f1cdf8238d8dd8e2cb9a071f898c89323d7
 MISC metadata.xml 248 RMD160 f2cd2d1c1000b98ac486798631c6f3142095b3f4 SHA1 df1e5841b984a1d14c0e7241c2a71032e6341bf4 SHA256 a647430cad5a57d9f46d97df82575b73efcb2b05f1d92756d10934d176f27ef2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksJHdUACgkQt2vP6XvVdOcvPQCeJM+Ior4xEswcOPSLeH9l1j6A
+rGcAoKK1x+hWHi6avByXEyPLNGki5Die
+=CVV1
+-----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib.udev.rules.d.2 b/media-libs/svgalib/files/svgalib.udev.rules.d.2
new file mode 100644
index 000000000000..368a3219a134
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib.udev.rules.d.2
@@ -0,0 +1 @@
+KERNEL=="svga*", MODE="0660", GROUP="video"
diff --git a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
new file mode 100644
index 000000000000..06a6b995bef7
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/11/22 11:17:35 zzam Exp $
+
+EAPI=1
+
+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 +kernel-helper"
+
+DEPEND=""
+RDEPEND=""
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_TARGETS="default"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
+	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
+	epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
+}
+
+src_compile() {
+	use kernel-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 kernel-helper && linux-mod_src_compile
+}
+
+src_install() {
+	local x=
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+
+	emake \
+		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
+		install || die "Failed to install svgalib!"
+	! use build && use kernel-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
+
+	insinto /etc/udev/rules.d
+	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
+
+	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 kernel-helper && linux-mod_pkg_postinst
+}