Version bump.

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

4 files changed, 107 insertions, 16 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 6749214e8fa1..ebcd32759328 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.34 2012/04/06 21:04:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.35 2012/04/20 12:14:30 ssuominen Exp $
+
+*kmod-8 (20 Apr 2012)
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-8.ebuild,
+  kmod-9999.ebuild:
+  Version bump.
 
   06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-7.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index c2288d8cba46..6dcccd64499e 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 DIST kmod-7.tar.xz 981936 RMD160 62acbee83cebe1874a71e318c28203b90d6171bc SHA1 1038cdb5c4570acc5614dcf1c29688f21f3d8c2d SHA256 9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7
+DIST kmod-8.tar.xz 986632 RMD160 0362706172e9fc386d8b88e10e7a8b8be9dfc9fa SHA1 2481ffbfb5e82f076a8f6b71fb1d53b462a16711 SHA256 35f7d1dfcf62ea3d6da1ed0ee41a7997333680033609c5e9658f4fe8d997734d
 EBUILD kmod-7.ebuild 2039 RMD160 5a902f798dde670e13aded0c27feaeb4aa103472 SHA1 9884f16433fdf11edaa7f6aac6c3b02307426630 SHA256 c004d098f848fc2c74ed2f4f6d988def09b41529d9e17bfc0e74e31e20a55c3b
-EBUILD kmod-9999.ebuild 2079 RMD160 16b926fbbdc3c1bddf15a3a07b62620c9c356a21 SHA1 4569dbf6f8e3871765c35b4481f723332c42c171 SHA256 633c8375f3a52ab78d45f40c83d5eacd1e5e1828e03e95b2715b58c7dcaea2b8
-MISC ChangeLog 4980 RMD160 19f623145da08b24b715a21adf8e8b5baaeb15eb SHA1 5d97f5e23e70f42da30e81618df94d7f16bf4d29 SHA256 839ee8931ec6b68c667684d672b7cf811dd55c51719b31992fc3deb5454f2879
+EBUILD kmod-8.ebuild 1981 RMD160 b0f92bdc2e50669986fdcebf9f3ab81300b50d43 SHA1 11092e7404a499d806fdb1a3de46b175f0151350 SHA256 9bff2a7871051fd7fb3171924d7a6c69dc1594966b0908e70ab6651422d228a6
+EBUILD kmod-9999.ebuild 2021 RMD160 f1817bb7a60fbc5d37a5dae83b34896267bf488b SHA1 7754808fd59c5d3b1a46ccf892fcc744f0746493 SHA256 2b78a7970f75f3980bd7c01f2d1de0b8097609c58ca057f6e457e5775646c9e9
+MISC ChangeLog 5110 RMD160 e6b39217a27f4ee45627b8240bbcbee64499136d SHA1 163347fe1117d69228df421d837a3f07c660dbd0 SHA256 7ac243881e6a662399d4436a0692e86101ae1b31b5f3d3b46e7f97ad2cc8256c
 MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPf1pNAAoJEEdUh39IaPFNB60IAKLA9MzF36KDHLN+nTIQ4ghA
-PYnMpWB3+M1bKcG5taGlVtqV8TmW9UlGeHXjT9ZVOgC3Cueh2MWJWFbhr9Cn/Q57
-n+Dt3egk9urRq9yDR0Bp0cI+Ti6CNi0XphxF7N87I2lgRhy2y67oAXO9cPjy6V7+
-SkU9zmM2TObYEGSbEaRbspUjss3bJPWLzATALMt6yX+61TMOiLG5KaUxZjXhwkhJ
-JDY8x5Xwe5VYVG+rEB8BRUHe6wUsS1KwBC9Ng+Hgq4gMAKQWa8KVbhtKHjYoTHsi
-60mOZkaTvBDxR6ehjfMrtTMh3rhwle1woggAcg18YTOJ46tSajwAxQeG2kPZ+/A=
-=ham2
+iQEcBAEBAgAGBQJPkVLKAAoJEEdUh39IaPFNTEkH/0ID9e7GnW/r4uegtPg85Tr2
+jSeC5MirxotKT84JOOUULs6Q8+kFpC9crUgskWiO6z0MwVcvbBTPIT+mVJpPu1iS
+M0mYyHNNJNV7gIINYtSK3M6LBmtngvpIwZ+h4mjsrjLoeF18AB6D2mL4bTGNuOFj
+QCEbUL39Y8XgCgOED2nWMr9uloxy3/Y8nufndXMktnYMi4c75090753AIlCoQa3B
+Tdl7YTwDjVWswiYoq6haY6rwcG2iC+E1neNjhArFocHO8JIYGxfgvN6wnxCT/xva
+Q2jKpByHAYJGdrjTkO6J5PQgzczZPxiCnBWK0g2UuuoTCiIM8M2K05m9Icz/xvI=
+=zcNP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-8.ebuild b/sys-apps/kmod/kmod-8.ebuild
new file mode 100644
index 000000000000..99d83f011af1
--- /dev/null
+++ b/sys-apps/kmod/kmod-8.ebuild
@@ -0,0 +1,86 @@
+# 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-8.ebuild,v 1.1 2012/04/20 12:14:30 ssuominen 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="debug doc lzma static-libs +tools zlib"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( dev-util/pkgconfig )
+	zlib? ( dev-util/pkgconfig )"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+src_prepare()
+{
+	if [ ! -e configure ]; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure()
+{
+	# http://bugs.gentoo.org/410865
+	if has_version '<sys-libs/zlib-1.2.6'; then
+		export zlib_CFLAGS="-I/usr/include"
+		export zlib_LIBS="-lz"
+	fi
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib)
+}
+
+src_install()
+{
+	default
+
+	find "${D}" -name libkmod.la -exec rm -f {} +
+
+	if use tools; then
+		dodir /bin
+		dosym /usr/bin/kmod /bin/lsmod
+		dodir /sbin
+		local cmd
+		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 871fd714b75b..fe680fd89fbc 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.24 2012/04/06 21:04:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.25 2012/04/20 12:14:30 ssuominen Exp $
 
 EAPI=4
 
@@ -59,16 +59,13 @@ src_configure()
 		export zlib_LIBS="-lz"
 	fi
 
-	local myconf
-	[[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
 		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
 		$(use_with lzma xz) \
-		$(use_with zlib) \
-		${myconf}
+		$(use_with zlib)
 }
 
 src_install()