gentoo resync : 25.08.2020

4 files changed, 78 insertions, 21 deletions

diff --git a/sys-kernel/cryptodev/Manifest b/sys-kernel/cryptodev/Manifest
index 86357c27c352..359e50357424 100644
--- a/sys-kernel/cryptodev/Manifest
+++ b/sys-kernel/cryptodev/Manifest
@@ -1,6 +1,8 @@
 AUX cryptodev-1.9-fix-build-with-4.14-629958.patch 1481 BLAKE2B d79780ae1c89f4a32c9e6cd75d3acfa2e0ccf1a00baa2f86d52cf42d4fb0a50c50848e1bdcc667b4defd3cef530ef36e9522700fc4f457d9e909ca545312a9b6 SHA512 3afc89f9099a68688d2e1fc5558444e841971ff42268f93b01bec5173360c8c0e234ff08641422c74dff67d8928d268d3604a897150e8e2b718ff8a374f8a48e
 AUX ioctl.c-Fix-build-with-linux-4.17.patch 1210 BLAKE2B 90f0aa56a2dc0a926e1537d22fe2e34744d884beb4616082d88e5d4029033e6d52a3b04b1a522604e07801bb8415f61e55fd8e2b066905f859f3ae1c42a2872a SHA512 008e96390eec46be7d412af8baa3d73a8d7d61c4e8595b32665f7e16ac71f364a826bbdab770839d33080d60ab61441e4e95db06b8a89dab70e9c56fe86e49da
+DIST cryptodev-linux-1.11.tar.gz 56876 BLAKE2B 97cf09c515c586372b2c5bd450e445afd5f80ed8ab39002545dc550c63480469a5318214f467444618e4e1783b9ab999b550cfb16d8ded6de26671a0727d06c2 SHA512 f7b76e9a154945514e2238cd7106cb50cea8120febc79228d6a8ba2dfaf98d5f0756d970df76fd63bda4755d7e0d78331aea394c3c5c18794b7ef1a8738fddba
 DIST cryptodev-linux-1.9.tar.gz 54409 BLAKE2B 48427235409c792001f420c8a66ab4320457a1cf22c1bf47c8d0a40ef82491ffe64a27b7f2e7ed92f3b8b426fc8425bd15b2bf9c875bb222de8b738022adf99f SHA512 8aff822e834d7d77f2b954b3f6de22d7de9659dac27b8a185b7ca060ff4b17bd38e287bb5c19043a53f5015a3f000d31be961695152bad0fb9f55785b2753d29
-EBUILD cryptodev-1.9.ebuild 1208 BLAKE2B 9264fef763bfdd2d3a62fbf188ca352f899f5aebd1c3f8dbf7b182bdbc52cc111dcb7741d9df7dcfa541c6e2c84b776c547f563be328424a42b303a9d936cd2e SHA512 cc0391ef55e6b9a9746dbb6ed6fa2112e1657aba2256579b0a1b074e17db20b44ba5d5cd9a15466a447d7219d57c5cd4f1477a0edfca967ddf79cc3dbd44cd45
-EBUILD cryptodev-9999.ebuild 1234 BLAKE2B 5eeefb6f9d03a03b5eae2cc4e1fbfe68964a6cf9ea2292cb93c63109c674f6af3e66d7c9a8aa3bcfa5dc43510908908f9d3d9212e38195abd7b022de8db2bf70 SHA512 6e25d83365a040f04bd6ed72e0c09dc1555716b216ec1686b0a91551836584cce94366f090247eede43a87d9ba914fb71de954b61276bd51d25ef46a65aaf656
+EBUILD cryptodev-1.11.ebuild 1273 BLAKE2B 15419af1ee675b6479266dc3e1a5a095076f68eb5d4161f88c3592fb88c825294ec23adb1d3650a872ad576cb526f8c1b3a82b08b036898a236abb0cb3c80175 SHA512 771a107d0da0f8dfcd2256f8d9d8c232cf27526e4e5c901c6d3fc3a3abec66e926cb6cda9896abb5582724d9c91802a0225a15e92269d9bfe14c01e6d8e000f0
+EBUILD cryptodev-1.9-r1.ebuild 1205 BLAKE2B ddaf065193fa895ff60c9cb54a13b10255b2d9cb7f4f08dbf6d9f30b8bc936a9f7aa8e3797cc9ebb62e1c8b91a2ad4956b27b8ff6f42b6ee6ea476c50eda4633 SHA512 2f091878ecd6b35fdc9447b09d71e9de229aae97df1ce86990a02d65f9cdd815c270c3f2a4fbd0f2227a90f11acf98c6a46b1e57bfc2862ea213a8bcf1feaa9c
+EBUILD cryptodev-9999.ebuild 1273 BLAKE2B 15419af1ee675b6479266dc3e1a5a095076f68eb5d4161f88c3592fb88c825294ec23adb1d3650a872ad576cb526f8c1b3a82b08b036898a236abb0cb3c80175 SHA512 771a107d0da0f8dfcd2256f8d9d8c232cf27526e4e5c901c6d3fc3a3abec66e926cb6cda9896abb5582724d9c91802a0225a15e92269d9bfe14c01e6d8e000f0
 MISC metadata.xml 247 BLAKE2B 7d02d43b3c72e93cf47c0e3e1461126322143c11c20f6d2ddc450540e9b7e298603366305dd0aa69e3cd724ff8289bbe8ad7f71356620597101e5757bbec37b0 SHA512 4cb53ef3f9c97ccfb06730609875c880abe563278461b2f16420e354dd83531adcabcdee9814c999fe93ae880d788e3946b9f09374b1724eefe80a7de92e72f6
