From 65dcb3b27c6ae1437f47b8d96fc1bf9ce2e0406a Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Wed, 4 Jan 2012 23:55:50 +0000
Subject: [PATCH] install everything in /usr/bin per upstreams default
 settings. Also add module-init-tools compatible symbolic links.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686
---
 sys-apps/kmod/Manifest         | 20 +++++---------------
 sys-apps/kmod/kmod-9999.ebuild | 24 ++++++++++++++----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 16339640ed34..bb66fadbdb01 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,23 +3,13 @@ Hash: SHA1
 
 DIST kmod-2.tar.xz 262484 RMD160 50df74d66a3b30200f0c827c0e72520ae6ebb384 SHA1 ece8e658434190e8be3efae187c8276447701e2e SHA256 33edf14f28ef9b51d893e6167d846d23fc572f6ba634acf0ad9a6e3925ff55c0
 EBUILD kmod-2.ebuild 1228 RMD160 5d8ec58560fe387ba8924e029da12115609d1668 SHA1 2c355fdd56d23542750d603e5575fa6cd720162a SHA256 8f85a956c829a69a40576158bc3c4d6337d4673d41221816c1cfa459c08e847a
-EBUILD kmod-9999.ebuild 1325 RMD160 92be5ed87229bff6ca7b67316177ecb602344a5e SHA1 2659554f606cb317302fcbbfb7c988c0f248a900 SHA256 8826fafcb181fcb6166216380d53dbda788970e7aa9fb643e61df0d60f3985c2
+EBUILD kmod-9999.ebuild 1366 RMD160 38eabeb78efae5754a5c51257e4d63012538e78b SHA1 d39ae670c96be1825f883b3bf1e876b27167f978 SHA256 90a8a8ddca5d4551be19c26bb8bad2429a4becd53be31934fcca55e6b9cbeda2
 MISC ChangeLog 1368 RMD160 2516e227da4d5ca52825773cca9cf4c10ced715b SHA1 b1b5a79945ffafab2570d5b11544d8b73b9a6960 SHA256 e3ed2f0d725473efb1ef1b859e249c4548c1ebae23d5a638005459519037452d
 MISC metadata.xml 448 RMD160 1e7484f4c20f117e87c84e52e03c0fa2db0a88aa SHA1 a7abcde4120f83eec76a5bae60b39d93ac745999 SHA256 6d9837a18e91a9851f56c04468ee90582d891d46f6b3704d942e4fa2c4b6c8e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPAgzHAAoJELEHsLL7fEFWS/oP/ixmUSVhYOULo9SkKr73NFvu
-9xk7tChbPpyvKPWuq1wQHUsZYai0OI5FnekkJy+6SyHibSK2zvxKfFqX5GzcO68L
-1d9+EX9adnJKGIMCyjLQTAJHcu5VqhYA6xXG9V8pscaDyiRqLjQtoIqX163xi2/r
-8hjYxa3XJZRhkj6Kyris/dONaOaEZ6VDqK1C/FVrNzTmyDTprXJ/pVSG3k7s1Lvo
-TUrgrtNZ/SvQTPHEmRGoVnHQ+it3c4boFrkzuSlCO52kaou7rF+WGl21hnDh05RB
-objD/047YZW7pFiVhMyA+Z7jQN8zigg9raj5HqLS/3WWxJpIXO/KRq/uteaX5ftE
-HGcY3RIinTDvzEGPY4T4C7OjyomS8yi6qwRxDr+DEPeoG4XGhN9m/cj0ggrW5QQn
-1lI0CBUueHY6gIoxNRCLXkdubpNzbbL3iWoj0xQJY5hA+5+SylyfHn0JKIpd8fyT
-0GnG4YJE7Q4up0rLjYum7s6pE6NYft3RQ+zHysv5dAve55zZZaonZ6MEMhm6TBJY
-RGsg5KRhbg5a/gO30smE75BQvGtu2Re4A7NaEhJnFKSUe9E4bDbVY9rZ4JbIQl7h
-hJXMoVG9F1aNXGti7yeJfj3ojxz5GvXMYpPYPS4IzyT1AdtRdXXT+dSFXQ+Jurm+
-DkaVKp3htR4lDTzoBTeF
-=MaXn
+iEYEARECAAYFAk8E5kQACgkQblQW9DDEZTjbgACgtak/1+5bPZQNc5waicFZM2SX
+Fo8AoKETWTBUIoZ79f16A/lHXvSW3mH0
+=36OL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 371510aeb76f..9d2b57de908a 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.3 2012/01/02 19:59:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.4 2012/01/04 23:55:50 williamh Exp $
 
 EAPI=4
 
@@ -26,7 +26,8 @@ DEPEND="zlib? ( sys-libs/zlib )
 	lzma? ( app-arch/xz-utils )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
+src_prepare()
+{
 	if [ ! -e configure ]; then
 		eautoreconf
 	else
@@ -34,10 +35,9 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
+src_configure()
+{
 	econf \
-		--bindir=/bin \
-		--with-rootprefix=/ \
 		$(use_enable debug) \
 		$(use_with lzma xz) \
 		$(use_enable static-libs static) \
@@ -45,13 +45,17 @@ src_configure() {
 		$(use_with zlib)
 }
 
-src_install() {
+src_install()
+{
 	default
 
-	dodir /sbin
-	mv "${D}"/bin/kmod-{{ins,rm}mod,modprobe} "${D}"/sbin/ || die
-
-	gen_usr_ldscript -a kmod
 	# 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
+		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym kmod /usr/bin/$cmd
+		done
+	fi
 }
-- 
2.26.2