gentoo resync : 06.04.2022

3 files changed, 19 insertions, 8 deletions

diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 6df323434c8e..e8bced45f010 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,4 @@
+AUX libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch 285 BLAKE2B c83895dc849645ae83bf2f5e5a7c63fd5d94071af6859744551be298d2de7708d6818aadecfc1d83e6fb93c14cad23d2d3e5f1650067fbf29e4cb43aab8101ad SHA512 d1d59c884ec96ab258aeb9d41ce39949aec97de85859c4fc376b5afdc225495a0f7266b4214140f5f6cc4e0acd1a63a376f070a4393460d36e72934a8398e06f
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 686 BLAKE2B 50d02b58586c176703bccd4bd9626c86d4ddc51ec6db6b7f95a86d467c026d1a379d1dc81ca1c8bfcef6647daf2e46daa683b047febd2b3ded17437f72466fc5 SHA512 56efac04e758bf34631b3f2684449698834606e461bc6b7d7796318c0a742cfb04cdfeb89e0c36c984c7b987679af91b7dde3d5e224a8624eb46bc7f98d0c134
+EBUILD libotr-4.1.1.ebuild 710 BLAKE2B b6e8672f3539597e5461f00cc3d15f63b7dd8808ac716766544541d3bf7277a0bde904d7e6296c073f9814953c10b8525b5b2128b514774aeac9397fe77f7c93 SHA512 8f2cb3ccbd9072d5369199520f32881b8ad8bc79f7d4b99a43dfadaadf3989c30ea7d2c5e5a3bd19195155502c691105a8b33078a25db96a88b4e107354c85fd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
new file mode 100644
index 000000000000..1aa60f478b88
--- /dev/null
+++ b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/836572
+--- a/tests/regression/client/client.c
++++ b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <syscall.h>
+ #include <sys/epoll.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index c4976292c2ca..aae1bbc9b0c9 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
 HOMEPAGE="https://otr.cypherpunks.ca"
@@ -10,21 +10,20 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error:0="
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf --disable-static
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch"
+)
 
 src_install() {
 	default
 	dodoc UPGRADING
 
 	# no static archives, #465686
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }