gentoo resync : 12.05.2022

3 files changed, 1 insertions, 77 deletions

diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index aedc6323b63a..d32f95211249 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,5 +1,3 @@
-DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
 DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
-EBUILD wimlib-1.13.3-r1.ebuild 1469 BLAKE2B 4acd9822147cb0f49c946e72925bed37da0f433a4960ac2ad8c15b5c2a9f56d6abf9d0e2b7eb9008bfa7255c36040586fec25ade9ff363ecf921647478e12795 SHA512 54de7e8167aea45a54818fd6ab698db64f5a4896b1c1d487525128923f3d47c6d1d372a2fe7a96bbca086e8d982fca1df85f762bf249e9a23c189d91949cc27c
 EBUILD wimlib-1.13.4-r1.ebuild 1480 BLAKE2B 8cb36da172e3897b2abbc1efc6b07acfa58c41ba56d39716b40f3d0d299db4f4b02737c97d2beaf1fad48c593bac33e4e9d0dbf27d7dcc18bbc2aaaea77aa203 SHA512 030fcf7ff66bcc05253e7b164158be0cb70ebd8baf79c394a2b63b7b87ba89d54e6e78f3ca53075a2f19572b8989bd94a2d702f47e53c7540f58050d52d94c85
-MISC metadata.xml 561 BLAKE2B f1c2470ce49b460a973f435422190466523039f9bee92f96f8e52b07182e9d6ef59b079be20ba733fcf6a35a8cf5f49fc6eaa210f75db3cac2b07bc21d655d64 SHA512 7ea07a44c715bcb37e39fb1ff2b05e7a921aa585b7f002be2d5edadb1372454b522e6969518261a7121308792eb5be80e9b62227e471c7108d3c723a48fc3982
+MISC metadata.xml 442 BLAKE2B 8033bf9e913c2b11aaf34ad165bc87d0d02e49f59e06f5a747161c270344fda165f55ac8067054c6cdcf0e9e9c759976e5dcbf57f096819f8993373e7716f931 SHA512 9006f7cc79b155f26852427363b4cccca8288a7da4f33184b95910b2ebe7beac71fbf08dcefdbdefeb8ce55145eb10f77a02e0f6c950f7dea83ad3546fb9f85d
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
index b55da085cdf2..c8ff4e0d7be0 100644
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@@ -6,7 +6,6 @@
 		<flag name="fuse">Use fuse libraries</flag>
 		<flag name="iso">Install app-cdr/cdrtools in order to prepare iso images</flag>
 		<flag name="ntfs">Use libntfs-3g library from sys-fs/ntfs3g</flag>
-		<flag name="openssl">Use the SHA-1 message digest from libcrypto instead of compilling another implementation</flag>
 		<flag name="yasm">Use yasm assembler instead of nasm</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-arch/wimlib/wimlib-1.13.3-r1.ebuild b/app-arch/wimlib/wimlib-1.13.3-r1.ebuild
deleted file mode 100644
index e1373f3790a6..000000000000
--- a/app-arch/wimlib/wimlib-1.13.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-if [[ -z ${PV%%*9999} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://wimlib.net/${PN}"
-else
-	MY_PV="${PV/_/-}"
-	MY_PV="${MY_PV^^}"
-	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="The open source Windows Imaging (WIM) library"
-HOMEPAGE="https://wimlib.net/"
-
-LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
-SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
-REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	cpu_flags_x86_ssse3? (
-		yasm? ( dev-lang/yasm )
-		!yasm? ( dev-lang/nasm )
-	)
-"
-RDEPEND="
-	dev-libs/libxml2:2
-	ntfs? ( sys-fs/ntfs3g:= )
-	fuse? ( sys-fs/fuse:0 )
-	openssl? ( dev-libs/openssl:= )
-	iso? (
-		app-arch/cabextract
-		app-cdr/cdrtools
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ntfs ntfs-3g)
-		$(use_with fuse)
-		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
-		$(use_with openssl libcrypto)
-		$(use_enable threads multithreaded-compression)
-		$(use_enable test test-support)
-		--disable-static
-	)
-	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
-		econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	pax-mark m "${S}"/.libs/wimlib-imagex
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}