From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- net-voip/Manifest.gz | Bin 1050 -> 1052 bytes net-voip/telepathy-gabble/Manifest | 3 +- .../telepathy-gabble-0.18.4-r1.ebuild | 87 -------------------- .../telepathy-gabble-0.18.4-r2.ebuild | 89 +++++++++++++++++++++ 4 files changed, 91 insertions(+), 88 deletions(-) delete mode 100644 net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild create mode 100644 net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r2.ebuild (limited to 'net-voip') diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz index 8f05426ce7f1..a88a871c9209 100644 Binary files a/net-voip/Manifest.gz and b/net-voip/Manifest.gz differ diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest index 89efebfff72e..737ebf7b5bed 100644 --- a/net-voip/telepathy-gabble/Manifest +++ b/net-voip/telepathy-gabble/Manifest @@ -1,5 +1,6 @@ AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d0900003b7553f70144f261bf45f33dd2cfffb54d1a0bbc00a1f99961180d8f848d4e1cf70deee46e9a66fd56af6cc6196787fa4265bbd46034a35 SHA512 e1d2dc3b13ebfb24dab5c73ba9dd930f1ff61a443311dbfb3526a3474bfba96934b24e48c8b098216e8c205c4835143c891697c23b328a6541a72683d4864e11 AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8670 BLAKE2B 1d7f3133a67b4f17acbbbad0e1ba45421c9d3bbaa7bab4cdc1cffdadaff6a839b197f8b2167c5bb77fef80a68fea6c214fe0fb6b348c06a2a84a020d0d5f4cfe SHA512 f3d5f4aa15efe17a408888a51a5670e512cf3264261b1a11bada080b15ec131c42f222fe9fe9660717d32208988383a75214908adc6e364d4a8903b7ef0f3d2c +DIST telepathy-gabble-0.18.4-python3.patch 16302 BLAKE2B 6cbd6469febe4acc6d8d07c0c209b47fbf79990601f41c4715f13944d81165df6dccfc344b3cc674fa131fc383a609ae628d8508ff96b05ef63634af6c32b638 SHA512 3b8ea10b5330c5d02d4bc4508a7d9a348bb4c9a93a92419fb66668e06f461097fb16a1a4b956c327740cf6dc77693b921a63f37a6095c21fcab6d1169e62a2f4 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218 -EBUILD telepathy-gabble-0.18.4-r1.ebuild 2404 BLAKE2B 066e6fb74f51d9149a0aaddd8033722311fe40b67e407a2cf01fae4dbba3e3f9b44768556ae3948ba5a0df558a7440e0088f6b064e5149adcd0c565b7003613a SHA512 b326c2b54c7aab612e17cdb13fc70456102395106deb4ec770dbc91baf7c09e17a24e8ae59fa2b79c73dd7e3a9050f222ad8f9b9333b75d2f43b1493d94f825c +EBUILD telepathy-gabble-0.18.4-r2.ebuild 2561 BLAKE2B 9a6694c719abf8097f1b2129004213b8f19741761288d97cf6bbe6a8dab4229d1f6022b078e738a726a2345fe966f31baf5b89c23765d8e85866e859f2169fea SHA512 c6a7a86a0cba0aa64941a3c26933f3fcc80ba3448b3235d22295037f767cd360ba7afa71464526f399c6bd35457edc098dba03f3cb2e305b4f8366c05a313e03 MISC metadata.xml 372 BLAKE2B a310551b32c7bfef5ea2b2f343ec6afda74de8cd3aba90f070fe37afb44658e404dfeea1f4393846ccc917bc42c388c332e579889fd155da0bbcc2fdb0424287 SHA512 12de5cf5c137b921ce68e54f0a5eb5d3c3156b77ceae95de9c6d23a291eb21b40aaf43348ca9387f0709dd355fd5dcb774ddf7ce19e2a96beb7bf92c7586cef8 diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild deleted file mode 100644 index a41a4aefb82a..000000000000 --- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -# Python is used during build for some scripted source files generation (and twisted tests) -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-any-r1 - -DESCRIPTION="A XMPP connection manager, handles single and multi user chats and voice calls" -HOMEPAGE="https://telepathy.freedesktop.org/" -SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" -IUSE="gnutls +jingle libressl plugins test" -RESTRICT="!test? ( test )" - -# Prevent false positives due nested configure -QA_CONFIGURE_OPTIONS=".*" - -# FIXME: missing sasl-2 for tests ? (automagic) -# missing libiphb for wocky ? -# x11-libs/gtksourceview:3.0 needed by telepathy-gabble-xmpp-console, bug #495184 -# Keep in mind some deps or higher minimum versions are in ext/wocky/configure.ac -RDEPEND=" - >=dev-libs/glib-2.44:2 - >=sys-apps/dbus-1.1.0 - >=dev-libs/dbus-glib-0.82 - >=net-libs/telepathy-glib-0.19.9 - - dev-libs/libxml2 - dev-db/sqlite:3 - - gnutls? ( >=net-libs/gnutls-2.10.2 ) - !gnutls? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) - ) - jingle? ( - >=net-libs/libsoup-2.42 - >=net-libs/libnice-0.0.11 ) - plugins? ( x11-libs/gtksourceview:3.0[introspection] ) - - !=dev-python/twisted-16.0.0 -#) - -PATCHES=( - "${FILESDIR}"/${P}-build-fix-no-jingle.patch # build with USE=-jingle, bug #523230 - "${FILESDIR}"/${P}-openssl-1.1.patch # bug #658902 -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_configure() { - gnome2_src_configure \ - --disable-coding-style-checks \ - --disable-static \ - --disable-Werror \ - --enable-file-transfer \ - $(use_enable jingle voip) \ - $(use_enable jingle google-relay) \ - $(use_enable plugins) \ - --with-tls=$(usex gnutls gnutls openssl) -} - -src_test() { - # This runs only C tests (see tests/README): - emake -C tests check-TESTS -} diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r2.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r2.ebuild new file mode 100644 index 000000000000..770ad4c2961d --- /dev/null +++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +# Python is used during build for some scripted source files generation (and twisted tests) +PYTHON_COMPAT=( python3_{6..9} ) + +inherit gnome2 python-any-r1 + +DESCRIPTION="A XMPP connection manager, handles single and multi user chats and voice calls" +HOMEPAGE="https://telepathy.freedesktop.org/" +SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz + https://src.fedoraproject.org/rpms/telepathy-gabble/raw/95adf4063c2456139dcc5d991ba6d012be850794/f/${P}-python3.patch" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" +IUSE="gnutls +jingle libressl plugins test" +RESTRICT="!test? ( test )" + +# Prevent false positives due nested configure +QA_CONFIGURE_OPTIONS=".*" + +# FIXME: missing sasl-2 for tests ? (automagic) +# missing libiphb for wocky ? +# x11-libs/gtksourceview:3.0 needed by telepathy-gabble-xmpp-console, bug #495184 +# Keep in mind some deps or higher minimum versions are in ext/wocky/configure.ac +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=sys-apps/dbus-1.1.0 + >=dev-libs/dbus-glib-0.82 + >=net-libs/telepathy-glib-0.19.9 + + dev-libs/libxml2 + dev-db/sqlite:3 + + gnutls? ( >=net-libs/gnutls-2.10.2 ) + !gnutls? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) + ) + jingle? ( + >=net-libs/libsoup-2.42 + >=net-libs/libnice-0.0.11 ) + plugins? ( x11-libs/gtksourceview:3.0[introspection] ) + + !=dev-python/twisted-16.0.0 +#) + +PATCHES=( + "${FILESDIR}"/${P}-build-fix-no-jingle.patch # build with USE=-jingle, bug #523230 + "${FILESDIR}"/${P}-openssl-1.1.patch # bug #658902 + "${DISTDIR}"/${P}-python3.patch +) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --disable-coding-style-checks \ + --disable-static \ + --disable-Werror \ + --enable-file-transfer \ + $(use_enable jingle voip) \ + $(use_enable jingle google-relay) \ + $(use_enable plugins) \ + --with-tls=$(usex gnutls gnutls openssl) +} + +src_test() { + # This runs only C tests (see tests/README): + emake -C tests check-TESTS +} -- cgit v1.2.3