gentoo resync : 17.07.2021

4 files changed, 94 insertions, 21 deletions

diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 1d2d3569a1b8..8b9fa7dca346 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,3 +1,5 @@
 DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
-EBUILD wimlib-1.13.3.ebuild 1469 BLAKE2B 213d3087f76925360c0d8973ae99c967233c41cd17223617ee0eea4c8466db4d7264dffde3b8dfec0406bbbc1b12d1a147ebd2856d746c718444d6528e95d790 SHA512 5ec6b2df3632f5ed55de5ddbcd247e70b80638af5c6340d06dcc446ef721707fdc83871f97d9566ea740f9b7a53e73aff9eaf750e17bbdb2c8196fbaedae2aa6
-MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
+DIST wimlib-1.13.4.tar.gz 1040411 BLAKE2B 4563429d42be39b959a15ef66ac4c173531ff0c0b0f1a341812a4f870c9f189478f3ce78bf6240544f71b1746d98c9eae3f7182d646355343e26526559384f07 SHA512 480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344
+EBUILD wimlib-1.13.3.ebuild 1468 BLAKE2B f9fda406269868fee8864b80cbf402082ad5d94c1aa3bbb2e9f5f5c6b7782b5ad43a4175661f0c0b3a2155e90809002bef437b5c9f030edd35f9f46451ffce13 SHA512 7ed537bceba0e7089a5a05d814e8dbf7e2874dac3b7abeb13e9e093f1ed179168742fd1e18a15a5dcbf7927d7295d29c5ccfc19f52444332dd9c8ea3851151a9
+EBUILD wimlib-1.13.4.ebuild 1481 BLAKE2B 0ffb97b8efaa6259101dc9a46b16baf2f9b7639686507144ca8849a3d6afc11f71432608b4e2a1e6959d51f5ec9492112e23f279a305b312b52204bc5e54ed6e SHA512 6b83cb0cc66a068089f1a353a71a269ae69d3c30afc5ebbd1bd65e982466f01698e62e6d967f63ed2b3b1dcb6a0924b05b1c5e1647462f8aa17e0d904dfd015d
+MISC metadata.xml 788 BLAKE2B 39fb937f096a607648c23c57f4fb17947b7ff4705b97db69b3ebea637a4e85723ed333ba01b9755708644d0c7daa2e920d0fd192a586b051ea4682b335156ecc SHA512 638f1e0cf7242b2fbc8c55482b75391e435465e2a7de7cde48eb95e0c2c3d52db360e2595138577d9934285c2fd2b5dafd758a6f97431ece72db5625fab8c29b
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
index 7d39835030d1..b591ed9e0496 100644
--- a/app-arch/wimlib/metadata.xml
+++ b/app-arch/wimlib/metadata.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <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>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<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.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
index 5c3f76379b53..be0165156be7 100644
--- a/app-arch/wimlib/wimlib-1.13.3.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV="${PV/_/-}"
 	MY_PV="${MY_PV^^}"
 	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="The open source Windows Imaging (WIM) library"
diff --git a/app-arch/wimlib/wimlib-1.13.4.ebuild b/app-arch/wimlib/wimlib-1.13.4.ebuild
new file mode 100644
index 000000000000..84e997127f0a
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.13.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="The open source Windows Imaging (WIM) library"
+HOMEPAGE="https://wimlib.net"
+SRC_URI="https://wimlib.net/downloads/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs ssl test threads yasm"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
+RDEPEND="
+	dev-libs/libxml2:2
+	fuse? ( sys-fs/fuse:0 )
+	iso? (
+		app-arch/cabextract
+		app-cdr/cdrtools
+	)
+	ntfs? ( sys-fs/ntfs3g )
+	ssl? ( dev-libs/openssl:0= )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ntfs ntfs-3g)
+		$(use_with fuse)
+		$(use_with ssl libcrypto)
+		$(use_enable threads multithreaded-compression)
+		$(use_enable test test-support)
+		--disable-static
+	)
+
+	if use cpu_flags_x86_ssse3; then
+		if ! use ssl; then
+			myeconfargs+=( --enable-ssse3-sha1 )
+		else
+			elog "cpu_flags_x86_ssse3 and ssl can't be enabled together, "
+			elog "enabling ssl and disabling cpu_flags_x86_ssse3 for you."
+			myeconfargs+=( --disable-ssse3-sha1 )
+		fi
+	fi
+
+	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
+}