Revert upstream commit that discontinued support for --enable-static in order to get libkmod.a back for USE=static in sys-fs/udev wrt #472608. Version bump.

(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 128 insertions, 9 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index f3361b6240bf..acf89aa8f9d0 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.95 2013/06/30 18:05:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.96 2013/07/04 17:03:31 ssuominen Exp $
+
+*kmod-14 (04 Jul 2013)
+
+  04 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> +kmod-14.ebuild,
+  kmod-9999.ebuild:
+  Revert upstream commit that discontinued support for --enable-static in order
+  to get libkmod.a back for USE=static in sys-fs/udev wrt #472608. Version
+  bump.
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> kmod-13-r1.ebuild:
   Stable for s390, wrt bug #470580
diff --git a/sys-apps/kmod/kmod-14.ebuild b/sys-apps/kmod/kmod-14.ebuild
new file mode 100644
index 000000000000..45a7c8a26f88
--- /dev/null
+++ b/sys-apps/kmod/kmod-14.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14.ebuild,v 1.1 2013/07/04 17:03:31 ssuominen Exp $
+
+EAPI=5
+
+VIRTUAL_MODUTILS=1
+
+inherit autotools eutils libtool multilib linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-2
+else
+	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.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma static-libs +tools zlib"
+
+# 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"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	zlib? ( virtual/pkgconfig )"
+
+pkg_setup() {
+	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
+	linux-info_pkg_setup
+}
+
+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
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--with-rootlibdir=/$(get_libdir) \
+		--enable-shared \
+		$(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
+	prune_libtool_files
+
+	if use tools; then
+		local bincmd sbincmd
+		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym /bin/kmod /sbin/${sbincmd}
+		done
+
+		# These are also usable as normal user
+		for bincmd in lsmod modinfo; do
+			dosym kmod /bin/${bincmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+}
+
+pkg_postinst() {
+	# Upgrade path from sys-apps/module-init-tools
+	if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			update_depmod
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 9bfb4640529c..1ed034145337 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.55 2013/06/14 21:59:30 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.56 2013/07/04 17:03:31 ssuominen Exp $
 
 EAPI=5
 
@@ -41,12 +41,10 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
-
 	linux-info_pkg_setup
 }
 
-src_prepare()
-{
+src_prepare() {
 	if [ ! -e configure ]; then
 		if use doc; then
 			gtkdocize --copy --docdir libkmod/docs || die
@@ -57,10 +55,14 @@ src_prepare()
 	else
 		elibtoolize
 	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
 }
 
-src_configure()
-{
+src_configure() {
 	econf \
 		--bindir=/bin \
 		--with-rootlibdir=/$(get_libdir) \
@@ -73,8 +75,7 @@ src_configure()
 		$(use_with zlib)
 }
 
-src_install()
-{
+src_install() {
 	default
 	prune_libtool_files