Install permission files for udev only with older versions; use rules files for newer versions #91733 by John Mylchreest.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 26 insertions, 19 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 39867df392ca..5a0c3be8e59c 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.57 2005/04/25 21:23:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.58 2005/05/07 08:13:31 vapier Exp $
+
+  07 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/svgalib.udev.perms.d, +files/svgalib.udev.rules.d,
+  svgalib-1.9.21.ebuild:
+  Install permission files for udev only with older versions; use rules files
+  for newer versions #91733 by John Mylchreest.
 
 *svgalib-1.9.21 (24 Apr 2005)
 
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 408c8c8a9692..b02594ffd0bb 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,7 +1,7 @@
-MD5 babd885b6fdae71a475270dda72cbb3a ChangeLog 10344
+MD5 a9c3e4f483e4455a5e55c7d77b7087bd ChangeLog 10604
 MD5 c9619b54463a0330aa164eb8108eaa8e svgalib-1.9.19-r3.ebuild 5480
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 d2fdb1d779b501835e0ea0ba7814e50b svgalib-1.9.21.ebuild 4224
+MD5 3a5c8360fbcdcdeb188142f7b9244e59 svgalib-1.9.21.ebuild 4132
 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
@@ -15,3 +15,5 @@ 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
+MD5 80fafe8076ab52d6f02f90b7f9580ddd files/svgalib.udev.perms.d 22
+MD5 847406401f01e1e9d93d89365814cb27 files/svgalib.udev.rules.d 39
diff --git a/media-libs/svgalib/files/svgalib.udev.perms.d b/media-libs/svgalib/files/svgalib.udev.perms.d
new file mode 100644
index 000000000000..733425dcf74e
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib.udev.perms.d
@@ -0,0 +1 @@
+svga*:root:video:0660
diff --git a/media-libs/svgalib/files/svgalib.udev.rules.d b/media-libs/svgalib/files/svgalib.udev.rules.d
new file mode 100644
index 000000000000..d4554e308ef4
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib.udev.rules.d
@@ -0,0 +1 @@
+KERNEL="svga*", NAME="%k", MODE="0660"
diff --git a/media-libs/svgalib/svgalib-1.9.21.ebuild b/media-libs/svgalib/svgalib-1.9.21.ebuild
index a136e9e71504..bbb1336661ee 100644
--- a/media-libs/svgalib/svgalib-1.9.21.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.21.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/05/07 08:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.21.ebuild,v 1.5 2005/05/07 08:13:31 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -36,12 +36,6 @@ src_unpack() {
 	# Don't let the ebuild screw around with ld.so.conf #64829
 	epatch "${FILESDIR}"/${PN}-1.9.19-dont-touch-ld.conf.patch
 
-	# DEVFS_MK_SYMLINK is a macro to hide devfs_mk_symlink usage, but
-	# main.c neglects to actually use it :) #91118
-	sed -i \
-		-e 's:devfs_mk_symlink:DEVFS_MK_SYMLINK:' \
-		kernel/svgalib_helper/main.c
-
 	# Don't strip stuff, let portage do it
 	sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg
 }
@@ -104,13 +98,15 @@ src_install() {
 	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
+	if best_version '>=sys-fs/udev-052' ; then
+		dodir /etc/udev/rules.d
+		newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib
+	elif best_version sys-fs/udev ; then
+		insinto /etc/udev/permissions.d
+		newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib
+	elif best_version sys-fs/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
@@ -135,15 +131,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/dev/.devfsd ]] ; then
+	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 ${ROOT}/dev/.udev ]] ; then
+	elif [[ -e /dev/.udev ]] ; then
 		ebegin "Restarting udev to reread udev rules"
 		udevstart
 		eend $?
 	fi
-
-	linux-mod_pkg_postinst
 }