summaryrefslogtreecommitdiff
path: root/net-im/swift
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
commit441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree6a5171dd615dfeee62a45044144c66e864738fb0 /net-im/swift
parentab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'net-im/swift')
-rw-r--r--net-im/swift/Manifest2
-rw-r--r--net-im/swift/swift-4.0.2-r101.ebuild (renamed from net-im/swift/swift-4.0.2-r100.ebuild)57
2 files changed, 13 insertions, 46 deletions
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 8915ca7a2424..28aaeee8d6b3 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,6 +3,6 @@ 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-r100.ebuild 5049 BLAKE2B b07dd02728d4fb65737389776fae9baa58b794d99321743c7a297c75ecd4948939434ced0936b33f83c44d7910b42957d1ef26f2551a2de900d5d8c6aba901ef SHA512 2408c703ec8fee9af7da03a67e7420bce2f3de7548858d5031393b27e1d43e6ce4ba25864f32fc523d956169273e188891eb2ee0477d7808d809cd34671d076c
+EBUILD swift-4.0.2-r101.ebuild 4209 BLAKE2B 1ea12e41d23960c801c7cc1cb1c40756e96d6d390fdba842722b980f108ffde9983ddd19c42d90e2a33fc9d9b6400281ca4fd07b1e67ff6afdb5358bc6e92494 SHA512 ed7171dd6dd363e0fa96a1a222902737e5c86af6db6fe27dd8d9bd2c99ef8c245dccd8aeef17e6ff6d37fc6407e9fab66551d7d52c028c280910db37a33e71ae
EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d
MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r100.ebuild b/net-im/swift/swift-4.0.2-r101.ebuild
index c41fea304bf0..ec9222bf927d 100644
--- a/net-im/swift/swift-4.0.2-r100.ebuild
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -6,7 +6,7 @@ EAPI=7
LUA_COMPAT=( lua5-{1..2} luajit )
PYTHON_COMPAT=( python3_{6..9} )
-inherit lua-single python-any-r1 scons-utils toolchain-funcs xdg-utils
+inherit lua-single python-any-r1 scons-utils toolchain-funcs
DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
HOMEPAGE="https://www.swift.im/"
@@ -17,12 +17,10 @@ SRC_URI="
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"
+IUSE="expat +icu +idn lua test zeroconf"
REQUIRED_USE="
|| ( icu idn )
- gconf? ( client )
lua? ( ${LUA_REQUIRED_USE} )
- spell? ( client )
"
RDEPEND="
@@ -32,31 +30,16 @@ RDEPEND="
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? ( ${LUA_DEPS} )
- spell? ( app-text/hunspell:= )
"
DEPEND="
${RDEPEND}
>=dev-util/scons-3.0.1-r3
- client? ( dev-qt/linguist-tools:5 )
test? ( net-dns/avahi )
"
@@ -77,8 +60,8 @@ PATCHES=(
)
pkg_setup() {
+ lua-single_pkg_setup
python-any-r1_pkg_setup
- use lua && lua-single_pkg_setup
}
src_prepare() {
@@ -97,12 +80,9 @@ src_prepare() {
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
+ rm -fr Swift Slimber || die
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
+ if ! use zeroconf; then rm -fr Limber || die; fi
# Remove '3rdParty', as the system libs should be used
# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
@@ -149,7 +129,7 @@ src_configure() {
distcc="no"
experimental="no"
experimental_ft="yes"
- hunspell_enable="$(usex spell)"
+ hunspell_enable="no"
icu="$(usex icu)"
install_git_hooks="no"
libidn_bundled_enable="false"
@@ -157,20 +137,20 @@ src_configure() {
libnatpmp_force_bundled="false"
link="$(tc-getCXX)"
linkflags="${LDFLAGS}"
- lua_includedir="$(lua_get_include_dir)"
- lua_libdir="${EPREFIX}/usr/$(get_libdir)"
- lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+ $(usex lua "lua_includedir=$(lua_get_include_dir)" '')
+ $(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '')
+ $(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '')
max_jobs="no"
optimize="no"
qt="${T}/qt"
- qt5="$(usex client)"
+ qt5="no"
swiften_dll="true"
swift_mobile="no"
target="native"
test="none"
- try_avahi="$(usex client)"
+ try_avahi="no"
try_expat="$(usex expat)"
- try_gconf="$(usex gconf)"
+ try_gconf="no"
try_libidn="$(usex idn)"
try_libxml="$(usex !expat)"
tls_backend="openssl"
@@ -184,10 +164,8 @@ src_configure() {
src_compile() {
local myesconsinstall=(
Swiften
- $(usex client Swift '')
$(usex lua Sluift '')
$(usex zeroconf Limber '')
- $(usex zeroconf "$(usex client Slimber '')" '')
)
escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
@@ -205,7 +183,6 @@ 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}"
@@ -214,16 +191,6 @@ src_install() {
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
-}