gentoo resync : 22.05.2021

4 files changed, 14 insertions, 185 deletions

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 367cf7c66a74..03be51a2b849 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,11 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.12.tar.xz 923476 BLAKE2B 08bc5906573da11df5e63b812f2d374eaec7c605140675d8209d81bddecd96e05f10099c63f4f49d7957159dbf7654a5dd2191c8e6bcc1dace7bde6dba6cbf43 SHA512 f331a60430582269801cb01d4eca9957a200c5cfecff637941414eb6db4f077c2dbf824b776cd78ae57b27d442cdb8ec9b3ce8468c206387ea1eee2c9973fcaa
 DIST iwd-1.13.tar.xz 927880 BLAKE2B 0ff1d0c0a4dfd08bfea602e8a76fbf7d9078f5b665b90cd6cdf49ed589fd8c43151a3938313ab877653348a6862ae19d228feeea44d441efe17324ff1c5b9aa5 SHA512 7da9d28bf6f1f2ce55c6cd3bedd927580245789ccd3b67bc44d4768ac74e1793f912b12029662fadd6d6f15da68f337553efc05d886d3be04956d2db0d85f01c
 DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
-EBUILD iwd-1.12.ebuild 4869 BLAKE2B bfd4a88bbe3771da227ea20695ba5b8f2de618cc31ac4b783f0b3b29226b8c17fa573219807406ce011a90f35fc5907eca190a40e8f128c08c491a0b23be0f44 SHA512 9a32042377b3466435be2e36c4fb4992b822e9d9e8b8bd09ba31d7ec87ee83e3fb1f03b4e536ad0009a82f5e7d97292c6edb0d13a24c911c7f9aa32f651cdceb
 EBUILD iwd-1.13.ebuild 4832 BLAKE2B dee7e7f2cf199c2a7c66d6b8bf2bf698bf2ddab27389ec957232451f3649f13b5c9291a4ee4e1eff17a67ee15c57b0795bbd664574351e9ba1bc7810c376690a SHA512 68fbe4c0bc424e8cf38cbe8374ca925e304a2f3a36a7affb8894aeb4a430025060accb8863d1f0ce98093f30bed16c5f346a9d32b068106d0c87acdf3461a4a5
-EBUILD iwd-1.14.ebuild 4838 BLAKE2B f6dbba93ba0869cb9bf5055173e860b2dc0398e142c7a49c1bcdc68793a8aaf6028e3a9ab35ac366f7f2563a7132a780d9b720a6d4a63ffe6d62247ee08b2a41 SHA512 45bc691808140ada252a1d5785f621370fa87489ac41848bebe7cde3f8ae899cd4c1b39ceaf098d9d072c291f5750c14493c0cb4de3b8779074940dc59229c2a
-EBUILD iwd-9999.ebuild 4834 BLAKE2B 87df114e7ade404c0455fb9098dff7c56edb764c76390323065a6b1128c6a9afe80cb8b01ca01d9c48294c733d54e8a7423a279ebb6cfe2b78d43ff018a75450 SHA512 327bc13bcad6d5877a82ec9d10cf892fcddf305a3a54988c5b5d59732fd626dfcaca4870d5608d0a8cc2052128bb3d11ed59be7f2c7e44bc7d6abe4b591009c6
+EBUILD iwd-1.14.ebuild 4934 BLAKE2B 6e4b3cb2cce0b875b5ec0b390fd59b7ce73ef68ecbff3be03fe57a150ad218e3ff69c6bc52e8982495398e89f5e4c6cdb615a07495a47a8137ec9437de9c0c38 SHA512 781397a8e2fa8e11dab6cec705f1bc433d178b89b9b8baaa5ca6a389fde794b8d54c7f3b4150b625088e3a010d2aa034eed2de92663df021a3593aad06e769c2
+EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.12.ebuild b/net-wireless/iwd/iwd-1.12.ebuild
deleted file mode 100644
index 0f5bc1763e06..000000000000
--- a/net-wireless/iwd/iwd-1.12.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.38"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
-standalone systemd"
-
-COMMON_DEPEND="
-	sys-apps/dbus
-	client? ( sys-libs/readline:0= )
-"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
-	standalone? (
-		systemd? ( sys-apps/systemd )
-		!systemd? ( virtual/resolvconf )
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-	fi
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-
-	if use standalone ; then
-		local iwdconf="${ED}/etc/iwd/main.conf"
-		dodir /etc/iwd
-		echo "[General]" > "${iwdconf}"
-		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
-		echo "[Network]" >> "${iwdconf}"
-		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
-		dodir /etc/conf.d
-		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.14.ebuild b/net-wireless/iwd/iwd-1.14.ebuild
index b09c7610802a..02a955c8d7b2 100644
--- a/net-wireless/iwd/iwd-1.14.ebuild
+++ b/net-wireless/iwd/iwd-1.14.ebuild
@@ -14,6 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -150,8 +151,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
 src_install() {
-	default
+	emake DESTDIR="${D}" ${MYRST2MAN} install
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/iwd.initd-r1" iwd
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index 47494b053c37..bea6be6a9ea8 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -14,6 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -150,8 +151,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
 src_install() {
-	default
+	emake DESTDIR="${D}" ${MYRST2MAN} install
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/iwd.initd-r1" iwd