Use --with-rootlibdir= instead of gen_usr_ldscript wrt #443710 by William Hubbs

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

4 files changed, 109 insertions, 10 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 0cd7de440008..8e88aae7f754 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.59 2012/11/25 08:29:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.60 2012/11/25 09:42:58 ssuominen Exp $
+
+*kmod-11-r3 (25 Nov 2012)
+
+  25 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-11-r3.ebuild,
+  kmod-9999.ebuild:
+  Use --with-rootlibdir= instead of gen_usr_ldscript wrt #443710 by William
+  Hubbs
 
   24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/kmod-8-gc-sections.patch, -kmod-10-r2.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 67f99d065097..185385d4ca13 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,13 +4,18 @@ Hash: SHA256
 DIST kmod-11.tar.xz 1274992 SHA256 28604e153833571ff6ebf34ad1722d3aca4d3d1760ad069a1f06d8fe5efd1de9 SHA512 c10e42317858c3fd5f2daa7fb77919f362cd7b6b2413198e332a1da1351a3211143090e5021be4324f5f7e7cccf5e0cdea5872ebbfe57fba517d4945ada99c8d WHIRLPOOL 57168d58f40e3782a9773beeb37926d40522525f18b7ee3003cfdacd3fd2da91701eeef414b529334bde429dbcb9f4c02d555d17cef1c50d780c83531a9a25c8
 EBUILD kmod-11-r1.ebuild 2158 SHA256 ffa70230e93f5749cb846c2630ac7bef66fc8f50717c1c1bf2985e3de0679ee6 SHA512 53cffc56408e707cac0239e311b0ec6e90bac1851fdfb21bfc12c5626041541e14eae505172b17bb8d2caff8e0e8f4ff8d8036d69519d98b2b4be7502141a98c WHIRLPOOL 7507f630d1f0f27b0c8f39a5cabc876acd82d1fb08ea799a1e09bbefa7d290934369a4d73006ed6d452d5c5e19b060be58dc175340fcf2118feda9861b9a5cb4
 EBUILD kmod-11-r2.ebuild 2063 SHA256 0d5fcd06d9c494d20b32f2689e28f69141c4fe0a64f23e4b18d84039150cdede SHA512 b3189420cd6758bcfa460aa48c75a18a45df32c59d6f5b034dad17610c7636a26da07f31ede80bc247f5ca59315be5c0cb79a9aea47a2d99e30dd7fa8b14ea6e WHIRLPOOL ab3a4f18f88ef3f23aa45f02b0db5e0ce376e94eb551b0c147c311c55ade5d185be38d1b60f58949d316bc34dd6b778ebab36c496fc4ef0d658a26c2522a4a86
