From 2fe1bd619e7674eed76f8e5ca94fcc2ffd8e394a Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Tue, 26 Jul 2011 20:43:54 +0200
Subject: sys-fs/static-dev: #373625
 https://bugs.gentoo.org/show_bug.cgi?id=373625

---
 sys-fs/static-dev/Manifest              |  2 +-
 sys-fs/static-dev/static-dev-0.1.ebuild | 44 ++++++++++++++-------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

(limited to 'sys-fs')

diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index c7c9b835..03b3ed90 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1 +1 @@
-EBUILD static-dev-0.1.ebuild 1713 RMD160 b63a50683b6811ce1bb25b467fc5110ecd2a227e SHA1 3b5ae1a57201beeb6e3ab6e15495b95debccfe2e SHA256 38ab5c2dfde4c0cd750cd6d0aab422a197520bf6a7297038f39468eaaaa1e31e
+EBUILD static-dev-0.1.ebuild 1449 RMD160 d3a21452c1cdb07714773b506419886a6c9fd7ef SHA1 9c977f77e9da2927c96cfbb5feb4d4c503cafcb7 SHA256 9f9bc0deb3c806ca9814a41cf1cd2aa70fd4d1faf4d44dc870438b01bc2d324a
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index c4ee6027..cd124f90 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.10 2008/03/30 15:14:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.13 2011/04/15 21:57:05 ulm Exp $
 
 inherit toolchain-funcs
 
@@ -10,10 +10,10 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-PROVIDE="virtual/dev-manager"
+RDEPEND="|| ( sys-apps/makedev =sys-apps/baselayout-1* )"
 
 pkg_preinst() {
 	if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then
@@ -28,32 +28,24 @@ pkg_preinst() {
 		eerror "umount /tmp/newroot"
 		die "Cannot install on udev/devfs tmpfs."
 	fi
+
+	einfo ""
+	einfo "To add personal devices classes, but set env variable EXTRA_CLASSES"
+	einfo ""
 }
 
 src_install() {
 	dodir /dev
 	cd "${D}"/dev/ || die "Unable to descend into /dev"
 
-	# keep in sync with sys-apps/baselayout
-	local suffix=""
-	case $(tc-arch) in
-		arm*)    suffix=-arm ;;
-		alpha)   suffix=-alpha ;;
-		amd64)   suffix=-i386 ;;
-		hppa)    suffix=-hppa ;;
-		ia64)    suffix=-ia64 ;;
-		m68k)    suffix=-m68k ;;
-		mips*)   suffix=-mips ;;
-		ppc*)    suffix=-powerpc ;;
-		s390*)   suffix=-s390 ;;
-		sh*)     suffix=-sh ;;
-		sparc*)  suffix=-sparc ;;
-		x86)     suffix=-i386 ;;
-	esac
-
-	einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
-
-	export PATH=${ROOT}/dev:/dev:${PATH}
-	MAKEDEV -d ${D}/dev generic${suffix} || die
-	MAKEDEV -d ${D}/dev sg scd rtc hde hdf hdg hdh input audio video || die
+	local classes="generic sda sdb sdc ptmx ram rtc"
+
+	einfo "Creating device nodes using classes:"
+	einfo "  ${classes}"
+	[ -n "${EXTRA_CLASSES}" ] && einfo "  ${EXTRA_CLASSES}"
+
+	MAKEDEV -d "${D}"/dev \
+		${classes} \
+		${EXTRA_CLASSES} \
+		|| die
 }
-- 
cgit v1.2.3