Fix bash-completion directory by using bash-completion-r1.eclass. Temporarily run non-9999 ebuilds as -j1 because of the -15-dynamic-kmod.patch wrt #494806

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

4 files changed, 44 insertions, 13 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index a74c6874c57e..e7d904c999bf 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.127 2014/02/02 20:01:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.128 2014/02/05 09:46:31 ssuominen Exp $
+
+  05 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-16.ebuild,
+  kmod-9999.ebuild:
+  Fix bash-completion directory by using bash-completion-r1.eclass. Temporarily
+  run non-9999 ebuilds as -j1 because of the -15-dynamic-kmod.patch wrt #494806
 
   02 Feb 2014; Jeroen Roovers <jer@gentoo.org> kmod-16.ebuild:
   Stable for HPPA (bug #500106).
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 88892d24ea95..c18530fdc5b4 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -10,14 +10,18 @@ DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986
 EBUILD kmod-13-r1.ebuild 2214 SHA256 1c49c3d05418621483f8392448f8f5c2353c6bcee5f96a018f033142557b2db2 SHA512 3f61eb1cb9673da22eb4b0edf195d1cf3c18b4dfcac13f714947ba573821f4c38e4c5fc0854fa255055618b6cb8d750bfb6977347207f5d7bb1dd9906ff09537 WHIRLPOOL ce977f64d4eaa6e4d1440c43734d6c29117c74142c1b19b0163248dd3a26dc39130525ec90014653c173d1ae35a902f507e74223b9df2801ac699d75d8ca16ab
 EBUILD kmod-15-r1.ebuild 3631 SHA256 3ac06ad8aa645b819700c78075fb50f31edbccb32c2c74f8e0513c3c15c5872c SHA512 34d30771d711b1bb108cf372c97d84c7998630cb339a59484f44f5bf19cdf9d243453a86658bd7ef25279e842317ac780c5a920cf6987f15ff5eaa11d7f1e172 WHIRLPOOL e78c167b3c27dccb45498f5481f3b3126535d5359f63bb3def5e42bfe352cd4f48c83314a3b415800c8dfe78e5a5d55d4551b1debeefa553ecca2ee20ba001ca
 EBUILD kmod-15.ebuild 3608 SHA256 e0d266b7b7c2e87888691801d5145f280a3d63900774432ba09f506eb4c1bf57 SHA512 f961deb2b834222e2352a4f5728aca7eabc0ddadf45802eadc2a16e00c0d0c2152f0c8b5d790356792ea094dfb1602e964b477606ef6ceeebea940db92d6cbbc WHIRLPOOL 4b05c77d5807fa12680ef97c64521e01bbbda06cfd7990b905e5df3724884c31fc213f1688c000d2c9242f6bda067bbf9f24b74acf7a776f0bc87b7bc689cc00
-EBUILD kmod-16.ebuild 3453 SHA256 d4acfc4ed08dce9191cc9a0d083e50d251ba285245c5b4f8797d9ee301e37965 SHA512 1404a83df76430228bad24f33e766bd8a36a19a5eced0d6942378a4c1fccf9ced44e1d0cef4c4205d3906d290baf7fcab9a37a5e604339137f64a82a51f933ed WHIRLPOOL 65273bf7c1e187358ef24458df07e2b95366bd06b871e37cd9c9650dfeb23f182c033e3d7591e5e5742133bd1a83dff3a991710b73cb7388e3c0baa0f2cde405
-EBUILD kmod-9999.ebuild 3460 SHA256 85638888841a755da843570bad21607f8062988f3616a5accc650c7d07cfc628 SHA512 f576e882ea9175c9d2aa62ea1b4daaf68b1eabb411d32250889ec1483d916cd7c11240dc36aa132d083b7ecb308b5e8431f462ec38be0f6d272c4ea9cdf628bb WHIRLPOOL 3d89fc9cff8e38e497a4f87050f3cb70ff3554e343eaca1f3de1a3e5ec9f72f132ff799b7c4f7b90614e0d68e404fc91efc676919e318813583c7615fd3b7030
-MISC ChangeLog 18298 SHA256 8259d525facffb929a747a13a6289062efe6e1c5e04de4d25d1593b46be7e1ce SHA512 b1d9652c89ebccb4f0649281d2855727a5604fa44ad3e0394695393c2522e8871566c43a59dd3a7ec04f4862e5369a2f2b1d2ed096961bb938115ca46c96715e WHIRLPOOL 3c437dfea45be3277689afe9d5c7861ec1ae41d656697fecff75b2ec35bc9ecafb36d345e65795d447f8cc21e476d45eb000926ad64937b9019dcdbf1a510bdb
+EBUILD kmod-16.ebuild 3712 SHA256 1a5da22e04cbda76656e87b6ba32ab59c906386bc503d2381d9d80a5edccd571 SHA512 6cafeea955c00747a293878e8361e28c305a0da7b01763be5db761b8e8ae8b60a4a340a080c12dcdf77614577147a554b394557be9327a10e14a4f868fca9046 WHIRLPOOL dc3ed3ecf0363fb889d4e5ad24fc8dfc7676ab4b912c3d41bfa3886bfbc8da7efdcdbe8dfb69659472a94491ac626b5c46e2126dd73c2483719ab02992ddd17c
+EBUILD kmod-9999.ebuild 3716 SHA256 59eb45aceb90d19c05b227d7729a58505aff76774d2f5dac9f21e9cb66fbff62 SHA512 79c2ad675c43d6cf8e8f73cb37a0c6bb83db9b1c5ebb1118d48da7ff2fd1cb0cc5ba6daa0ef08586fdb81abd5ab3a61679011c4b8b2636393c0219a41f2483d0 WHIRLPOOL 5a7bf9a65ea6063df152a7670c82488a38dee616ad7ae9b62b80071dfd5e6b4b4aea7b77fd07f3fafe965dbbbf9a959f0ba5da735d32cf276df0489e97e8921f
+MISC ChangeLog 18555 SHA256 4bd5c793593a84848a6bcb05d7389c20e87368b519a60e0ed9af6850908d230b SHA512 a2d1c8a2d3be953f7b8ed7a86311469beaa755fa04d378f8d47c267fca626ac18e43784a3bffd8efb5f45fbbf4c9d722db867df278e74515eee2529851fd3490 WHIRLPOOL d8662cece6178f6043a0f79c484b8f23b9362fe44c2329289bfaab73c819092610ee4da95db8b73ed5af3c4e9e361fe3502618887957c993eaf59204ba753ada
 MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLupC8ACgkQVWmRsqeSphPYfwCfXb5nuGL/zveJA+nF0hwXW3rH
-ZhoAn3pcLcuxeq7hJ/E2qGiSEDIBq5IE
-=NzqD
+iQEcBAEBCAAGBQJS8ghKAAoJEEdUh39IaPFNLZwIAJVeAE7lxm4y0Wr1I3kvYbaa
+/gblc4p3uXYXon2f4g+LME/yanTGrZNz4GNpQEdtDYvuEP+jGbcwh4ARQF7ZgpLj
+0nwy5XExKZN9aMkEuOq7EhCm33CDeZHo0oiRRIm5nf7KlOF3QqXfLscsd7z6K2fY
+HXzRXHfMNL3v+LFdr+AuJP21JKiIdPTz4j0KmH2jY5Tdn9jtArBo1v/gSZqB+IVW
+0f2rpRJuczu5NEloMJ5BshfvEnfGMnNfMhiYL+wgXr/GlDr90HvOp7pXD3/YFWyG
+48JXNinrJi9qagKe8HRBBE6jW1gVIdGxXiM9R9irak5GP0qwehvJnK0Z5PX/k4M=
+=dmb6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild
index 4a70792e651b..285aaba19a15 100644
--- a/sys-apps/kmod/kmod-16.ebuild
+++ b/sys-apps/kmod/kmod-16.ebuild
@@ -1,9 +1,9 @@
 # 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-16.ebuild,v 1.3 2014/02/02 20:01:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.4 2014/02/05 09:46:31 ssuominen Exp $
 
 EAPI=5
-inherit eutils multilib
+inherit bash-completion-r1 eutils multilib
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -67,7 +67,18 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_with lzma xz) \
-		$(use_with zlib)
+		$(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() {
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 2cb8c2cbafe5..b03870d217d6 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,9 +1,9 @@
 # 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-9999.ebuild,v 1.67 2014/01/18 04:33:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.68 2014/02/05 09:46:31 ssuominen Exp $
 
 EAPI=5
-inherit eutils multilib
+inherit bash-completion-r1 eutils multilib
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -67,7 +67,18 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_with lzma xz) \
-		$(use_with zlib)
+		$(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() {