Fix compatibility symlinks for bug #397949 and add a compat use flag for installing them.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

5 files changed, 34 insertions, 22 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 835c5459bf15..56988da16009 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.8 2012/01/05 15:55:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.9 2012/01/09 14:27:36 williamh Exp $
+
+  09 Jan 2012; William Hubbs <williamh@gentoo.org> kmod-3.ebuild,
+  kmod-9999.ebuild, metadata.xml:
+  Fix compatibility symlinks for bug #397949 and add a compat use flag for
+  installing them.
 
 *kmod-3 (05 Jan 2012)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 7697ea7661d2..6a27be8dda2b 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST kmod-3.tar.xz 285512 RMD160 98c7ef530c2ecf682042ea4d4ade1f30587347e6 SHA1 41f6d6082f72d2c4869f51844d7e9212c8091033 SHA256 4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9
-EBUILD kmod-3.ebuild 1298 RMD160 22c12a92e1fed57fec0088f49dccd6366780cddb SHA1 25565a0440894c1c2f0d9490dd018bec50784b20 SHA256 bfc9e2a1f50db042b188a70803eab36e9be01f32df82f84a45a938761586fdc6
-EBUILD kmod-9999.ebuild 1366 RMD160 38eabeb78efae5754a5c51257e4d63012538e78b SHA1 d39ae670c96be1825f883b3bf1e876b27167f978 SHA256 90a8a8ddca5d4551be19c26bb8bad2429a4becd53be31934fcca55e6b9cbeda2
-MISC ChangeLog 1582 RMD160 e23bfa0859f96dc95357896280d54537d4ecd2ab SHA1 84063539cab17f0871a03a53a5b07d2ee6400092 SHA256 2b9e82a72f808b8efcb9143f8525bb876acba657dfea1b049e92fc45e9f9dcd4
-MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4
+EBUILD kmod-3.ebuild 1338 RMD160 de79c723f9028e6afeec39336b2e9abe0403c92b SHA1 35bb2c6ef103434256db15ca991abafa164ca720 SHA256 66e2f9d57dd21b944ee7272e3f4c0fa346e3244a2201a8eedfc0577466766fb5
+EBUILD kmod-9999.ebuild 1406 RMD160 75aa350771fbc84f07067b32d1eff153edb37f65 SHA1 e43f762af22ecf0ad24680c845a62abb8e801bc4 SHA256 75c540e12bfa8e173732cf8b6c61833782bb324405ad1f7b72f989f1126c2334
+MISC ChangeLog 1777 RMD160 6dfcf686c95d151ae6d3b4e8548ff483b16c3f4a SHA1 d324ffaa5da95d3554faa328d945989699931e4f SHA256 3c262c4acff80073a988812717bffafe817438278161df638e86a611c37ea5aa
+MISC metadata.xml 393 RMD160 bffbe1d7720f7f9ebdd7fb9d7552994b9c161b7d SHA1 804b5515869554066ad97f800f10396512af4446 SHA256 1eba43575811e9a73366f6bccd3fe9f95ae0a3fb2877874abf40c16f4ad8f9cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8FxssACgkQblQW9DDEZTg0YACeIWCg8YH7tMNT72us0RvcLUS4
-YfQAn0h30RHTkN4jqMT9LuWeirTVqZHp
-=RPJ/
+iEYEARECAAYFAk8K+HEACgkQblQW9DDEZTiGqACdEsZfRZeNt1h5AMK0g5LfnKnm
+sfgAni05P+L39xuXVon/IQT2QD4QAoL6
+=0dyV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-3.ebuild b/sys-apps/kmod/kmod-3.ebuild
index 7b52c435fced..0ac7780ebe68 100644
--- a/sys-apps/kmod/kmod-3.ebuild
+++ b/sys-apps/kmod/kmod-3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-3.ebuild,v 1.1 2012/01/05 15:55:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-3.ebuild,v 1.2 2012/01/09 14:27:36 williamh Exp $
 
 EAPI=4
 
@@ -20,10 +20,13 @@ HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug lzma static-libs +tools zlib"
+IUSE="+compat debug lzma static-libs +tools zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )
-	lzma? ( app-arch/xz-utils )"
+REQUIRED_USE="compat? ( tools )"
+
+DEPEND="compat? ( !!sys-apps/module-init-tools )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 src_prepare()
@@ -52,10 +55,10 @@ src_install()
 	# we have a .pc file for people to use
 	find "${D}" -name libkmod.la -delete
 
-	# If the tools are installed, add compatibility symbolic links
-	if use tools; then
+	if use compat; then
+	dodir /sbin
 		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym kmod /usr/bin/$cmd
+			dosym /usr/bin/kmod /sbin/$cmd
 		done
 	fi
 }
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 9d2b57de908a..d1f933502992 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.4 2012/01/04 23:55:50 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.5 2012/01/09 14:27:36 williamh Exp $
 
 EAPI=4
 
@@ -20,10 +20,13 @@ HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug lzma static-libs +tools zlib"
+IUSE="+compat debug lzma static-libs +tools zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )
-	lzma? ( app-arch/xz-utils )"
+REQUIRED_USE="compat? ( tools )"
+
+DEPEND="compat? ( !!sys-apps/module-init-tools )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 src_prepare()
@@ -52,10 +55,10 @@ src_install()
 	# we have a .pc file for people to use
 	find "${D}" -name libkmod.la -delete
 
-	# If the tools are installed, add compatibility symbolic links
-	if use tools; then
+	if use compat; then
+	dodir /sbin
 		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym kmod /usr/bin/$cmd
+			dosym /usr/bin/kmod /sbin/$cmd
 		done
 	fi
 }
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 67a87a1c10df..ec12a3963b8a 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 
 	<use>
+		<flag name='compat'>Install module-init-tools compatible symlinks.</flag>
 		<flag name='tools'>Install module loading/unloading tools.</flag>
 	</use>
 </pkgmetadata>