gentoo resync : 16.09.2020

3 files changed, 2 insertions, 113 deletions

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 6b114d5f8de7..ad49dfe12f15 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,6 +1,4 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
-DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71
-EBUILD libzip-1.7.3.ebuild 2413 BLAKE2B 5822b165ac56f503e6fee73215efc8121a73581254c2d68e9d50e191766df79ce2171ad4cd5f606f1ea76d98b36974eb9ebfac6645e643da6b6dfe8d56ef60c6 SHA512 3359eac6e2432bebb5ca51f5bf868f14043a401b8458d45d9cb9e16a05b564829f47a07fea728abfda1f067c293a9d229ed62b92071fbd1e09bad1fcf23b97d9
+EBUILD libzip-1.7.3.ebuild 2411 BLAKE2B aba7f01e2cd8b8fbe4c0898c48dd16fc610ddf32b507320bc4af2a7a958ac4eb5cc74ae774c7195704b0451f4a9e0b3b579fa84b65c5d0a6da5eaffb0b565147 SHA512 db47ae37eb8de90e5a858a5d1cb3b45083604143bea55996a781aa6efb5e26360cc8107f86c552c1be0aee2463d4227df9a04b0f5f20cdb972bb533a8c82aa0d
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild
deleted file mode 100644
index b8389696d925..000000000000
--- a/dev-libs/libzip/libzip-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
-			)
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=$(usex doc)
-				-DBUILD_REGRESS=$(usex test)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild
index fe0d69415676..b79772c27f86 100644
--- a/dev-libs/libzip/libzip-1.7.3.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"