sys-kernel/dracut-016: Ebuild improvements.

Remove network or dm related modules when USE flags 'net' or 'dm' are disabled.
Modules depending on networking or device-mapper have corresponding flags which
depend on 'net' or 'dm'.

'ssh-client' dracut_module was added and net-misc/curl dependency to 'net'
because of new url-lib module.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

4 files changed, 66 insertions, 38 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 4ef73a0a958f..76e693564f2b 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.44 2012/02/15 18:38:30 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.45 2012/02/16 17:51:18 aidecoe Exp $
+
+  16 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-016.ebuild,
+  metadata.xml:
+  Remove network or dm related modules when USE flags 'net' or 'dm' are
+  disabled. Modules depending on networking or device-mapper have corresponding
+  flags which depend on 'net' or 'dm'.
+
+  'ssh-client' dracut_module was added and net-misc/curl dependency to 'net'
+  because of new url-lib module.
 
 *dracut-016 (15 Feb 2012)
 
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 4269ff563fa4..5f699491040f 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -19,17 +19,17 @@ DIST dracut-016.tar.bz2 164830 RMD160 092f9e91316702778b29f0c509071a5c10889ec7 S
 EBUILD dracut-010-r3.ebuild 6065 RMD160 a22dc9a5262b0f8e5e0464f6ae7ac7e9e0569f0d SHA1 94dc7e9fde02a332a22d605e142f73336ac3a1c3 SHA256 c905f82f3ce5097abcbc240a2cdc92d0306c8750cc0102c2bcfea464d250b57b
 EBUILD dracut-013-r2.ebuild 6339 RMD160 f9ae556336ca0407ca344b176ac7477728745001 SHA1 eb1f9038db1cdf2008068e2cb7a666007b2e0fd7 SHA256 46cbfa17207fb98ad6aa55f0b71dca13c6b907a6668bfe83afa69bae1d2bac30
 EBUILD dracut-014-r2.ebuild 6178 RMD160 17c148f97be15cc737808852bd510dfaad64a687 SHA1 82629b82239d833b54690c8c0a38d8f7128d0e1c SHA256 5753ba09e1a1f13339e228050377eb85dac7153a21f725d75b39a992e3e5fdf1
-EBUILD dracut-016.ebuild 6485 RMD160 82aa4a0631de8037513eddec61459d705baa3d23 SHA1 41e9e91a4fed82c0f36007d572979e4f7d05f703 SHA256 b3da07d5ff014743255d662111959ef7c12db2550da446176283e5d644131bb2
-MISC ChangeLog 15095 RMD160 d3ba52163fe0488314ac9f94f876ba3cd78a9556 SHA1 0174a8c479f1dc6b2b7934bc85e5ce6690b9fae3 SHA256 3818622c7f6071cf05771fd2269d1382ea9bc1a4f53f86c9de1bef87c3495d06
-MISC metadata.xml 602 RMD160 cd11704bfcf7aca599c2671b91416112fdb2cc75 SHA1 d2345b2bb4d17a6887754a7569d7d91f32f42df2 SHA256 c234e9242c61200d81fe2ba3b58deaab911bc36413d657a61580ca6de69f2412
+EBUILD dracut-016.ebuild 6801 RMD160 00d22875aed6a3f656346db122882998195f1cda SHA1 00b2575bd67545bb4c96ab33bf42f8bfce19252f SHA256 60a8b212599f027a908e640f1a2d5a0259163249677c5680b48b19febaa659b4
+MISC ChangeLog 15490 RMD160 150bea679682e70fc2307976ccd550950376926f SHA1 3f671b6e96a764b18cc94051e314e026063f9fd2 SHA256 e26dd6abf85c0f502cbf55777229aeebb2fe42b3ba750cb3ce2c8382caf63e4f
+MISC metadata.xml 863 RMD160 1b8a812d7d7e782848ebbdb36234bbbdcf632db4 SHA1 b4c82f1b037d1f039b5229a11a694d61bfb71fad SHA256 a13ee26bc7aaf0e9ff05489f002cbc0ede1e59b4f3b16304ba0f672da4b23e15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPO/usAAoJEPATRTHh2/q1ZZUH+gNzV/PSNthQNb+tzGczkEJR
-CWAhNrG8rm0fzLyRulcQaWkWxs+RxRWKhRj7B3SnnlrORLgmuUjIqd+fnhGP/7Uj
-uk7UphDK5dM8Dd0xLQChDztdlTOD/knKZQs86ZjcLE1X1n5Q6rMmeOXFHlron9R/
-mG5ymxqxYMyarXbxd1OofU/zKODXTr/47ktmySBwU7hYWWO9/J7C7nwu7z2fFfMm
-symTAq/Bzp4OCkry/06zExerTlVxizC7HO9KPexao+WsameM3lrS8kWzC4Pw/L+D
-8wclTGkUJzDEN6Ftg3fbZEpDKQLZMcIwxQE3E4qVt1w3J22+3V0a0bzdas7Z/n0=
-=DgU2
+iQEcBAEBAgAGBQJPPUIcAAoJEPATRTHh2/q1kE8H/RQKMmPliuRh7bCIxNa/Oaiy
+vtmD9joN9oZc0Kh0tQRCVMRWAUMtT2rcbIIIdj8MR2MGLQ6vRdh5+o01aVA4/jT9
+04U4r5n/BkrVPFAKOA93DRwsOyp9nbYGOYDay+ZjSyW1IoJN+njPFqW1PQFrKDC8
+o/RxzpBcRkD7tjqm90TJcsgnveOem6VeR8TTo9yoO77qiC6FSZszHymGTt8ItKYv
+0mlg3v35brP/ZCmso+b6gIKdQ9PUpxvgr38qhR+h68Ef19b2vxXp7Zl1jeYKq7XB
+BAet/q17bNZw+GdS//RyQMqqbVmpPDLZnAUoygv1Ellvh3F4Sb3NBonsZlSk0UM=
+=0BJ5
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-016.ebuild b/sys-kernel/dracut/dracut-016.ebuild
index a7717d1fb171..6613c3c2b889 100644
--- a/sys-kernel/dracut/dracut-016.ebuild
+++ b/sys-kernel/dracut/dracut-016.ebuild
@@ -1,22 +1,31 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-016.ebuild,v 1.1 2012/02/15 18:38:30 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-016.ebuild,v 1.2 2012/02/16 17:51:18 aidecoe Exp $
 
 EAPI=4
 
 inherit eutils linux-info
 
