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.

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

4 files changed, 140 insertions, 25 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/Manifest b/sys-apps/kmod/Manifest
index 936f7a6e71af..3a4d81436ac6 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX kmod-13-errno_syscall.patch 795 SHA256 bc766470c0a0e53471395a8e6499f5bef7a4af5dfd52688cac17d30efb4b2605 SHA512 4bb3fcd824120d19bef2efaf19fcaab3a49089e0d7790899b322db480fe32533786d6b6a0ecd085ed00203bb87af4255c462a22997404a6b4fa431e2c4aeed58 WHIRLPOOL 5410867ec236e24d6075aeeadda8a81a43c9c3a4d02a3b330a0724bdecb3f837141eb6590331c43c5faf9e5cdb903aeaf35efe80f08c342bb14b12bcbbdfcffe
 DIST kmod-12.tar.xz 1275028 SHA256 c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f SHA512 f24bb25812b1902736f875bd3d7f995fa42a50cb7208b0d79a82fb5915223cf78e41018d5bc2cd1088acad5dc8e3dd737876262f4acde6479936c4e04223b629 WHIRLPOOL cde992a543945670992813ce142aa96bd94cc719f539b4734a7c2251b2918622e60a027531d5b430c872e58f28a153d3d2b4b90babe3e4b0f3c262afb09b7116
 DIST kmod-13.tar.xz 1435864 SHA256 6c36d3abba2f98c84973ae275951c866f8bf304e7356c2fe60633800239d7956 SHA512 6182a043c32944c2dc336101e4d8a9be9ccd0106677f9f7a2e76b83a09ec2fc1333aed9b82773abe09f8adb1771e796690f1610c64b337e21bdabffe76fed434 WHIRLPOOL 95196f4c65fec778727a9b8d0209dcb08e64280b4b5d6e88b5343acb3a360b62c13a0dcf510d3c2080fad4ef1562c5e9fa11f84979d0acee03dab3fac8b3eaac
+DIST kmod-14.tar.xz 1436872 SHA256 1f54abb63ba3642277ae1af3626c0896b102a915c4d8b9eb5005ae0afe6e7174 SHA512 ab5001b6ce6ea832acbb6a01ba2cc9d1fdb90667df456aa78ad137a35d5ee1580e0b2a36d34e472718c08d2ab3495fa47c638868b032cc90237910fb626bf7f7 WHIRLPOOL bc20d5b31d671a8c5908fba7d7da12f2903b489130fbd9381d3052760ddf85e0aaa73644536bc0be8efc15af847a7e5ea39f596110b6e5dca0731d6e3d40b733
 EBUILD kmod-12-r1.ebuild 2490 SHA256 d3039a640d7b84263286619dde372a812f71b6a865e68db62ab52a934d683cdc SHA512 cef09e483b21da2e2645d74d6e29f66e226d97c15139ce7736c5a8123aa764fed5f8f79efaaf786cdfbb8a9622c473ee3901163bd5f9e361eb85bb026a058b81 WHIRLPOOL 7abd4ec6a3a79ac0990c65560cf425a55cbe9fcda4e1c31f5eff7def4391bd746b4a76744f1d6c002339d5b75288f631a5873cd2296db93fe86971ff02929a3d
 EBUILD kmod-13-r1.ebuild 2505 SHA256 6cd75b3fdaecdc7b85e9ae6c3dae0c1f7bfc658633edbab39367246524038a66 SHA512 1569542b017531e5b3a4607ea7998a7f7559d2e2e980add7404d0a85dc172c3afc79ba5977b33b341600ff2d50ff9eca90b8be8df2bc4345d7b5e8a7c3feadc8 WHIRLPOOL be46b36ffc5580ef2836c4266316477646cc8910f5ebeb954fd1db418ed72d0e2ef5cc3c3b8f624654313e29d8b7c4d4f26fb595cd37da59bcca83b827b71c10
 EBUILD kmod-13.ebuild 2470 SHA256 4a686f137e62f9b5d3236b12d7b399462a83b78ce56641afdf64a6afdbf79231 SHA512 e728b081ee00d166a40d9405cb70288ec106e1b09273284d62f2646ecc50f44c438df60dda3a623c21f5579af51eb41b9a84c67ec7343916abb7ec06a0ff9619 WHIRLPOOL 2d312f7ae87141a187f12a171c0f795e49ad3429d2fddd4338d772898202b21861fa56b70a913d59934a288ad06ddd4746fed791cd888d7705fbe9e2acd03646
