Version bump.

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

3 files changed, 211 insertions, 15 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 899635b6d054..109180328d10 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # 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.156 2014/06/06 16:11:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.157 2014/06/22 08:01:45 ssuominen Exp $
+
+*kmod-18 (22 Jun 2014)
+
+  22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +kmod-18.ebuild:
+  Version bump.
 
   06 Jun 2014; Mike Frysinger <vapier@gentoo.org> kmod-17.ebuild:
   Mark arm64/ia64/m68k/s390/sh stable.
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 91a27c30d49c..f082500ac9c9 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -5,25 +5,21 @@ AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea
 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
+DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e SHA512 6704f52f1b69837f06516237fb61d3f29551b06e59f270561993e0318c104bdc0140a32d3fc9bda859d0918412ea2c40effa0ceeccbda5e1cb79a204d7219847 WHIRLPOOL d8e022cdbf19cef8dac46f70d49dcb0b9812e6b263bf40628a082de3696793fe591cc402b12773b43a86b3514910c292aebb7b8fc8954c796ac9679e65f43b98
 EBUILD kmod-16.ebuild 3710 SHA256 54a9acb449fa1a3e1c6205c86c25b5ca731d6f60831f57f6cddb9f9f50183ae4 SHA512 af07adaafe88489047b296cd97c345260f5776f34742c89bfef9f372d62ae1a87973a5fcc3237577a9b70265249020b2b6be5a5c308a7c158576402fb4ad228f WHIRLPOOL b93f5d9bbd94013ed7db8cae2b514c573aea7e29110184e6ea57c5f1ac177bee10b95c55615c312ca7e455c93f1c552757ace616f5ec33280b33a3b38101319e
 EBUILD kmod-17.ebuild 5081 SHA256 0e3a66e7aab7a8f34e5264d811670c5dfb6b7d9b87cbba7900b274f094889b06 SHA512 d6f55abecca775bc8c634a1d6acc5ea5d29eb926c2f3d7c99b73890c83ab84fba3dbe071e3170201e3a38480d058cdd91d5745f4f7f9a349754842db27a788ab WHIRLPOOL 378c12213080f916b61af6bba70bdf0897bce9cb38ca7a76773d9e9acac1f9407b330d8b066efad98b7cdd210bdb8b1d9c0f7b5306b3a9c490bd4bb5fb31edd0
+EBUILD kmod-18.ebuild 5092 SHA256 309445ef64199998eecc220f305c20bca5f86f65959fe456c5e19b77fb970a09 SHA512 1b6912c36c8264ad8b4b20de23b0925a72da807c308921451d1724dad9aa4c25028ded986cb3b81d8f37a63701ed6d41aa58d3b3959c324b2b8c613e37910052 WHIRLPOOL cacef26447716d24a1049cfc9db93bf35e812bde2f1bb4927b64211cb4fdef3cc12d2e24c1ae17af3ce9df82cc2f3ea9a92f8544725c1d0a0269771defd1a9d6
 EBUILD kmod-9999.ebuild 5056 SHA256 3da9b18a3d1b034c3cc21cac91bc008dd6904f742a65a8958e19a7c31ab9af88 SHA512 bf63989a683f198aac09a69e7e4af5e927a245be50d10e576aab57202dd4f611662e31363e02110dc41ebaeddd88fb4e14eb596a039cf11501841bf83333daef WHIRLPOOL 5a33bfff7819de4a5452b0b860bbe7132897f2a870b08058cf4e5c2a6dda1c289508ab5ea3fab205b2a53451d96acb29e5d2c7f2d4a83969776907eb8b8216bd
