version bump for bug #406887

(Portage version: 2.2.0_alpha89/cvs/Linux i686)

3 files changed, 86 insertions, 4 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 83ede51eb09f..27eec3fe5885 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2012/02/25 07:08:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.24 2012/03/08 01:54:59 williamh Exp $
+
+*kmod-6 (08 Mar 2012)
+
+  08 Mar 2012; William Hubbs <williamh@gentoo.org> +kmod-6.ebuild,
+  kmod-9999.ebuild:
+  version bump for bug #406887
 
   25 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> kmod-5.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/kmod-6.ebuild b/sys-apps/kmod/kmod-6.ebuild
new file mode 100644
index 000000000000..f128d7171a89
--- /dev/null
+++ b/sys-apps/kmod/kmod-6.ebuild
@@ -0,0 +1,76 @@
+# 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-6.ebuild,v 1.1 2012/03/08 01:54:59 williamh Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+
+[[ "${PV}" == "9999" ]] && vcs=git-2
+inherit ${vcs}  autotools eutils toolchain-funcs
+unset vcs
+
+if [[ "${PV}" != "9999" ]] ; then
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="+compat doc debug lzma static-libs +tools zlib"
+
+REQUIRED_USE="compat? ( tools )"
+
+COMMON_DEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-util/gtk-doc )"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare()
+{
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs ||  die "gtkdocize failed"
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_with zlib)
+}
+
+src_install()
+{
+	default
+
+	# we have a .pc file for people to use
+	find "${D}" -name libkmod.la -delete
+
+	if use compat && use tools; then
+	dodir /bin
+dosym /usr/bin/kmod /bin/lsmod
+		dodir /sbin
+		for cmd in depmod insmod modinfo modprobe rmmod; do
+			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 f52b69a19843..c5a427f1fa3d 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.12 2012/02/25 07:08:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.13 2012/03/08 01:54:59 williamh Exp $
 
 EAPI=4
 
@@ -11,12 +11,12 @@ inherit ${vcs}  autotools eutils toolchain-funcs
 unset vcs
 
 if [[ "${PV}" != "9999" ]] ; then
-	SRC_URI="http://packages.profusion.mobi/kmod/${P}.tar.xz"
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git"
+HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"