handle more arches and cleanup ebuild a bit

Package-Manager: portage-2.1.1_pre5-r3

2 files changed, 48 insertions, 34 deletions

diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index 78234d0260eb..42aa5691a333 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,7 +1,10 @@
-EBUILD static-dev-0.1.ebuild 1606 RMD160 42fc9928a37a93efb31ae7278a467d326c0fe5d0 SHA1 7543870bc12b8f1d5c1429391078616bcbc73f6d SHA256 1cb4768fbe28964ba7bc9c4e3a9aab30ebb42cafe449ff71ad8e41503068650b
-MD5 5c2d9ae8a1e4602a3bbb3aad45a6df69 static-dev-0.1.ebuild 1606
-RMD160 42fc9928a37a93efb31ae7278a467d326c0fe5d0 static-dev-0.1.ebuild 1606
-SHA256 1cb4768fbe28964ba7bc9c4e3a9aab30ebb42cafe449ff71ad8e41503068650b static-dev-0.1.ebuild 1606
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD static-dev-0.1.ebuild 1728 RMD160 b9b43f9926d629a2e7e195e4f2c60867cf49f38d SHA1 74364b8663ed6850c30251a10c2ce2115b721b4a SHA256 2f0d2c2a6e6d2fa336ad39e1fda60d9822208065af7793a11dcacbd73ec7e5be
+MD5 ebb4a74767ea47eddc4fa4bc2bdb592a static-dev-0.1.ebuild 1728
+RMD160 b9b43f9926d629a2e7e195e4f2c60867cf49f38d static-dev-0.1.ebuild 1728
+SHA256 2f0d2c2a6e6d2fa336ad39e1fda60d9822208065af7793a11dcacbd73ec7e5be static-dev-0.1.ebuild 1728
 MISC ChangeLog 1024 RMD160 18e7d6d190efb9efe865a2a3553a1cd2168b65fe SHA1 a7859abc579c1610fb56e1fa94411c05548afdd0 SHA256 a2819fc8bb983b56f5812aa91f58e466d18b3ad39a21a454a0f9c96ee970db51
 MD5 47de7f8a5c236636a254f909f621e908 ChangeLog 1024
 RMD160 18e7d6d190efb9efe865a2a3553a1cd2168b65fe ChangeLog 1024
@@ -13,3 +16,10 @@ SHA256 b5957b27c9ff24c7903f43253d761db2c5613c196472cfc5ddcdf0e141ca3543 metadata
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-static-dev-0.1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-static-dev-0.1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-static-dev-0.1 1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE7Q/AamhnQswr0vIRAnO9AJ0W+yZdxq3ofeEsrw8UmxpPoWAY1gCgrgJ4
+hei8GYAvfoybs1kCDORedJE=
+=ucMn
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index b831a2f71599..26ddfae69358 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,19 +1,24 @@
 # Copyright 2005-2006 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.7 2006/07/13 01:21:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.8 2006/08/24 02:30:46 vapier Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="A skeleton, statically managed /dev"
-HOMEPAGE="http://bugs.gentoo.org/show_bug.cgi?id=107875"
+HOMEPAGE="http://bugs.gentoo.org/107875"
 SRC_URI=""
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
+
+DEPEND=""
 RDEPEND="virtual/baselayout"
 PROVIDE="virtual/dev-manager"
 
 pkg_setup() {
-	if [[ -d /dev/.udev/ || ! -c /dev/.devfs ]]; then
+	if [[ -d ${ROOT}/dev/.udev/ || ! -c ${ROOT}/dev/.devfs ]] ; then
 		echo ""
 		eerror "We have detected that you currently use udev or devfs"
 		eerror "and this ebuild cannot install to the same mount-point."
@@ -27,31 +32,30 @@ pkg_setup() {
 	fi
 }
 
-pkg_postinst() {
-	local x="generic"
-	local makedev
-
-	cd "${ROOT}/dev/" || die "Unable to descend into ${ROOT}/dev/"
-
-	for arch in alpha arm hppa ia64 m68k mips s390 sparc; do
-		use ${arch} && x="${x} generic-${arch}"
-	done
-
-	[[ "${CHOST:0:7}" == "mipsel-" ]] && x="${x} generic-mipsel"
-
-	( use x86 || use amd64 ) && x="${x} generic-i386"
-	( use ppc || use ppc64 ) && x="${x} generic-powerpc"
-
-	[[ -e ${ROOT}/dev/MAKEDEV ]] && makedev="${ROOT}/dev/MAKEDEV" || makedev="/dev/MAKEDEV"
-
-	einfo "Making device nodes for ${x}"
-	sh ${makedev} ${x} || die "No ${makedev}?"
-}
-
-src_compile() {
-	:
-}
-
 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 generic${suffix} || die
+	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video || die
 }