From: Ned Ludd <solar@gentoo.org>
Date: Sun, 14 Mar 2010 21:49:33 +0000 (+0000)
Subject: also install mdev.conf when USE=mdev is enabled (+default)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7b806e16f6a7f94f171b4fce87338481c2adcd4;p=gentoo.git

also install mdev.conf when USE=mdev is enabled (+default)
Package-Manager: portage-2.1.8.2/cvs/Linux x86_64
---

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index ebf0a7c480c8..62c8a41a16e1 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.242 2010/03/14 19:55:15 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.243 2010/03/14 21:49:33 solar Exp $
+
+  14 Mar 2010; <solar@gentoo.org> metadata.xml, busybox-1.16.0.ebuild:
+  - also install mdev.conf when USE=mdev is enabled (default)
 
 *busybox-1.16.0 (14 Mar 2010)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c3340aad05e0..059886129b4f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -9,6 +9,6 @@ DIST busybox-1.16.0.tar.bz2 2007183 RMD160 48944e58be18e5da46b7856b46717bc891dbb
 EBUILD busybox-1.14.2.ebuild 7239 RMD160 eb404dce401fcc8fea6258332b1606f6a52af48e SHA1 4c920560864b47be9e874ba67e4da415ac2e2e24 SHA256 db98e97b2fd1ebb96cb86ce96f5bd7e1bcece395513adde6bfe77a976adfcd95
 EBUILD busybox-1.15.2.ebuild 7333 RMD160 84a878941ca550e0aac9192720496ef62077bbeb SHA1 2cb36b66b2d2e17db05b2e51ad6264037a5c72b9 SHA256 0ab90bbe51652e165d8e871c7b4157f960fa88fa3d6c40ed630484f63aab1a58
 EBUILD busybox-1.15.3.ebuild 7350 RMD160 a691523e212ba871bc92a5dde3a3d8b3a942b33e SHA1 4d8c1607727d96dfce4eb12370cb02627401b208 SHA256 a67f83e70854c9d26f478cc9124165e8373681c6d2f557553f4de07986099745
-EBUILD busybox-1.16.0.ebuild 7548 RMD160 e551545e6d4072b4591ca7d5202c605878d57c44 SHA1 b6d37bbf9622a318338e2959550526bebb1b8fb4 SHA256 82aadb37fb1e69dcf0c433d68fd0ad759a93b5b52ec0956389a963410a73526a
-MISC ChangeLog 35556 RMD160 9d212852303161e655670d63ae0770f5509754bc SHA1 db11a94c7e4a975285a9d8691cfa8763bbaa04cb SHA256 abc79a389f3ce643c268d1d8956fb091da9e60fde47170a0cb24e40d376d3666
-MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a
+EBUILD busybox-1.16.0.ebuild 7654 RMD160 2984a9d9eb6bf126c7fc6cbc3e02f6fb9f4d19b7 SHA1 f25c8af368e46c8a3c232611b0a95141e9c35a3a SHA256 6fa7756ef2fe71d6034090d3308e0efbf508364537d18a05221b1acda0da7415
+MISC ChangeLog 35690 RMD160 b0d046cbf1dd68620873c121604b678417f0f2c2 SHA1 e844ed7567f8ebcd2622bf6d66714b2773b44019 SHA256 e4b38c376631a76154cd5af68f7e037e841e650337ed46ee7853a08398b291f8
+MISC metadata.xml 350 RMD160 ba59d910a93e9b94964e6ca1dd30cfb465f73f1b SHA1 6a228b24eab02f1dac14b6d3d5452ea3360694b7 SHA256 944199b1d950e1af56eadcf3c5adcb70f7386144a4fd846652ab7071202fed56
diff --git a/sys-apps/busybox/busybox-1.16.0.ebuild b/sys-apps/busybox/busybox-1.16.0.ebuild
index 95c553eea80b..7b2a03185011 100644
--- a/sys-apps/busybox/busybox-1.16.0.ebuild
+++ b/sys-apps/busybox/busybox-1.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.16.0.ebuild,v 1.1 2010/03/14 19:55:15 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.16.0.ebuild,v 1.2 2010/03/14 21:49:33 solar Exp $
 
 EAPI=2
 inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -58,7 +58,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug make-symlinks ipv6 -pam selinux static"
+IUSE="debug ipv6 make-symlinks +mdev -pam selinux static"
 RESTRICT="test"
 
 DEPEND="selinux? ( sys-libs/libselinux )
@@ -199,8 +199,10 @@ src_install() {
 	else
 		dobin bb || die
 	fi
-	dosym /bin/bb /sbin/mdev
-
+	if use mdev; then
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${D}"/etc/mdev.conf
+	fi
 	insinto /$(get_libdir)/rcscripts/addons
 	doins "${FILESDIR}"/mdev-start.sh || die
 
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index ba1722f5da73..53c8e5b1cd10 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>embedded</herd>
-<use><flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag></use>
+<use>
+<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
+<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf</flag>
+</use>
 </pkgmetadata>