Version bump; without the experimental python-kmod for now until the ebuild has been ported over to python-r1.eclass.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 161 insertions, 9 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 3635311c7059..af10fcb0fbc2 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.143 2014/04/08 09:08:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.144 2014/04/08 09:10:44 ssuominen Exp $
+
+*kmod-17 (08 Apr 2014)
+
+  08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> +kmod-17.ebuild:
+  Version bump; without the experimental python-kmod for now until the ebuild
+  has been ported over to python-r1.eclass.
 
   08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-9999.ebuild:
   Temporarily pass --disable-python until the ebuild has been ported over to
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 2881b495b906..be7862255ce8 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea1cb490e5d5c272125d30e3f04d SHA512 f26a75da8b0cfe861c60e6bdb66eec61be74038e1fa4ae45c4f8d19ea2b08e2b96683bc33e5b91945522c8dfc3af61bac094b31a1dda44965e378acf4ec4eb83 WHIRLPOOL 33e5bcb0658215005feb952dd0f42fb60242d1541d4e9ac5a76a34fba16b3638d48eeec17c1d9a98caff4d0f80e8fa9e37a2b0a2bbcfabbf9c25571460d8536d
 AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7fa8b7188b364689b0e SHA512 cddd4e95ffd112adedfb01c90ea3cea268236983f2dd88f0a83855d62dfa8a63e1f1457a9517ebbc45970455b8f8c0dc7f4d56c138bcc3d453c7ba61d189ff85 WHIRLPOOL 920e19b8d99ff77a337b0edf2fda3461249bdd253d1c6d14c1e872d931ef643679185e8bac6b7d58490dae640f78cc1a8492f627893bfee46b48fa2c4efc947b
 DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f
+DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095
 EBUILD kmod-16.ebuild 3791 SHA256 be36a499e17190ab608b19706978477063d3c6295700838d613504000014bf20 SHA512 a2a237b0f0c95852c64030bae807c9501da448f9c7a2858b1bbbbda5a347b2dbeb473d941f91a28ee7eb2083814f17fa6aefb9081038c771ff658c97d4195852 WHIRLPOOL d7dafcabc14d2195f61dced5724c1de14eaa57770af51c40e1daf1224c6e32dee995a2ba9f0be5185c1de91acf6e3eab83c2a82dc39e2216cd41e6d041623432
+EBUILD kmod-17.ebuild 3982 SHA256 08e4a184dc01577785105188af8fa28f31c4de39ab29c216ed22fd3095061f74 SHA512 82966e801f95d7e4609d764a95fce46c7fc9f2b7ee0724a47ac9cefb9c48d48f90a18e60b1446dea4508e299f3208d6badb80daa8770df8cacc07174c9538790 WHIRLPOOL 1ba7d5bc4b7f75d76acdd9e3be478d14168492007706dfddb9ef561645cf9e33e3b30502ae1755cc7d7d10ddf032979c6a5fd1fe128db1dd0803d3d11d305395
 EBUILD kmod-9999.ebuild 3985 SHA256 61d8d747be1f2bebe15cdfd079d2eba63ae21ea69e6ad51073a1f7f80e76e6f0 SHA512 09895549dfd07440233df72eb2d2aa5625ab2829736f06c94c63e3b69db7ca8c8ecf5c8ad10712694fa888dd753a9ad18e255271689398074d3c2bfcc46d944f WHIRLPOOL ff6cde3f650d64a6135a5c050077be11e6f40cd4c34e3e795c6f73f05c62410bf08733a629f8098c761e4f0c8d2f172e69eeb0dcc04abf71d00d8e2103f4ddc6
