summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-02 19:59:55 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-02 19:59:55 +0000
commit0729b3f20f83ed0ca2b28c2e01d07cc84605fbac (patch)
tree7d68c920155072220314fa283f0f07d68a9d0cfb /sys-apps
parentInitial import. Part of the default Rails 3.1 asset pipeline. (diff)
downloadgentoo-2-0729b3f20f83ed0ca2b28c2e01d07cc84605fbac.tar.gz
gentoo-2-0729b3f20f83ed0ca2b28c2e01d07cc84605fbac.tar.bz2
gentoo-2-0729b3f20f83ed0ca2b28c2e01d07cc84605fbac.zip
Always delete .la since we have a .pc file, and restore /bin and /sbin split.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/kmod/ChangeLog5
-rw-r--r--sys-apps/kmod/kmod-9999.ebuild28
2 files changed, 17 insertions, 16 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index f1847a56721d..cd2f89f0a32a 100644
--- 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/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 27e3d7a25a78..371510aeb76f 100644
--- 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
}