summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lermytte <gentoo@lermytte.be>2022-04-01 15:14:36 +0200
committerSam James <sam@gentoo.org>2022-04-02 04:30:21 +0100
commitf0ead0194a4732ad6109b934c4f6db7c1cd174df (patch)
treee563b81f3f982bb7cf90265bf03185e3c9dc13b2 /net-libs
parentnet-misc/openssh: fix build with ldns (diff)
downloadgentoo-f0ead0194a4732ad6109b934c4f6db7c1cd174df.tar.gz
gentoo-f0ead0194a4732ad6109b934c4f6db7c1cd174df.tar.bz2
gentoo-f0ead0194a4732ad6109b934c4f6db7c1cd174df.zip
net-libs/libotr: fix build with libgcrypt-1.10
Also, because of the move to EAPI 8 we no longer need to override src_configure() to disable static libraries Signed-off-by: Christophe Lermytte <gentoo@lermytte.be> Closes: https://github.com/gentoo/gentoo/pull/24847 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch11
-rw-r--r--net-libs/libotr/libotr-4.1.1.ebuild13
2 files changed, 17 insertions, 7 deletions
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
}