+add_req_use_for() {
+	local dep="$1"; shift
+	local f
+
+	for f in "$@"; do
+		REQUIRED_USE+="${f}? ( ${dep} )
+"
+	done
+}
+
 DESCRIPTION="Generic initramfs generation tool"
 HOMEPAGE="http://dracut.wiki.kernel.org"
 SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-REQUIRED_USE="dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	"
+KEYWORDS="~amd64 ~x86"
 
+REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
+	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
+	"
 COMMON_MODULES="
 	dracut_modules_biosdevname
 	dracut_modules_btrfs
@@ -28,12 +37,6 @@ COMMON_MODULES="
 	dracut_modules_plymouth
 	dracut_modules_syslog
 	"
-NETWORK_MODULES="
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	"
 DM_MODULES="
 	dracut_modules_crypt
 	dracut_modules_dmraid
@@ -41,12 +44,19 @@ DM_MODULES="
 	dracut_modules_livenet
 	dracut_modules_lvm
 	"
+NETWORK_MODULES="
+	dracut_modules_iscsi
+	dracut_modules_livenet
+	dracut_modules_nbd
+	dracut_modules_nfs
+	dracut_modules_ssh-client
+	"
+add_req_use_for dm ${DM_MODULES}
+add_req_use_for net ${NETWORK_MODULES}
 IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
-RESTRICT="test"
+IUSE="debug dm net selinux ${IUSE_DRACUT_MODULES}"
 
-NETWORK_DEPS=">=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2"
-DM_DEPS="|| ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 )"
+RESTRICT="test"
 
 RDEPEND="
 	>=app-shells/bash-4.0
@@ -59,22 +69,24 @@ RDEPEND="
 	app-arch/cpio
 
 	debug? ( dev-util/strace )
+	dm? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+	net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
 	selinux? ( sys-libs/libselinux sys-libs/libsepol )
 	dracut_modules_biosdevname? ( sys-apps/biosdevname )
 	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
 	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_crypt? ( sys-fs/cryptsetup ${DM_DEPS} )
+	dracut_modules_crypt? ( sys-fs/cryptsetup )
 	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
-	dracut_modules_dmsquash-live? ( ${DM_DEPS} )
+	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
 	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ${NETWORK_DEPS} )
+	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
 	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
 	dracut_modules_mdraid? ( sys-fs/mdadm )
 	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd ${NETWORK_DEPS} )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
+	dracut_modules_nbd? ( sys-block/nbd )
+	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
 	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
+	dracut_modules_ssh-client? ( dev-libs/openssl )
 	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
 	"
 DEPEND="
@@ -112,9 +124,9 @@ rm_module() {
 
 	for m in $@; do
 		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm -rf "${modules_dir}"/$m
+			rm --interactive=never -r "${modules_dir}"/$m
 		else
-			rm -rf "${modules_dir}"/[0-9][0-9]$m
+			rm --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
 		fi
 	done
 }
@@ -181,8 +193,10 @@ src_install() {
 	use debug || rm_module 95debug
 	use selinux || rm_module 98selinux
 
-	! any_module ${DM_MODULES} && rm_module 90dm
-	! any_module ${NETWORK_MODULES} && rm_module 45ifcfg 40network
+	# Following flags define set of helper modules which are base dependencies
+	# for others and as so have no practical use, so remove these modules.
+	use dm  || rm_module 90dm
+	use net || rm_module 40network 45ifcfg 45url-lib
 
 	# Remove S/390 modules which are not tested at all
 	rm_module 95dasd 95dasd_mod 95zfcp 95znet
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index 5e8fdff2a74b..621a2bc0b9b3 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -10,7 +10,12 @@
 		<name>Lance Albertson</name>
 	</maintainer>
 	<use>
-        <flag name="debug">Module installing additional tools like strace, file editor, ssh and more</flag>
+		<flag name="debug">Module installing additional tools like strace, file
+			editor, ssh and more</flag>
+		<flag name="dm">Set of helper modules providing support for device
+			mapper. You need to enable this only if emerge says so.</flag>
+		<flag name="net">Set of helper modules providing networking support. You
+			need to enable this only if emerge says so.</flag>
 	</use>
 	<longdescription lang="en">
 	Generic, modular initramfs generation tool that can be used across various