diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /net-im/swift | |
parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) |
gentoo resync : 29.01.2021
Diffstat (limited to 'net-im/swift')
-rw-r--r-- | net-im/swift/Manifest | 5 | ||||
-rw-r--r-- | net-im/swift/metadata.xml | 4 | ||||
-rw-r--r-- | net-im/swift/swift-4.0.2-r102.ebuild | 4 | ||||
-rw-r--r-- | net-im/swift/swift-4.0.2-r4.ebuild | 216 |
4 files changed, 4 insertions, 225 deletions
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 89d2aa966275..6f626a0da558 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -3,6 +3,5 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8 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-r102.ebuild 4218 BLAKE2B 83383c34373c3639b5fcb25abf72454de80fd0cfc7ffe651f53ac9989a6c3638ee8304cc858cee1904ef09380b059031cce4c91791bcd51a7c874a2ccc587fce SHA512 8342c45619e529c60b8c5dc54d262123162bd968f46380fe8170db955c4ed8a584b86504ce9736044ffc8c324c6fee9cb55c9c6470344c7dbe55a345a303a4f1 -EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d -MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7 +EBUILD swift-4.0.2-r102.ebuild 4217 BLAKE2B f5ba2a95946c288699f2728632d1f109e508cca37a2f57cd8d13ec628d4b8755eef05a0cec2b4c33d2f7de352ef31a99df4a8509b620719ebfe813e208282bdf SHA512 bd7db3bd38d52706acf6b8a036ab060f71e49f9710d1f02c2ad0554f17860e632e743eafe49ab3f13968561300e13d48c611fc40a02095057930d7e81a0f8b78 +MISC metadata.xml 683 BLAKE2B b78b308c6d573452923df936cf3a6dc4a83a35969638709eb3a4e5d9808cb2f10fa832d759f641a29fdc13c99f048d532ed59a4beb02cf60b2768afdb700a347 SHA512 df7cca1c6156bbbf766d021f718d09e2e18f27bae0acce5bb30bcd0f3ab00e2dfa62cc8c9ae7054b15d76f94d43e890391e4ba45851c8eb5e83af3e289b6a8fd diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml index 8c02d4f0e0a5..0047368b4bc6 100644 --- a/net-im/swift/metadata.xml +++ b/net-im/swift/metadata.xml @@ -16,8 +16,4 @@ cross-platform, and performant C++ library for implementing XMPP applications. </longdescription> - <use> - <flag name="client">Build the full graphical XMPP client.</flag> - <flag name="gconf">Enable configuration through <pkg>gnome-base/gconf</pkg>.</flag> - </use> </pkgmetadata> diff --git a/net-im/swift/swift-4.0.2-r102.ebuild b/net-im/swift/swift-4.0.2-r102.ebuild index 00166ea98235..8b4eb91b1560 100644 --- a/net-im/swift/swift-4.0.2-r102.ebuild +++ b/net-im/swift/swift-4.0.2-r102.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" SLOT="4/0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="expat +icu +idn lua test zeroconf" REQUIRED_USE=" || ( icu idn ) diff --git a/net-im/swift/swift-4.0.2-r4.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild deleted file mode 100644 index 19967be43386..000000000000 --- a/net-im/swift/swift-4.0.2-r4.ebuild +++ /dev/null @@ -1,216 +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 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:0= ) - 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 -} |