-MISC ChangeLog 20291 SHA256 0bd7776dcf75a238f88ac1d5cb3e0b68e199401ef281cb6355aff499e5c70a50 SHA512 15dbca80bdac8b9f136e6482a81be7123bd0e136dc8c211c0d8e3ee14845deb9863a0e5f09acdeec42a6e1431c26517c367bee02c6cfcc4736e0aa3b75cf1f49 WHIRLPOOL c9f7a7d05fa760651f10e2cb599f583d46143e9782b41cd6f7af6fc7b9843c22ef053386b20f97e4c2915fb1d8e27930b6291ea3312e1652d6174b9192297883
+MISC ChangeLog 20509 SHA256 a500b7ecaf847f9a516618b34edeac8e3ac1aea48daddfc46877537031f7d722 SHA512 dae95ec819ea42b22a4cdf3d80c4ba41d040fd933c5e082695a7ee2d3dd4dde4f2b44b2f20f4c355eb9b8c8f1ba1766e8400d9b608cf690596528a3dc6b29d7a WHIRLPOOL 0aae14390004f8472efae1c06e3fc4bf2148da0fd8398543f73b7d88620b7dcaad98fe72c6f3610bb53cd6f409abefd4daaf8cab6d1402814dda28db7c418c43
 MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQ7siAAoJEEdUh39IaPFNwRMH/1NTjdk2NT/LBDBuDYYKgOJR
-vpucLSATBqavEJ7VeW+sCdx0uZ4jHS5bkFidErjQjF5TTUQBhHyqMJtH3uXJTHpR
-nDVSmq6vRnN5GwNWLYR7avA1vK3OZEP00MSk9AdQ5GGQCADgHW8CxcUlx8m+VuIW
-kaKOJpWrzTEvcvpWLFrtup03a8uwqNAoAXWYd+qush8T2I4nmy2m2U8CqCc7rAsH
-iQcpyPjoH9naYqW05lTVdQCcZW+63HsYilzgaEx88RG1Es7uM/K4O05Zn1VbhGZI
-OXBOaED7kV/pryZVzR0qEyoePEBLN8q3BqHP/fd0+WKGhf0X3AoeGNkU7PSsDyQ=
-=RCpm
+iQEcBAEBCAAGBQJTQ7uuAAoJEEdUh39IaPFNYGwIAJII38haIyCwOAV87w77mFeE
+/FrK+cuPGIkQuCKeB5CkO2JA6PrKGEsybL633AsHiwpj0xkQ2EV6Rs2yJ3ni9r50
+i2PFkegItznMSAO48SKF5bKO/pt06UQZfXbx8ONUJGzs+xy59A4NaLAzpWiHzsJN
+WlYQMjcMXjq873fJIeQpDPss4qmpASeKVUqqaEyr8OqpYn1jGSeDRMgbRcyIYTpe
+SdyF+rrMECWobYgH6ExL2p9miogYLG+bgcHMIseq23HcsGQRFODF3obRzezLquUu
+/BIUjqYpkZ6xq9hgE/uwiH7lfL8Femhd/EgLk0b+8LwdcvIh2X+R5oloo3oPMa4=
+=95BR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild
new file mode 100644
index 000000000000..64c7a1c96bc2
--- /dev/null
+++ b/sys-apps/kmod/kmod-17.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.1 2014/04/08 09:10:44 ssuominen Exp $
+
+EAPI=5
+inherit bash-completion-r1 eutils multilib
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit autotools git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	inherit libtool
+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 +openrc 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 )
+	openrc? ( !<sys-apps/openrc-0.12 )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	zlib? ( virtual/pkgconfig )"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND}
+		dev-libs/libxslt"
+fi
+
+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
+		epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630
+		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() {
+	# TODO: --disable-python is only because the ebuild hasn't been ported over to
+	# python-r1.eclass yet
+	econf \
+		--bindir=/bin \
+		--with-rootlibdir="/$(get_libdir)" \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		--disable-python \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		default
+	else
+		# Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf
+		# wrt #494806
+		emake -j1
+	fi
+}
+
+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
+
+	use openrc && doinitd "${FILESDIR}"/kmod-static-nodes
+}
+
+pkg_postinst() {
+	if use openrc; then
+		if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+			ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+			rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes
+		fi
+
+		# Add kmod to the runlevel automatically if this is the first install of this package.
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
+				mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
+			fi
+			if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+				ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+			fi
+		fi
+
+		if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
+			if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+				ewarn
+				ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+				ewarn "kernel modules to have required static nodes!"
+				ewarn "Run this command:"
+				ewarn "\trc-update add kmod-static-nodes sysinit"
+			fi
+		fi
+	fi
+}