gentoo resync : 18.11.2019

4 files changed, 14 insertions, 10 deletions

diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index b72006daec8e..72b759dbb743 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 EBUILD kmod-25.ebuild 4924 BLAKE2B d7fbc42a9d490d10c0fca9e590c7e0cf8520ee7bf80d780d33a08af22e46fea044725d3ec2e5c49f0520d17721f97130e06212d823972aea9387c2b3cda80d04 SHA512 3fa591487100ffe314c1a7f34d598cb1188c89893462a57f6b497baeaf702af6a154b4d36967304fcba144aaa92ad0897613eeed4e33b5d802a06444cb88f803
-EBUILD kmod-26-r2.ebuild 5099 BLAKE2B 4487c5058627df2a8204e2fab619f5dc5ccf88508073d38b6d7b6a7b1aad2815e1af78dc64fecec9bfabd20714c0b5c7a51bcea9312f428943fd339d7224f4fc SHA512 a91fdf2e4b8edabab95b85ae3300c60fe2d553b3de6053524c7de20accb346062c6648539091d33c086532593eb7b537b39bed26a1a5481f9a2094a1d9e7dfcf
-EBUILD kmod-9999.ebuild 4974 BLAKE2B c2d8c0da4b9d209e46ee9a39def747c7e2dfe7bc50df0d5e47c9201674d184be3a40438bf42168f08aade146f07117c169aeafbad207a3743b3508ea339a9527 SHA512 7e1a487fdfd13e7dd95e8fc27fb51eca38345be289e40a0248bacb81745bf797c57a53f28bf9ff5e9051895780e913764b5ce7e080f518df77c0c7043bed99b4
-MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
+EBUILD kmod-26-r3.ebuild 5101 BLAKE2B 502f84192e011dc541eefbfb70f0302c4c0c6a176cf589e735a06c5e0a539c8b9b765e7410bb997e8b88df1563fd950605087b2d5a6b06ed2ac80a786857edf4 SHA512 c65c9044a4fbbe294d4d6654777cc4b95903ee30afc3314457ba7ad3d553e33d0c4bada80086a1e7956500fff7f65e346dbc72e9f3826bd7db894541e2d518ca
+EBUILD kmod-9999.ebuild 5044 BLAKE2B a8db971037a2c312826f62fa882a1a1e7665b15067fadf0a8017c38ffe25083ba64fa26c3cbacb74498b4a8b9c210076a159a80e3b0b1a7a5cfe63054c70e5f9 SHA512 dbc278ce5db407abcfa1b125f0c9ddcb868ee88765febdc96faabb6527ab21f40d7edba7a3a0cb8165b5624d19641442dd548ac469b0292aa423201f93fb0067
+MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-26-r2.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild
index c2aa5bc3dd97..4c0380e44bde 100644
--- a/sys-apps/kmod/kmod-26-r2.ebuild
+++ b/sys-apps/kmod/kmod-26-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	inherit libtool
 fi
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
+IUSE="debug doc libressl lzma pkcs7 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.
@@ -36,7 +36,7 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	ssl? (
+	pkcs7? (
 		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
@@ -93,7 +93,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
-		$(use_with ssl openssl)
+		$(use_with pkcs7 openssl)
 		$(use_with zlib)
 	)
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 40622a08336b..2cf70d9af7ee 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc lzma python ssl static-libs +tools zlib"
+IUSE="debug doc libressl lzma pkcs7 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.
@@ -36,7 +36,10 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pkcs7? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
@@ -86,7 +89,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
-		$(use_with ssl openssl)
+		$(use_with pkcs7 openssl)
 		$(use_with zlib)
 	)
 
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 188bf47702ef..be2aa7701742 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -10,6 +10,7 @@
 </maintainer>
 <use>
 	<flag name="lzma">Enable support for XZ compressed modules</flag>
+	<flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag>
 	<flag name="tools">Install module loading/unloading tools.</flag>
 	<flag name="zlib">Enable support for gzipped modules</flag>
 </use>