diff --git a/sys-kernel/cryptodev/cryptodev-1.11.ebuild b/sys-kernel/cryptodev/cryptodev-1.11.ebuild
new file mode 100644
index 000000000000..08cf07fc623e
--- /dev/null
+++ b/sys-kernel/cryptodev/cryptodev-1.11.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="device that allows access to Linux kernel cryptographic drivers"
+HOMEPAGE="http://cryptodev-linux.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
+	S="${WORKDIR}/${PN}-${PV}"
+else
+	SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN}-linux-${PN}-linux-${PV}
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="virtual/linux-sources"
+
+#test requires that the module is already loaded
+RESTRICT="test"
+
+MODULE_NAMES="cryptodev(extra:${S})"
+BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\""
+BUILD_TARGETS="build"
+
+pkg_pretend() {
+	use kernel_linux || die "cryptodev ebuild only support linux"
+
+	CONFIG_CHECK="~CRYPTO ~CRYPTO_AEAD"
+	if kernel_is -lt 4 8 0; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_BLKCIPHER"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SKCIPHER"
+	fi
+	check_extra_config
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/crypto
+	doins crypto/cryptodev.h
+
+	if use examples ; then
+		docinto examples
+		dodoc example/*
+	fi
+}
diff --git a/sys-kernel/cryptodev/cryptodev-1.9.ebuild b/sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild
index 7ac492ca811d..6041c66cd1df 100644
--- a/sys-kernel/cryptodev/cryptodev-1.9.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-kernel/cryptodev/cryptodev-9999.ebuild b/sys-kernel/cryptodev/cryptodev-9999.ebuild
index 97182739422a..08cf07fc623e 100644
--- a/sys-kernel/cryptodev/cryptodev-9999.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-9999.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit linux-info linux-mod
 
 DESCRIPTION="device that allows access to Linux kernel cryptographic drivers"
-HOMEPAGE="http://cryptodev-linux.org/index.html"
+HOMEPAGE="http://cryptodev-linux.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
 	S="${WORKDIR}/${PN}-${PV}"
 else
-	SRC_URI="http://nwl.cc/pub/cryptodev-linux/${PN}-linux-${PV}.tar.gz"
+	SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${PN}-linux-${PV}
+	S=${WORKDIR}/${PN}-linux-${PN}-linux-${PV}
 fi
 
 LICENSE="GPL-2+"
@@ -28,30 +29,28 @@ RESTRICT="test"
 
 MODULE_NAMES="cryptodev(extra:${S})"
 BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\""
+BUILD_TARGETS="build"
 
 pkg_pretend() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~CRYPTO ~CRYPTO_BLKCIPHER ~CRYPTO_AEAD"
-		check_extra_config
-	fi
-}
+	use kernel_linux || die "cryptodev ebuild only support linux"
 
-pkg_setup() {
-	if use kernel_linux ; then
-		linux-mod_pkg_setup
+	CONFIG_CHECK="~CRYPTO ~CRYPTO_AEAD"
+	if kernel_is -lt 4 8 0; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_BLKCIPHER"
 	else
-		die "cryptodev ebuild only support linux"
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SKCIPHER"
 	fi
-	BUILD_TARGETS="build"
-	export KERNEL_DIR
+	check_extra_config
 }
 
 src_install() {
 	linux-mod_src_install
+
+	insinto /usr/include/crypto
+	doins crypto/cryptodev.h
+
 	if use examples ; then
 		docinto examples
 		dodoc example/*
 	fi
-	insinto /usr/include/crypto
-	doins crypto/cryptodev.h
 }