From f388068791e2ef24a7230b0a441ea3ed70095a72 Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Mon, 21 Jun 2021 19:17:40 -0400
Subject: net-voip/telepathy-salut: use binding := for dev-libs/openssl

Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI.

Acked-by: David Seifert <soap@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../telepathy-salut-0.8.1-r4.ebuild                | 72 ----------------------
 .../telepathy-salut-0.8.1-r5.ebuild                | 72 ++++++++++++++++++++++
 2 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
 create mode 100644 net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild

(limited to 'net-voip')

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
deleted file mode 100644
index 8f7164df8cbc..000000000000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1
-
-DESCRIPTION="A link-local XMPP connection manager for Telepathy"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
-	https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="gnutls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.61
-	dev-libs/libxml2
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.1.0
-	>=net-libs/telepathy-glib-0.17.1
-	>=net-dns/avahi-0.6.22[dbus]
-	net-libs/libsoup:2.4
-	sys-apps/util-linux
-	dev-db/sqlite:3
-	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist(-)] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.4
-		net-libs/libgsasl
-	)
-"
-# FIXME: needs xmppstream python module
-#               >=net-dns/avahi-0.6.22[python]
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
-	"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
-	"${DISTDIR}"/${P}-python3.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-coding-style-checks \
-		--disable-plugins \
-		--disable-Werror \
-		--disable-static \
-		--disable-avahi-tests \
-		--with-tls=$(usex gnutls gnutls openssl)
-		#$(use_enable test avahi-tests)
-
-	# false positives according to bug #413581:
-	# unrecognized options: --disable-plugins, --disable-avahi-tests
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default # bug 413581
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
new file mode 100644
index 000000000000..465a3f4426fb
--- /dev/null
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+
+DESCRIPTION="A link-local XMPP connection manager for Telepathy"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
+	https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+IUSE="gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.61
+	dev-libs/libxml2
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.1.0
+	>=net-libs/telepathy-glib-0.17.1
+	>=net-dns/avahi-0.6.22[dbus]
+	net-libs/libsoup:2.4
+	sys-apps/util-linux
+	dev-db/sqlite:3
+	gnutls? ( >=net-libs/gnutls-2.10.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g:0=[-bindist(-)] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		>=dev-libs/check-0.9.4
+		net-libs/libgsasl
+	)
+"
+# FIXME: needs xmppstream python module
+#               >=net-dns/avahi-0.6.22[python]
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
+	"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
+	"${DISTDIR}"/${P}-python3.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-coding-style-checks \
+		--disable-plugins \
+		--disable-Werror \
+		--disable-static \
+		--disable-avahi-tests \
+		--with-tls=$(usex gnutls gnutls openssl)
+		#$(use_enable test avahi-tests)
+
+	# false positives according to bug #413581:
+	# unrecognized options: --disable-plugins, --disable-avahi-tests
+}
+
+src_install() {
+	MAKEOPTS+=" -j1" default # bug 413581
+	find "${D}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3-65-gdbad