adjust the openrc blocker to !<0.13.8, restore amd64 stable and sync the live ebuild.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

4 files changed, 19 insertions, 14 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index d4f42cbbfc9b..9864e47b9dce 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.181 2015/01/18 18:34:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.182 2015/01/18 18:45:46 williamh Exp $
+
+  18 Jan 2015; William Hubbs <williamh@gentoo.org> kmod-19.ebuild,
+  kmod-9999.ebuild:
+  adjust the openrc blocker to !<0.13.8, restore amd64 stable and sync the live
+  ebuild.
 
   18 Jan 2015; Mike Gilbert <floppym@gentoo.org> kmod-18-r2.ebuild,
   kmod-19.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 721194235c76..54eef52dff6c 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -8,14 +8,14 @@ DIST kmod-18.tar.xz 1473904 SHA256 e16e57272b54acb219c465b334715cfdddb5d97ff5d89
 DIST kmod-19.tar.xz 1473916 SHA256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 SHA512 317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee WHIRLPOOL a2aec8057cbc7776b71cea5c70fcec90fa20f09d2195f532f03085df2e85ae6dfbba50450a1b33425fd17caa01b997e052ec4676e0ed9c6afd7555b53aa8c589
 EBUILD kmod-18-r1.ebuild 5239 SHA256 bb154ec79a7dd1517c0ac71fc029e9cfac3e7040f3a2eec1ed1fc2351f2a07cd SHA512 219df6833bac123add666502fc962401d79567b115675d8faba37a1955e0ce286f2b12640c99631b504d562c471a91f96a95e79067b3f26f9a3bf71c230c2c33 WHIRLPOOL 83077d86079416d806128b62b42e3c35b2ae0f0b11a94d5979290b130043150a750d30d5bc154daf60a4898bd748a84917a4d42fdaf5f4896def4729e5d94e3c
 EBUILD kmod-18-r2.ebuild 5349 SHA256 4236e7a3b0f1dcc3c47053345e9f0b0ff201bda13a8394d33cc07749f08a4f0f SHA512 3591b376c551229e635177c367f98fa26e97ba46f80ed31d954cb2a2691d012b71a6d06c3a3834ba7a39891b8161ec7c5cb4979753dc2863bf6c48ef960798e0 WHIRLPOOL 0f808f4d8f9169cb861d7a7173abddfebfbf2908e74442c2a52e6fa972fe6b49b0932bccbeb5ed54f36ce79abfa1c9d24818ce1469aec5d3ec9b7cd94edee6e7