-MISC ChangeLog 22295 SHA256 8f3b3e136f753da75f28b2bc7a7bb63784ffc2f4f9675e41fdafa890d41ca9ba SHA512 e2223fc8d8b2eb917d4e659090b4841f2b5bcbec472e3e16f75e50bcafb51e45a79cd8d6103014fadf3e9cd7943633a29868b1cec808b110fa00642868390e43 WHIRLPOOL 1a28ada5f7cb594eda908903fc7866af682e09b9260b350a7ea4ff9f9aaa7f199e54a3d67708702459e2f207014b94ef75ceebaec209344b70e8dce9a251e3b3
+MISC ChangeLog 22410 SHA256 06e16278f7820a91da7cd5003e4441b18e455b69691bf4bb3885aebd9e8513d4 SHA512 22fee5993e7990aa3d66dba68c407fc5c0e2396fe6ad068a5adf709722411bf707d2ad7d0527124b79f1b878d7726f8e5cbc7812c6fefb3123a32727f0d9de12 WHIRLPOOL bf4dd17b5e03d5e634903b9b1ca47e3195331276a25f77cdd20930a6096a9795c363d443d1853f7d7588f2ae46a7d4e4ad09a2e02c9b87640f8dd170de5e79ee
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTkehHAAoJEPGu1DbS6WIA2SgP/3s+VCyD7fs0JbszBi3QapKi
-YHBi8MFlq7hEqT3BdNUSzhID8UMbW31acOdAqaUW4a0vEVzod8pEUisE6QmqhUCA
-uqMg9DHTYOS/H+E8HJf9WMqgLP2+QrlpGA7m1WGbbc/aNbe5bVXQLoRGmgSv4pPp
-W3cNiiPNsQT8dTETDp+MAUIs3Sg7SRzz0B7IhgPhLWctWqf8XdBQKAzpFtrEhDRh
-cgaaiNZ57lbM8AkqHclba78Qcb0qHPgDWcT7SNR7KCvAv9iIVP3gEGZvcVv52hQs
-cE8pVJkfZActawTvbd4AUs66PaZADEMGoUDGPWJVX7qhXPOPG5/8y/Pwllanzszm
-7w+4Z7mVhf8Rk39KcH7+LiGMOMv3NYV8NFP1SJRng+cQz4uzY1xksywYFPs53dcU
-48s9CmSfRvBMuO9vZrsmrXYnwxxovyaC0JDV2pAeKl99Y8lUpnhjwk6j677NWIAt
-VHRs2G1G7wgFFeEjbgFivTT3CAOnb5aWqCPoEWSNyO6IjSVspLlwXw2oDWUeuUvz
-12Bso468q/5ae7J5eusIQy1Z9IzEGxuTqsyBJg5klJfFzqYjMM8Mld48dSBBlotv
-qrR2IpgwyMPbVM0ESL9KeKDaV5VMItNma04k3r5p7lweeE1eikGPDEjolGp9hVHk
-wO3dYGzx6mcyVHBAp9Eu
-=RyHh
+iQEcBAEBCAAGBQJTpoyXAAoJEEdUh39IaPFNFBwH/2O79wLpimH2mUw1ZaPPDdPf
+roVZHpzzyfjeHIuIKpsmi5cxObaUcPv/02ygsqv+HR38EHCfTL+6dXTIBhyWiWWD
+vjGfEE+jf/Y9n0z+6pIipTd+nJByd1pbVWiQs5n8hThoVBHlE6W91m/hRnk9WzoF
+TggGInmiivKxaQ9wPaArE5FivOGBuFLLNXujnhfJuYYWpUaZi5jVBLTDt0rc2OaT
+SVM7LmaGB1Qltyx7MZKIon1yr2J33Or5yFkjAETSpuaPA5wtoECeNIoVF8sLos2B
+AuECKLCsFtYxp/H6JNc2KocOMsv65Ug2Yjkg0RElwzGRoR9wG+ZBo1oYlLuQ7KI=
+=a2or
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-18.ebuild b/sys-apps/kmod/kmod-18.ebuild
new file mode 100644
index 000000000000..86ce8f0800ad
--- /dev/null
+++ b/sys-apps/kmod/kmod-18.ebuild
@@ -0,0 +1,195 @@
+# 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-18.ebuild,v 1.1 2014/06/22 08:01:45 ssuominen Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit bash-completion-r1 eutils multilib python-r1
+
+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 python 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
+	!<sys-apps/openrc-0.12
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+		)
+	zlib? ( virtual/pkgconfig )"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS="NEWS README TODO"
+
+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() {
+	local myeconfargs=(
+		--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)
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_parallel_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	if [[ ${PV} != 9999* ]]; then
+		# Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf
+		# wrt #494806
+		local MAKEOPTS="${MAKEOPTS} -j1"
+	fi
+
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	einstalldocs
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	prune_libtool_files --modules
+
+	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
+
+	doinitd "${FILESDIR}"/kmod-static-nodes
+}
+
+pkg_postinst() {
+	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
+}