-EBUILD kmod-9999.ebuild 2063 SHA256 bde5484a249576380f6df53ae696211f372ede0b492012d69b1fc1a03516e6fb SHA512 960c266db976b41dc83c6e5904ae965f970bd6463df360191ddd1b3989bfb7eab0c64b727c108b6086b7c6e66e9b3c90792b79711352e8281226d606e15a2910 WHIRLPOOL 4f1b08a89533b14000f4cd293f47c99c672ddc06acee73a2b0560b355878aa56618d972bd5b1cecd9dadf99e8245ac5400cad1c36b2fe34144f2f901a161a8f2
-MISC ChangeLog 8614 SHA256 73e1b6a9f1db227ba73f5acb98d3972ae93ac79c89f2b5c3c6a0bcb49a38ddff SHA512 0229ddd659dfb7f627ffc996d7fd7399f95fba2d2c36e7a1c31f356f7a1d648c094fc246aa78a8cc5882ba2a28577f808916da877ef9c43f869063ff77d6f664 WHIRLPOOL 5ba7bf70fd731ae0bbc9d6dc2dc9226c55fae6ae8844de02a2c84233aeaa7887dc5c13e411aba5a1bb6e38ff5f5a3c1364ba84d1eb2704c90b7a87bfdfebac92
+EBUILD kmod-11-r3.ebuild 2067 SHA256 6957c0ec971a780ed4865ce5d98f579f1b767f9c3d6d5de95dc9937fdd980ab9 SHA512 aff872230345db9d596dda6b70fa296fcc8cf3ad9d09877a0d8f316f1601c021e9ed92d6d8fc945901b768eb74f017b8b3d6dabba25a85545079f15cb43a1097 WHIRLPOOL 4705b53dec3421513c7d8511c2f60d731680d97ca2703e89c820eda2f6391f4ac1b3e4e42bc02de7dc592a4759a87e9378de1b479bfe16ce9935359ca18572da
+EBUILD kmod-9999.ebuild 2067 SHA256 38e45fc358127f2c5a909d0d9f7b409a2635cda56be8f9bc760c8f859ddcc665 SHA512 6bf99e6fe3fa9c1604d45ef39eb71e326a5c2165e59d57c6cf079501cd48a88e712643901baa24b8cb5443aa3abf10e934a2ba06713ec5a474616e1ff7137b9b WHIRLPOOL 2d5cd1ff22462469e237f3a51005948d915c2f501fa35a7e86b17298de3641bcd91d86a8851f20a74165cd0c2dbfca74b1246a040cd77508505a95ef86a1f575
+MISC ChangeLog 8822 SHA256 ff9311eb91705d558fae42d44ae729330f0b24457b4e08c9a8f9495fafeeaf5b SHA512 542926373ab36350a768172c895e3d26ab72f58c3703717e6d2bf684be84b8f40e8ad728d12959f4452b6e8251b27b6e6cb4af4b9f3ed1e61bd90e96c908a21e WHIRLPOOL 7e4af2a0973eb6847f21c2d9ad38bec4d23fc09fcee74a839f6c734126c4d67a6c4652bfe2f5b2c07d5ca87535c7438c9b4095c9f24def9432952bded22fdd5f
 MISC metadata.xml 316 SHA256 f979caea5d423e7941d00ffe03b8c5a56a3f728e36492410541224e4bf33b6b2 SHA512 fdd742292a4e051bf8f57a0a8b94880824424775611ae97c97368368d6b55b15ce96dcbae0b50d43cfe438f2d083821a102524a3ed469f3d03a4d67633e14814 WHIRLPOOL a74bc7356ba96ab765c7acb24ccb33e4d3d5f58c48db18c13f684fa29aa7e633d95e5ad2fa8b8c296229196c03fc2d8e94e83a47013d6a756b3d845d2e97a4bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCx1vwACgkQC77qH+pIQ6R6cQEAl8uCYpjr6m5lX/TdsZ4GsZVn
-BUzFFG019SKc43SeGuMA/3gCaiJ2m7b0YaOTaKky0pwA3qdPISaUlURami4etp5M
-=nKct
+iQEcBAEBCAAGBQJQsef9AAoJEEdUh39IaPFN86gIAKKle1eCfKEjzbBlPYa6rXj/
+Es6wq9VnxASsf2nGdAloZtemj85Xgjv2BbXr1tDSaa9DslS5/xog8erqlWyLDO/C
+zIt7vK1g27rV0GO0zdAOJt/nwRcX3KFAO1bHHsvOzS1ihNQbRK+yCXw2H1YMJTSl
+4pODyOfsLFh1h4t71JMWhneiE9obN97gbsqe9u7mXEQi2P2x211cbiWjp4G0t0BG
+Y7d+BFsclf8aThD/Ks2JCGT08IncU0R8er/YENKayX7yh25XWdnwjT2Y4IsoEKAn
+HySDD34pYPrD62rdXCMwUb8Bx+LydcslO2eT4/kmzI9eYv74Nn7wr9KxdnUcusI=
+=zY1T
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-11-r3.ebuild b/sys-apps/kmod/kmod-11-r3.ebuild
new file mode 100644
index 000000000000..4d92fa5c56b1
--- /dev/null
+++ b/sys-apps/kmod/kmod-11-r3.ebuild
@@ -0,0 +1,87 @@
+# 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-11-r3.ebuild,v 1.1 2012/11/25 09:42:58 ssuominen Exp $
+
+EAPI=4
+
+inherit autotools eutils libtool multilib
+
+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 )"
+
+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()
+{
+	econf \
+		--bindir=/sbin \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib) \
+		--with-rootlibdir=/$(get_libdir)
+}
+
+src_install()
+{
+	default
+	prune_libtool_files
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod modinfo modprobe rmmod; do
+			dosym kmod /sbin/${cmd}
+		done
+		dosym /sbin/kmod /bin/lsmod
+	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
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 66068e1fbe06..fc5764446f72 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.39 2012/11/24 20:47:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.40 2012/11/25 09:42:58 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools eutils libtool toolchain-funcs
+inherit autotools eutils libtool multilib
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -60,14 +60,14 @@ src_configure()
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_with lzma xz) \
-		$(use_with zlib)
+		$(use_with zlib) \
+		--with-rootlibdir=/$(get_libdir)
 }
 
 src_install()
 {
 	default
 	prune_libtool_files
-	gen_usr_ldscript -a kmod
 
 	if use tools; then
 		local cmd