gentoo resync : 04.05.2021

3 files changed, 28 insertions, 14 deletions

diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 1e6b056b40d8..1877c5ab68dc 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,6 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
+AUX exempi-2.4.5-gcc11.patch 346 BLAKE2B 022ca9284b3415b2a24c1aca421488e0741cd42784cdf1c24753d5a3941274f4adad87474e72f45286dba907641101d27ca5047cfa6e8f3b36dfba470db14f32 SHA512 2ca5dc6f1147c11a8ce4911b5b5b6d52ffedc6925ea2c13bd46e074320020b3e7ef52bc405fad9214a35fc47e8087f49258660750e65f168afc8517c49629947
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5-r1.ebuild 1236 BLAKE2B ba5c091bbdc7bdaf41c1258cfb8079df6e3f372dba36f54f6ede62f61736e9e55e60df91b5c3e4eeb69a6b9fb594832637f8f533cac895ecda0371e5e3080b44 SHA512 4d719005f1eafb80e6dd6bf2080389e02b60c4ddc6326c2b9d90ae161003543e0a99f845b9b55fc016649011e4c42740dc72e899e1aa15025eecdcfe88b060b5
+EBUILD exempi-2.4.5-r1.ebuild 1193 BLAKE2B 7f1ea15267e1b31fe02a529b1307d3ff897a2b29bd10fed5bf21b1b155352dd557b95bcdd21d8ffa5d482f88d982a7f3ec9c86c62b9b877a6b5ef9c767edc24f SHA512 b023bfca098837fc531ec2a54702df8b21e0a828a1345a80c85620a4f5783f5b4558673a8ac569ed0cf363ea8acb54d908ac92f559851559b78edffe9cc07806
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index 34771335ec29..8f9176de69e2 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,48 +12,50 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="2/3"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="examples static-libs test"
+IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/expat-2:=
 	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}"
+	virtual/libiconv"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/boost )"
 BDEPEND="
 	sys-devel/autoconf-archive
-	sys-devel/gettext
-	test? ( >=dev-libs/boost-1.48 )
-"
+	sys-devel/gettext"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
 	"${FILESDIR}"/${P}-CVE-2018-12648.patch
+	"${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {
 	default
-	cp /usr/share/gettext/config.rpath . || die
+
+	config_rpath_update .
 	eautoreconf
 }
 
 src_configure() {
 	# Valgrind detection is "disabled" due to bug #295875
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable test unittest) \
 		VALGRIND=""
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
 	if use examples; then
 		emake -C samples/source distclean
 		rm samples/{,source,testfiles}/Makefile* || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
+		docinto examples
+		dodoc -r samples/.
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
new file mode 100644
index 000000000000..259c05d5cbd2
--- /dev/null
+++ b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
@@ -0,0 +1,11 @@
+--- a/XMPFiles/source/FormatSupport/P2_Support.hpp
++++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
+@@ -79,7 +79,7 @@
+ }; // class P2_Clip
+ struct P2SpannedClip_Order
+ {
+-	bool operator()( P2_Clip* lhs,  P2_Clip* rhs)   
++	bool operator()( P2_Clip* lhs,  P2_Clip* rhs) const
+ 	{  
+ 		return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
+ 	}