From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020
---
net-im/swift/Manifest | 5 +-
.../files/swift-4.0.2-qt-5.15-compatibility.patch | 10 +
net-im/swift/swift-4.0.2-r2.ebuild | 1 +
net-im/swift/swift-4.0.2-r3.ebuild | 215 --------------------
net-im/swift/swift-4.0.2-r4.ebuild | 216 +++++++++++++++++++++
5 files changed, 230 insertions(+), 217 deletions(-)
create mode 100644 net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch
delete mode 100644 net-im/swift/swift-4.0.2-r3.ebuild
create mode 100644 net-im/swift/swift-4.0.2-r4.ebuild
(limited to 'net-im/swift')
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 260b6f9abe13..d6336bee11d1 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,8 +1,9 @@
AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1f65f234f4630cade22e64325734500b24ddbba07a663d75fe6ef570b0dbc1463f6d03bc3db3d272d38c2d17945af923383ce65843eb6 SHA512 5218e5ce0d07826c4ebbcf3ea3d7e2685a3d3a9875301d0656929c19b83c4042a538e308b427d4666c5e6ba39adb9049795a886cf50daa9632cf96648421884a
AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2B 78abb2fb27a796d2b0ba1c4d9ee2a5662a3a166b404f16ca67cb0b884db65d36a95b95a82827a7d2cfcf1b65204ebe23b11791b94fa4a88b85a72c1f1b12cf10 SHA512 57cb292b32365d7041a3d9b17488288e07eba5402bdc0db5ec3ff447a5ad7b3dfe7d13275d8783ddf6d338831a9bee93d481b74342d8d57a62486b3b7ca7689e
AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
+AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r2.ebuild 4510 BLAKE2B 8381768b09d39dd0ab0cad3403cde517ca22f93b269e1c84dd75e0572f3212bbe0268a0bab54f6683e9e4adb789f1a306b76883fe1eb516fff709c04377bd44d SHA512 d461335e7ae83ca5dea5df543c636b6ceb40bb62b1f556e4df5a048358871cd623a182c3965e03438288c908d36737b01a53e6c7d3a5b0f94ecd144b87577e0d
-EBUILD swift-4.0.2-r3.ebuild 4619 BLAKE2B a68578009b3204783a5572c18dfd99566a4d243e2982be8d237f25dbf2e5c504ef1cbdb403705c301b54324ecbd8261e86a0b50e4482d77f3b1e9763e2707d75 SHA512 743b8654d57761b0d89c34b9f9d071580f784788bda2d212bc264444f4478b6d991383bb8a5218433630219aab54c93b10745ebc48e67b98545102ac19f9caba
+EBUILD swift-4.0.2-r2.ebuild 4558 BLAKE2B d165cff1904f1c020d1546a421c09bfd69ff32f4e1af5fb486a3f365b3c3e41bf318c563ae0a7039c594e2661f4ce4cddd4485ee88870db29a444c453cae3d00 SHA512 8e6f4b95b3e152ff3764fbd035b06edd2949c457a2903bc695214c5ff537b1e2e55336305b8e53d29ef486489c22d6cabb73f9e7c629c76f0a2df3bf15ad2aa3
+EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B a57804add27273ead383d2ad8f6bdfbcdf4913803b716aab35e9383bc19680887991f2ac3f2ddd38a32bbe67c30d00e731985adaac88739420a2da158eb12be1 SHA512 e2f3273e1cf582d233ff31e5d602361e3e4eefe46ed6423d51cf17a457dbb439d42ec2a521538d6e82020682c23e5fe1db7df13dde182f5a5b8ec6d21995106f
MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch
new file mode 100644
index 000000000000..37918db1980f
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-qt-5.15-compatibility.patch
@@ -0,0 +1,10 @@
+--- a/Swift/QtUI/Roster/GroupItemDelegate.cpp
++++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp
+@@ -7,6 +7,7 @@
+ #include <Swift/QtUI/Roster/GroupItemDelegate.h>
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ #include <QtDebug>
+
diff --git a/net-im/swift/swift-4.0.2-r2.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild
index b24e201e6521..7075d51f6f81 100644
--- a/net-im/swift/swift-4.0.2-r2.ebuild
+++ b/net-im/swift/swift-4.0.2-r2.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+ "${FILESDIR}"/${P}-qt-5.15-compatibility.patch
)
src_prepare() {
diff --git a/net-im/swift/swift-4.0.2-r3.ebuild b/net-im/swift/swift-4.0.2-r3.ebuild
deleted file mode 100644
index efae168146b6..000000000000
--- a/net-im/swift/swift-4.0.2-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit gnome2-utils python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
-HOMEPAGE="https://www.swift.im/"
-SRC_URI="
- https://swift.im/downloads/releases/${P}/${P}.tar.gz
- https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="~amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
-REQUIRED_USE="
- || ( icu idn )
- gconf? ( client )
- spell? ( client )
-"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/boost:=
- dev-libs/openssl:0=
- net-libs/libnatpmp
- net-libs/miniupnpc:=
- sys-libs/zlib
- client? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtwebkit:5
- dev-qt/qtx11extras:5
- net-dns/avahi
- )
- expat? ( dev-libs/expat )
- !expat? ( dev-libs/libxml2:2 )
- gconf? ( gnome-base/gconf:2 )
- icu? ( dev-libs/icu:= )
- idn? ( net-dns/libidn:= )
- lua? ( dev-lang/lua:= )
- spell? ( app-text/hunspell:= )
-"
-
-DEPEND="
- ${RDEPEND}
- >=dev-util/scons-3.0.1-r3
- client? ( dev-qt/linguist-tools:5 )
- test? ( net-dns/avahi )
-"
-
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
-RESTRICT="test"
-
-DOCS=(
- "DEVELOPMENT.md"
- "README.md"
- "Swiften/ChangeLog.md"
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-boost-1.69-compatibility.patch
- "${WORKDIR}"/${P}-python3-compatibility.patch
- "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-)
-
-src_prepare() {
- default
-
- # Don't include '/usr/lib*' in the link command line for `swiften-config`
- sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
-
- # Hack for finding Qt system libs
- mkdir "${T}"/qt || die
- ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
- ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
- ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
-
- # Remove parts of Swift, which a user don't want to compile
- if ! use client; then rm -fr Swift Slimber || die; fi
- if ! use lua; then rm -fr Sluift || die; fi
- if ! use zeroconf; then
- rm -fr Limber || die
- if use client; then rm -fr Slimber || die; fi
- fi
-
- # Remove '3rdParty', as the system libs should be used
- # `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
- local my3rdparty=(
- Boost
- Breakpad
- DocBook
- Expat
- LCov
- Ldns
- LibIDN
- LibMiniUPnPc
- LibNATPMP
- Lua
- OpenSSL
- SCons
- SQLite
- Unbound
- ZLib
- )
-
- if use test; then
- cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
- else
- rm -fr 3rdParty || die
- fi
-}
-
-src_configure() {
- MYSCONS=(
- ar="$(tc-getAR)"
- allow_warnings="yes"
- assertions="no"
- build_examples="yes"
- boost_bundled_enable="false"
- boost_force_bundled="false"
- cc="$(tc-getCC)"
- ccache="no"
- ccflags="${CFLAGS}"
- coverage="no"
- cxx="$(tc-getCXX)"
- cxxflags="${CXXFLAGS}"
- debug="no"
- distcc="no"
- experimental="no"
- experimental_ft="yes"
- hunspell_enable="$(usex spell)"
- icu="$(usex icu)"
- install_git_hooks="no"
- libidn_bundled_enable="false"
- libminiupnpc_force_bundled="false"
- libnatpmp_force_bundled="false"
- link="$(tc-getCXX)"
- linkflags="${LDFLAGS}"
- max_jobs="no"
- optimize="no"
- qt="${T}/qt"
- qt5="$(usex client)"
- swiften_dll="true"
- swift_mobile="no"
- target="native"
- test="none"
- try_avahi="$(usex client)"
- try_expat="$(usex expat)"
- try_gconf="$(usex gconf)"
- try_libidn="$(usex idn)"
- try_libxml="$(usex !expat)"
- tls_backend="openssl"
- unbound="no"
- V="1"
- valgrind="no"
- zlib_bundled_enable="false"
- )
-}
-
-src_compile() {
- local myesconsinstall=(
- Swiften
- $(usex client Swift '')
- $(usex lua Sluift '')
- $(usex zeroconf Limber '')
- $(usex zeroconf "$(usex client Slimber '')" '')
- )
-
- escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
- MYSCONS=(
- V="1"
- )
-
- escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
- local myesconsinstall=(
- SWIFTEN_INSTALLDIR="${ED}/usr"
- SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
- $(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
- $(usex lua "SLUIFT_DIR=${ED}/usr" '')
- $(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
- "${ED}"
- )
-
- escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
- use zeroconf && dobin Limber/limber
- use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
- use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
- einstalldocs
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/net-im/swift/swift-4.0.2-r4.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild
new file mode 100644
index 000000000000..f32b568d38f0
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r4.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 scons-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="
+ https://swift.im/downloads/releases/${P}/${P}.tar.gz
+ https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
+REQUIRED_USE="
+ || ( icu idn )
+ gconf? ( client )
+ spell? ( client )
+"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/boost:=
+ dev-libs/openssl:0=
+ net-libs/libnatpmp
+ net-libs/miniupnpc:=
+ sys-libs/zlib
+ client? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtx11extras:5
+ net-dns/avahi
+ )
+ expat? ( dev-libs/expat )
+ !expat? ( dev-libs/libxml2:2 )
+ gconf? ( gnome-base/gconf:2 )
+ icu? ( dev-libs/icu:= )
+ idn? ( net-dns/libidn:= )
+ lua? ( dev-lang/lua:= )
+ spell? ( app-text/hunspell:= )
+"
+
+DEPEND="
+ ${RDEPEND}
+ >=dev-util/scons-3.0.1-r3
+ client? ( dev-qt/linguist-tools:5 )
+ test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+ "DEVELOPMENT.md"
+ "README.md"
+ "Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-boost-1.69-compatibility.patch
+ "${WORKDIR}"/${P}-python3-compatibility.patch
+ "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+ "${FILESDIR}"/${P}-qt-5.15-compatibility.patch
+)
+
+src_prepare() {
+ default
+
+ # Don't include '/usr/lib*' in the link command line for `swiften-config`
+ sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
+ # Hack for finding Qt system libs
+ mkdir "${T}"/qt || die
+ ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+ ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+ ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
+
+ # Remove parts of Swift, which a user don't want to compile
+ if ! use client; then rm -fr Swift Slimber || die; fi
+ if ! use lua; then rm -fr Sluift || die; fi
+ if ! use zeroconf; then
+ rm -fr Limber || die
+ if use client; then rm -fr Slimber || die; fi
+ fi
+
+ # Remove '3rdParty', as the system libs should be used
+ # `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+ local my3rdparty=(
+ Boost
+ Breakpad
+ DocBook
+ Expat
+ LCov
+ Ldns
+ LibIDN
+ LibMiniUPnPc
+ LibNATPMP
+ Lua
+ OpenSSL
+ SCons
+ SQLite
+ Unbound
+ ZLib
+ )
+
+ if use test; then
+ cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+ else
+ rm -fr 3rdParty || die
+ fi
+}
+
+src_configure() {
+ MYSCONS=(
+ ar="$(tc-getAR)"
+ allow_warnings="yes"
+ assertions="no"
+ build_examples="yes"
+ boost_bundled_enable="false"
+ boost_force_bundled="false"
+ cc="$(tc-getCC)"
+ ccache="no"
+ ccflags="${CFLAGS}"
+ coverage="no"
+ cxx="$(tc-getCXX)"
+ cxxflags="${CXXFLAGS}"
+ debug="no"
+ distcc="no"
+ experimental="no"
+ experimental_ft="yes"
+ hunspell_enable="$(usex spell)"
+ icu="$(usex icu)"
+ install_git_hooks="no"
+ libidn_bundled_enable="false"
+ libminiupnpc_force_bundled="false"
+ libnatpmp_force_bundled="false"
+ link="$(tc-getCXX)"
+ linkflags="${LDFLAGS}"
+ max_jobs="no"
+ optimize="no"
+ qt="${T}/qt"
+ qt5="$(usex client)"
+ swiften_dll="true"
+ swift_mobile="no"
+ target="native"
+ test="none"
+ try_avahi="$(usex client)"
+ try_expat="$(usex expat)"
+ try_gconf="$(usex gconf)"
+ try_libidn="$(usex idn)"
+ try_libxml="$(usex !expat)"
+ tls_backend="openssl"
+ unbound="no"
+ V="1"
+ valgrind="no"
+ zlib_bundled_enable="false"
+ )
+}
+
+src_compile() {
+ local myesconsinstall=(
+ Swiften
+ $(usex client Swift '')
+ $(usex lua Sluift '')
+ $(usex zeroconf Limber '')
+ $(usex zeroconf "$(usex client Slimber '')" '')
+ )
+
+ escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+ MYSCONS=(
+ V="1"
+ )
+
+ escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+ local myesconsinstall=(
+ SWIFTEN_INSTALLDIR="${ED}/usr"
+ SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+ $(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
+ $(usex lua "SLUIFT_DIR=${ED}/usr" '')
+ $(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+ "${ED}"
+ )
+
+ escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+ use zeroconf && dobin Limber/limber
+ use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+ use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use client && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use client && xdg_icon_cache_update
+}
--
cgit v1.2.3