Always delete .la since we have a .pc file, and restore /bin and /sbin split.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index f1847a56721d89a45431d175ad404574b7a98d3f..cd2f89f0a32af60e349caf5cee68e9fd2e006094 100644 (file)
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,9 @@
 # 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.6 2012/01/01 09:49:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.7 2012/01/02 19:59:55 vapier Exp $
+
+  02 Jan 2012; Mike Frysinger <vapier@gentoo.org> kmod-9999.ebuild:
+  Always delete .la since we have a .pc file, and restore /bin and /sbin split.
 
   01 Jan 2012; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Removing myself.

diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index c0c9336d5eb66c9c9d558d71e2749ab1d51f7172..16339640ed348cfb90ed83443c7a144966641768 100644 (file)
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 1295 RMD160 e123f10c9ad667ed4a6464e8444e58e92a2e3dfd SHA1 0e8ce4ccc242845cb2c283bd2d8d93e3e4d5fe5d SHA256 4456935a21496a6c85d1df4eba6261d9c63f117fdee76496ebc85578efa53209
-MISC ChangeLog 1219 RMD160 53f42d1d8539c1eb723535fc1f2f92047be2d90a SHA1 323e5bf397d2a3bed900ef214f0acc69b3594790 SHA256 0f5b786aeedffcadbd8cee9707e7c3d5342009e43834d24e164a2ed07b2e010e
+EBUILD kmod-9999.ebuild 1325 RMD160 92be5ed87229bff6ca7b67316177ecb602344a5e SHA1 2659554f606cb317302fcbbfb7c988c0f248a900 SHA256 8826fafcb181fcb6166216380d53dbda788970e7aa9fb643e61df0d60f3985c2
+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)
+
+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
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 27e3d7a25a78dfa99b0a56314c76cfa305ab6b37..371510aeb76f0400287a64c7944e380d9fbac9d2 100644 (file)
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.2 2011/12/31 23:57:23 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.3 2012/01/02 19:59:55 vapier Exp $
 
 EAPI=4
 
@@ -26,13 +26,7 @@ DEPEND="zlib? ( sys-libs/zlib )
        lzma? ( app-arch/xz-utils )"
 RDEPEND="${DEPEND}"
 
-src_prepare()
-{
-       # Apply patches with epatch if necessary.
-
-       # Allow user patches to be applied without modifying the ebuild.
-       epatch_user
-
+src_prepare() {
        if [ ! -e configure ]; then
                eautoreconf
        else
@@ -40,20 +34,24 @@ src_prepare()
        fi
 }
 
-src_configure()
-{
+src_configure() {
        econf \
-               --bindir=/sbin \
+               --bindir=/bin \
                --with-rootprefix=/ \
                $(use_enable debug) \
                $(use_with lzma xz) \
-       $(use_enable static-libs static) \
+               $(use_enable static-libs static) \
                $(use_enable tools) \
                $(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
 }