Version bump.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 102 insertions, 24 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index ca84ba7d0b08..e9d5049120a3 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.26 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.27 2012/03/19 13:47:06 ssuominen Exp $
+
+*kmod-7 (19 Mar 2012)
+
+  19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-7.ebuild,
+  kmod-9999.ebuild:
+  Version bump.
 
   09 Mar 2012; William Hubbs <williamh@gentoo.org> kmod-6.ebuild,
   kmod-9999.ebuild, metadata.xml:
diff --git a/sys-apps/kmod/kmod-7.ebuild b/sys-apps/kmod/kmod-7.ebuild
new file mode 100644
index 000000000000..f21204a3a972
--- /dev/null
+++ b/sys-apps/kmod/kmod-7.ebuild
@@ -0,0 +1,73 @@
+# 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-7.ebuild,v 1.1 2012/03/19 13:47:06 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"
+
+COMMON_DEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-util/gtk-doc )"
+
+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() {
+	local myconf
+	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+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 91a35b1bf84c..b6a2b4e9373c 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,16 +1,16 @@
 # 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.14 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.15 2012/03/19 13:47:06 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
+[[ ${PV} == "9999" ]] && vcs=git-2
+inherit ${vcs} autotools eutils toolchain-funcs
 unset vcs
 
-if [[ "${PV}" != "9999" ]] ; then
+if [[ ${PV} != "9999" ]] ; then
 	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
@@ -20,22 +20,20 @@ HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc debug lzma static-libs +tools zlib"
+IUSE="debug doc lzma static-libs +tools zlib"
 
 COMMON_DEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib )"
-
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	doc? ( dev-util/gtk-doc )"
-RDEPEND="${COMMON_DEPEND}"
 
-src_prepare()
-{
+src_prepare() {
 	if [ ! -e configure ]; then
 		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs ||  die "gtkdocize failed"
+			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
 		fi
@@ -45,30 +43,31 @@ src_prepare()
 	fi
 }
 
-src_configure()
-{
+src_configure() {
+	local myconf
+	[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+
 	econf \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_with lzma xz) \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
-		$(use_with zlib)
+		$(use_enable debug) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		${myconf}
 }
 
-src_install()
-{
+src_install() {
 	default
 
-	# we have a .pc file for people to use
-	find "${D}" -name libkmod.la -delete
+	find "${D}" -name libkmod.la -exec rm -f {} +
 
 	if use tools; then
-	dodir /bin
-dosym /usr/bin/kmod /bin/lsmod
+		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
+			dosym /usr/bin/kmod /sbin/${cmd}
 		done
 	fi
 }