-EBUILD kmod-9999.ebuild 2493 SHA256 4ec19e99b8156855f0f322db471ed7159bc72e0eca9c3d6dc42fcb46e5bf3615 SHA512 c9c454054ce1a424330022614dea131d561d6adf72ead62d7921aff698432bb9da7c15ecb0e3f2b4651f4c6fa16d6514f7797bed9bf9a87a25f1d4de8ca9a958 WHIRLPOOL 4abdcb469bae63f3bf985d0ded47117f33314e920b59ef0d3ad4239d6ed3e6a2962462b3b914e6710fff28b35a9f281b6f33dda791746d4ed718a7170315bc93
-MISC ChangeLog 13637 SHA256 562753b90d21ce881c1b452098961767568e4a9f35b2b6c4dea18a912d977e90 SHA512 a7e536d52e5927f5cd7e687fb4a633c919d2cc3631fa8a6e0c5c2f069ab8f1b6212d7025572f8dc1bec9ace9a91e34966214bbf9310d3a1456cdaa1367633ca7 WHIRLPOOL 33950bf6c5eb107374c27ccbe7fcffcd7e1e72a143e81d6271bb9e6e2e6b1165c4891335b20eff6e7108166bd9c9f68506e714ce8bcdae5ac716814917b83596
+EBUILD kmod-14.ebuild 2653 SHA256 d736dfe5304e68edf4e9f38852f23d49dc02f1ea0524c0a7607802de52bc9573 SHA512 c0b41f0d5f3a5f78032e4e3d6cfe9955ec8b28f964f942c4d6af981af3262592827f3f8a8286d66db614a1f9b881070b710849b608c7cbbe6147b4d5c3899b7b WHIRLPOOL 412e5e960c7e09334870ec0d1faf6d4773e9ddc4caba297422b8744ed5f3272e096eeedb2d466e4bd7cfbe5f347fd831de323474c7ecee1408f0c3cd621362c4
+EBUILD kmod-9999.ebuild 2656 SHA256 d054e1b4797341134cd7c75a169d72cfb53988e031d204dd4e42aa0fd30691ad SHA512 334cff3ed53be17ad4669cad0b3036e0cd2258db6140e39ea75c926fdfc29c9f1f78795ffd0648322148a2cb4df7b1a99689400e918af00c5f70d98bdecb89f3 WHIRLPOOL dff45e6d236be295e8f08e89487a3ae6f54804cc97de274d7d8b590e1466d3e97ca6b6ecfbddd9653564f82b70bff0fd49a2a55b934b0ad5883813ae1f630f24
+MISC ChangeLog 13922 SHA256 5855cd2f5f4b8bb777a8befa7e928b2e2d9428386cceafacfaace5193c9cf605 SHA512 f0eaec53f0a99359e82bd22454921fa152cf4e532bd9f6df7c9ceb377e6359d219f3bb736e4c0b028a904ff39d04e7ddf63782d69985d2ff3a572f3ecab5c304 WHIRLPOOL b900c49e72d20c1b69a8cab41f1e5ef7ae131a5790fb62ec99828649c60fc993e944c80212e0c7ea8376c63d2fb92e10190c90267bcce59723f4c3f2888e3bac
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0HLSAAoJELp701BxlEWfFysP/iyMjwLwDGVB7Yg/bLWlpzZp
-tamUTL7r59J7Qow2D9WRzMuTbUASzSoTt3dqSm0+aqZKZPvJE+8nZKi19cQz3mpd
-oeSF1t5x/KpOOSDDlsjlnjpJKQHEcQe1UXVeAbyw0BaRR3uYVtdQ2sbWOrTDPluZ
-xMKILOFnPQ3LQ807Nb44rYYCyADQmDHRaklfFYqTjMSFQaNLLKBBFzOuEz4EacxO
-WXm9d+OkS8Nz3RjZUfYuVzZS1I+IJ1E1laTwqkKr40uvr7rgcl4hHLyPCnv4oEzi
-D6MmpZ8GRAj5xuEs3TrOeIB/nF42ZoY9w4SOTMqv8OGC9uhDheK12Z9NPxUsmGoV
-WiJjXNQrVdzYNPNAIAR4MAGdw2lHmqdalvNjiIpjsUW70+X6fT9xLcj2zOZpDLPd
-EJPycaJDWiYHvg39WPTGNufT08kDKUooeTroZNtNpoeAI2Ri1/LPUKAvPBdYW6wt
-ERZZ5Vcn7QtwxUBtAVBF1bT5oMDoIo0eBK9EBOqsmPKmcs5Khxttp1Lgf7RTLkZJ
-EHZY4d3iJx+7ZxzcEYlTNg7awRObNo0KZD8zLU2CRfh92H69K//qu3BCf/dMNcUT
-bJWe43eMTCIqSkzYdeocjt2kWR9KedG16502W94QxQ29R3P+d929RxxOC7itZvCq
-RXvJ5yo5iNhsPnIiOKkq
-=Rd+h
+iQEcBAEBCAAGBQJR1aqqAAoJEEdUh39IaPFN62oH/0o9OkjTu3OyUClAOlTgf0/G
+UCiTmfV6V33XhY9L0Z6ByU8j2jdu3+hxDDWwc3LSxQsRg4MKtmYTd4V8hfIKoRYc
+TRfy6PA2DgViZ5uI8w74SkTGwIx44aFWzhYGeNe64sGpiio2O7TRLVPRpN0iHRUd
+seFmS+r+T8pPzgt0UfgKYJxeHngNGjzuUNlk0wrljnODORMf91gWZywIj/5/llNa
+LmK2H9jATKheGkGiJuVeyhcjT162KOa4CAsKf/OHVrHsjhDrJobKcJky3l6zID/2
+GmG6aLSDQXMk0UlquKpdRpKAFuqdJHgyC82LvmIqkChbDA/mdSFI+C0wytzQlj0=
+=kbjH
 -----END PGP SIGNATURE-----
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