-EBUILD kmod-19.ebuild 5026 SHA256 4691f6bb04b9a6523b975cc15b7e1081121a37cc3584e7635ac25884d1e0fc48 SHA512 ed3171d32f93355a984e430f74f6cc6397b7e6f44052a287f9567771088d486829a1c3396e57d2cc092dc066795b98c650f41f03a5613d3c9124888c4c7c279a WHIRLPOOL 31dcaee48ac75c0f74a56d7508e40f6c788bf0759cd7e50f899e38db306e262ec198ec50bba54e948aad32ccc14f0f727370fc835c3428ce46f0c9d6f4736c76
-EBUILD kmod-9999.ebuild 5028 SHA256 af441c32eb90f12631c128db8de64fbb5e3e5efc4f878e41d882611115e5f985 SHA512 191f41d9559a7591b395e63c56b4d113575794496bb5f11c6b1e91c6cc550ef733daccd39512da8074ff95c6568d8aa9dc1e4d27019fbd6f7530e8df607f62aa WHIRLPOOL be2410881ee6088e68e45661e42f9841fa2bf030808885df30aab08ac1c34a6dc8354a4e5fb00e013f4c091cc1dad65468a66e61e11feb6473228cb4a29aa3f7
-MISC ChangeLog 26023 SHA256 9c20df48b510abfd7b18c18f8588148ae00e20dc9d99e65be0264e07b938df94 SHA512 686c5735377c6c77e8d83fab8f33fc98586a17529f0d33cf1476449b8b29342abbd9253c4ae541c654b1f833b42518d1c69859cd016bee8cb0fdc1aeea7c16d1 WHIRLPOOL 8ab2b575234a064e2e03d8609b66b644739cccf459e5cb5b31cc645d6fe126fbb53393b8efd92bd2b417f21e18af509c7017e2a196eaf1e33963ad13c68a3ee7
+EBUILD kmod-19.ebuild 5028 SHA256 eaf3c48f6fb5b5a3ec6bb6ff7ecdfc9031d66c4b6f76ffe024d3ea1bc2ef352c SHA512 e01578da47cf27e0636299d3b05d9ae1329689aa3fced7fbc47624420ef3413ae7b8aff2991a96038525ebfd796ce4f6650d6b50285bbd943a8a5b48b4465f1f WHIRLPOOL 002ec82d2616be2cf767634a929b1a14adfeb51de481f5dba157e6e1da8265c16b6ebe4093b5249bd86a4b21af1cfc896b890f20d3a223e1d77d65435715bf66
+EBUILD kmod-9999.ebuild 5033 SHA256 6d77601325de070a2c5d9c881f7812d76a40d13297e75e70fa183d77a7fec848 SHA512 c4042971a3057202cd86266cad73948f611de1b10176b7c61cdb874c54557e1622297aa3923f8adb95afbc034fea5ae1e7f788e5727afd051a8d6886a966d411 WHIRLPOOL 4bfbf3b33b39f7299df41583dee90d659f47e808aafca08250e2f2e020a7740cdec067f062a14e83b303da55854dc67c1099e8e4b492820958fc6de145134959
+MISC ChangeLog 26202 SHA256 669810e2849c9e05d22d99f54c0006f5fb3e7af2f0d6d2c6e13adf6509b0cfbf SHA512 cb116063e970586abf51de0edf5f8622f113390f65904f5671fd2d7132a98a3d7eac69c85612837c5cacd40c8c9dbe5e87dc728b93052cf91656bf1b5f5668c5 WHIRLPOOL dfa1d993a0cee03be106300c58091e5fb1275f587ed1c0c3a7b5854202d1d78728cde039fbe3bfadc718c91e119a87d4a05eb3e3c8e57d3f53b33acb2ac9d180
 MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS7/LcACgkQC77qH+pIQ6TiRAD+PLGiuNscMN9Q2ryHxL3Em/XJ
-0wxWAAUzc+77U9wUWhgBAIzzSBueSJEp6rR3HFZVI13oF6P+oinaHffZhTVATpX6
-=IVIr
+iEYEAREIAAYFAlS7/4gACgkQblQW9DDEZTg4vQCdFK1vBPTYMYPo6M7UlrxLGDDs
+tV4AoKckmX7nkS+QIBwN6grAvucd1/Za
+=ZI8o
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-19.ebuild b/sys-apps/kmod/kmod-19.ebuild
index b759ba0727dd..3691e13c3f51 100644
--- a/sys-apps/kmod/kmod-19.ebuild
+++ b/sys-apps/kmod/kmod-19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.5 2015/01/18 18:34:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.6 2015/01/18 18:45:46 williamh Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	inherit libtool
 fi
 
@@ -33,7 +33,7 @@ RESTRICT="test"
 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
-	!<sys-apps/openrc-0.13
+	!<sys-apps/openrc-0.13.8
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 0bf1a8d78ebf..80ebfbe266c8 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.85 2014/11/23 06:51:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.86 2015/01/18 18:45:46 williamh Exp $
 
 EAPI=5
 
@@ -33,8 +33,8 @@ RESTRICT="test"
 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
-	!<sys-apps/openrc-0.13
-	!<sys-apps/systemd-217
+	!<sys-apps/openrc-0.13.8
+	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130