subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-im\/swift\/"

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

2024-03-16 Thread Conrad Kostecki

commit: 6ae8f0c2bc5a33b534d1f73cbf09f32940d02057
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Mar 16 20:49:27 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Mar 16 20:49:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae8f0c2

net-im/swift: fix compilation with libxml2-2.12

Closes: https://bugs.gentoo.org/923288
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch  | 11 +++
 net-im/swift/swift-4.0.3-r2.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git a/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch 
b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
new file mode 100644
index ..b08a480835f3
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/Swiften/Parser/LibXMLParser.cpp
 b/Swiften/Parser/LibXMLParser.cpp
+@@ -97,7 +97,7 @@
+ if (xmlParseChunk(p->context_, data.c_str(), 
boost::numeric_cast(data.size()), false) == XML_ERR_OK) {
+ return true;
+ }
+-xmlError* error = xmlCtxtGetLastError(p->context_);
++const xmlError* error = xmlCtxtGetLastError(p->context_);
+ if (error->code == XML_WAR_NS_URI || error->code == 
XML_WAR_NS_URI_RELATIVE) {
+ xmlCtxtResetLastError(p->context_);
+ p->context_->errNo = XML_ERR_OK;

diff --git a/net-im/swift/swift-4.0.3-r2.ebuild 
b/net-im/swift/swift-4.0.3-r2.ebuild
index 686e9cf6c7c7..792b487871ed 100644
--- a/net-im/swift/swift-4.0.3-r2.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.2-boost-1.69-compatibility.patch
"${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch
"${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch
+   "${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch
"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
 )

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2024-03-09 Thread Conrad Kostecki

commit: a00fa7a4cb9816198adbbd8dbf8c4cd94ff2bc98
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Mar  9 17:04:50 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Mar  9 17:41:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00fa7a4

net-im/swift: add python3.12 support

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/{swift-4.0.3-r1.ebuild => swift-4.0.3-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/swift/swift-4.0.3-r1.ebuild 
b/net-im/swift/swift-4.0.3-r2.ebuild
similarity index 99%
rename from net-im/swift/swift-4.0.3-r1.ebuild
rename to net-im/swift/swift-4.0.3-r2.ebuild
index ba59f4d41977..686e9cf6c7c7 100644
--- a/net-im/swift/swift-4.0.3-r1.ebuild
+++ b/net-im/swift/swift-4.0.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit lua-single python-any-r1 scons-utils toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/files/

2023-11-24 Thread Ulrich Müller

commit: 7e8a361d04eb654e379f3f59a026c993a0689fbe
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Nov 23 17:17:42 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Nov 24 17:36:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8a361d

net-im/swift: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Ulrich Müller  gentoo.org>

 .../files/swift-4.0.2-qt-5.11-compatibility.patch  | 35 --
 1 file changed, 35 deletions(-)

diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch 
b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
deleted file mode 100644
index db633945b49d..
--- a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001
-From: Tobias Markmann 
-Date: Thu, 21 Jun 2018 13:04:56 +0200
-Subject: Add missing include for QAbstractItemModel
-
-This fixes building Swift with Qt 5.11.
-
-Test-Information:
-
-Builds and tests pass on macOS 10.13.5 with Qt 5.11.0.
-
-Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777
-
-diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h 
b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
-index 0714ac1..fe536ab 100644
 a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
-+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2016 Isode Limited.
-+ * Copyright (c) 2010-2018 Isode Limited.
-  * All rights reserved.
-  * See the COPYING file for more information.
-  */
-@@ -8,6 +8,7 @@
- 
- #include 
- 
-+#include 
- #include 
- 
- #include 
--- 
-cgit v0.10.2-6-g49f6
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2023-11-11 Thread Conrad Kostecki

commit: 20449d22eec008408a142f0d0cdb43ba4a096234
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 11 23:24:38 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 11 23:24:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20449d22

net-im/swift: amd64 stable

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.3-r1.ebuild 
b/net-im/swift/swift-4.0.3-r1.ebuild
index 0cd230963430..68610ca1aa45 100644
--- a/net-im/swift/swift-4.0.3-r1.ebuild
+++ b/net-im/swift/swift-4.0.3-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 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 )

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2023-11-11 Thread Conrad Kostecki

commit: f838601ccda3870df4b0640c2584cac557c23597
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 11 23:25:20 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 11 23:25:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f838601c

net-im/swift: drop 4.0.2-r102

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/Manifest|   2 -
 net-im/swift/swift-4.0.2-r102.ebuild | 204 ---
 2 files changed, 206 deletions(-)

diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 877ecee33790..51cfbe5fc7ed 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,4 +1,2 @@
-DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 
17b75950bba9252bb76e30eb9fadb9ed6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a
 SHA512 
fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
-DIST swift-4.0.2.tar.gz 19083393 BLAKE2B 
de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812
 SHA512 
b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
 DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B 
ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9
 SHA512 
95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f
 DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 
23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07
 SHA512 
59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
deleted file mode 100644
index 421396f2fea7..
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit lua-single 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/${P}-python3-compatibility.patch.gz;
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="amd64"
-IUSE="expat +icu +idn lua test zeroconf"
-REQUIRED_USE="
-   || ( icu idn )
-   lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-libs/boost:=
-   dev-libs/openssl:0=
-   net-libs/libnatpmp
-   net-libs/miniupnpc:=
-   sys-libs/zlib
-   expat? ( dev-libs/expat )
-   !expat? ( dev-libs/libxml2:2 )
-   icu? ( dev-libs/icu:= )
-   idn? ( net-dns/libidn:= )
-   lua? ( ${LUA_DEPS} )
-"
-
-DEPEND="
-   ${RDEPEND}
-   >=dev-util/scons-3.0.1-r3
-   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
-)
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use lua && lua-single_pkg_setup
-}
-
-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
-
-   # Use correct LIBDIR for Lua
-   sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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
-   rm -fr Swift Slimber || die
-   if ! use lua; then rm -fr Sluift || die; 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
-   local my3rdparty=(
-   Boost
-   Breakpad
-   DocBook
-   Expat
-   LCov
-   Ldns
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2023-10-04 Thread Conrad Kostecki

commit: 4c378502eba044b9a0417157c211ba75623db718
Author: Robert Förster  gmake  de>
AuthorDate: Wed Oct  4 21:20:52 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct  4 21:54:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c378502

net-im/swift: fix soname

Signed-off-by: Robert Förster  gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/33198
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/{swift-4.0.3.ebuild => swift-4.0.3-r1.ebuild} | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-im/swift/swift-4.0.3.ebuild 
b/net-im/swift/swift-4.0.3-r1.ebuild
similarity index 97%
rename from net-im/swift/swift-4.0.3.ebuild
rename to net-im/swift/swift-4.0.3-r1.ebuild
index 36ac7c1ee8ed..0cd230963430 100644
--- a/net-im/swift/swift-4.0.3.ebuild
+++ b/net-im/swift/swift-4.0.3-r1.ebuild
@@ -112,6 +112,11 @@ src_prepare() {
else
rm -fr 3rdParty || die
fi
+
+   if [[ ! -f VERSION.swift ]] ; then
+   # Source tarball from git doesn't include this file
+   echo "${PV}" > VERSION.swift || die
+   fi
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

2023-10-04 Thread Conrad Kostecki

commit: 97e8dff60cf6729e421d7efb4cd80006faead8e6
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Oct  4 14:41:06 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct  4 14:41:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e8dff6

net-im/swift: add 4.0.3

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/Manifest  |   2 +
 .../files/swift-4.0.3-gcc11-compatibility.patch|  13 ++
 .../files/swift-4.0.3-reproducible-build.patch |  21 +++
 net-im/swift/swift-4.0.3.ebuild| 207 +
 4 files changed, 243 insertions(+)

diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 197a384ef7aa..877ecee33790 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,2 +1,4 @@
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 
17b75950bba9252bb76e30eb9fadb9ed6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a
 SHA512 
fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B 
de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812
 SHA512 
b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
+DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B 
ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9
 SHA512 
95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f
+DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 
23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07
 SHA512 
59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733

diff --git a/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch 
b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
new file mode 100644
index ..4d94c2d10503
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
@@ -0,0 +1,13 @@
+diff --git a/Swift/Controllers/ShowProfileController.h 
b/Swift/Controllers/ShowProfileController.h
+index 0d01ba1a0..5dc7197ff 100644
+--- a/Swift/Controllers/ShowProfileController.h
 b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+ 
+ #include 
+ 
++#include 
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;

diff --git a/net-im/swift/files/swift-4.0.3-reproducible-build.patch 
b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
new file mode 100644
index ..951678f2303f
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
@@ -0,0 +1,21 @@
+commit 39a684108ae5938105498e7744e70962308cde7b
+Author: kpcyrd 
+Date:   Wed Aug 25 23:30:17 2021 +0200
+
+Reproducible Builds: Sort directory contents at build
+
+diff --git a/Swiften/SConscript b/Swiften/SConscript
+index f52637bdb..334f4489e 100644
+--- a/Swiften/SConscript
 b/Swiften/SConscript
+@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" :
+ swiften_includes = []
+ swiften_public_includes = []
+ top_path = env.Dir("..").abspath
+-for root, dirs, files in os.walk(env.Dir(".").abspath) :
++for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) :
++dirs.sort()
++files.sort()
+ if root.endswith("UnitTest") :
+ continue
+ for file in files :

diff --git a/net-im/swift/swift-4.0.3.ebuild b/net-im/swift/swift-4.0.3.ebuild
new file mode 100644
index ..36ac7c1ee8ed
--- /dev/null
+++ b/net-im/swift/swift-4.0.3.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit lua-single 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/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2
+   
https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz
+"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="expat +icu +idn lua test zeroconf"
+REQUIRED_USE="
+   || ( icu idn )
+   lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RDEPEND="
+   dev-db/sqlite:3
+   dev-libs/boost:=
+   dev-libs/openssl:0=
+   net-libs/libnatpmp
+   net-libs/miniupnpc:=
+   sys-libs/zlib
+   expat? ( dev-libs/expat )
+   !expat? ( dev-libs/libxml2:2 )
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2022-11-03 Thread Conrad Kostecki

commit: a246ee1569f15e70d930bf29cad77521fa0386f0
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Nov  3 23:04:31 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Nov  3 23:14:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a246ee15

net-im/swift: fix QA StaticSrcUri

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
index d96008fd90ac..da3a27250c9d 100644
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -12,7 +12,7 @@ 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;
+   
https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz;
 
 LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
 SLOT="4/0"

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2022-11-03 Thread Conrad Kostecki

commit: 5dabfe0ed39b44e16470952a9befcad63cc6cb2c
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Nov  2 20:35:17 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Nov  3 22:37:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dabfe0e

net-im/swift: add python3.11 support

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
index df585e184aac..d96008fd90ac 100644
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit lua-single python-any-r1 scons-utils toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2022-04-13 Thread Sam James

commit: a7fcfcad88209e8adbecf3213cc49883cdc57061
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 13 14:45:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 13 14:45:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fcfcad

net-im/swift: retire andrey_utkin

Signed-off-by: Sam James  gentoo.org>

 net-im/swift/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index 0b39e59c61c1..9246b510f67a 100644
--- a/net-im/swift/metadata.xml
+++ b/net-im/swift/metadata.xml
@@ -5,10 +5,6 @@
conik...@gentoo.org
Conrad Kostecki

-   
-   andrey_ut...@gentoo.org
-   Andrey Utkin
-   

Swift is an elegant, secure, adaptable and intuitive XMPP 
client,
with features that make it suitable for a wide range of use 
scenarios.

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2021-07-01 Thread Conrad Kostecki

commit: 45c07f3fc4ec0c084f20bd02896f0e4d85bc82ef
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Jul  1 20:43:03 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jul  1 21:15:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c07f3f

net-im/swift: add python3.10 support

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
index 41eaf45dd36..df585e184aa 100644
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit lua-single python-any-r1 scons-utils toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2021-03-07 Thread Conrad Kostecki

commit: 330346ce66cae755165a2a786527b0605d521279
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar  7 16:26:14 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar  7 16:27:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330346ce

net-im/swift: fix compilation with installed dev-libs/libedit

Closes: https://bugs.gentoo.org/773961

Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
index 50967ebf691..41eaf45dd36 100644
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -132,6 +132,9 @@ src_configure() {
hunspell_enable="no"
icu="$(usex icu)"
install_git_hooks="no"
+   # Use 'DISABLE' as an invalid lib name, so no editline lib is 
used,
+   # as current version is not compatible and compilation will 
fail.
+   editline_libname="DISABLE"
libidn_bundled_enable="false"
libminiupnpc_force_bundled="false"
libnatpmp_force_bundled="false"

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2021-01-27 Thread Conrad Kostecki

commit: 6e5554bc49e69fc438269d91774952e7ac6f673f
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Jan 27 20:13:05 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Jan 27 20:13:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5554bc

net-im/swift: drop old version

Closes: https://bugs.gentoo.org/712174
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/metadata.xml  |   4 -
 net-im/swift/swift-4.0.2-r4.ebuild | 216 -
 2 files changed, 220 deletions(-)

diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index 8c02d4f0e0a..0047368b4bc 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.

-   
-   Build the full graphical XMPP client.
-   Enable configuration through 
gnome-base/gconf.
-   
 

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 19967be4338..000
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2021-01-27 Thread Sam James

commit: 8bc3938a294a5e46f104f016bfdd0168f05c9966
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 27 19:55:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 27 19:55:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc3938a

net-im/swift: Stabilize 4.0.2-r102 amd64, #767322

Signed-off-by: Sam James  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
index 00166ea9823..8b4eb91b156 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 )

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-27 Thread Conrad Kostecki

commit: 0ed47ed8a8714e1afd39144b6dbbb127e594a23a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Dec 27 14:02:13 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 27 14:02:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed47ed8

net-im/swift: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r101.ebuild | 196 ---
 1 file changed, 196 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r101.ebuild 
b/net-im/swift/swift-4.0.2-r101.ebuild
deleted file mode 100644
index ec9222bf927..000
--- a/net-im/swift/swift-4.0.2-r101.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit lua-single 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="expat +icu +idn lua test zeroconf"
-REQUIRED_USE="
-   || ( icu idn )
-   lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-libs/boost:=
-   dev-libs/openssl:0=
-   net-libs/libnatpmp
-   net-libs/miniupnpc:=
-   sys-libs/zlib
-   expat? ( dev-libs/expat )
-   !expat? ( dev-libs/libxml2:2 )
-   icu? ( dev-libs/icu:= )
-   idn? ( net-dns/libidn:= )
-   lua? ( ${LUA_DEPS} )
-"
-
-DEPEND="
-   ${RDEPEND}
-   >=dev-util/scons-3.0.1-r3
-   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
-)
-
-pkg_setup() {
-   lua-single_pkg_setup
-   python-any-r1_pkg_setup
-}
-
-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
-
-   # Use correct LIBDIR for Lua
-   sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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
-   rm -fr Swift Slimber || die
-   if ! use lua; then rm -fr Sluift || die; 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
-   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="no"
-   icu="$(usex icu)"
-   install_git_hooks="no"
-   libidn_bundled_enable="false"
-   libminiupnpc_force_bundled="false"
-   libnatpmp_force_bundled="false"
-   link="$(tc-getCXX)"
-   linkflags="${LDFLAGS}"
-   $(usex lua "lua_includedir=$(lua_get_include_dir)" '')
-   $(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '')
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-27 Thread Conrad Kostecki

commit: 635645e4df3d22ce0163e2c070b29f7e661f3786
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Dec 27 13:50:27 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 27 14:02:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635645e4

net-im/swift: fix compilation

Closes: https://bugs.gentoo.org/761691
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r102.ebuild | 201 +++
 1 file changed, 201 insertions(+)

diff --git a/net-im/swift/swift-4.0.2-r102.ebuild 
b/net-im/swift/swift-4.0.2-r102.ebuild
new file mode 100644
index 000..00166ea9823
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r102.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit lua-single 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="expat +icu +idn lua test zeroconf"
+REQUIRED_USE="
+   || ( icu idn )
+   lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RDEPEND="
+   dev-db/sqlite:3
+   dev-libs/boost:=
+   dev-libs/openssl:0=
+   net-libs/libnatpmp
+   net-libs/miniupnpc:=
+   sys-libs/zlib
+   expat? ( dev-libs/expat )
+   !expat? ( dev-libs/libxml2:2 )
+   icu? ( dev-libs/icu:= )
+   idn? ( net-dns/libidn:= )
+   lua? ( ${LUA_DEPS} )
+"
+
+DEPEND="
+   ${RDEPEND}
+   >=dev-util/scons-3.0.1-r3
+   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
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use lua && lua-single_pkg_setup
+}
+
+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
+
+   # Use correct LIBDIR for Lua
+   sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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
+   rm -fr Swift Slimber || die
+   if ! use lua; then rm -fr Sluift || die; 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
+   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="no"
+   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"
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-25 Thread Conrad Kostecki

commit: 51b41f0667ac598c839348119eca17e2460afd0a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Dec 25 14:39:14 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Dec 25 14:39:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b41f06

net-im/swift: remove double definition

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r101.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r101.ebuild 
b/net-im/swift/swift-4.0.2-r101.ebuild
index 449ae295a37..ec9222bf927 100644
--- a/net-im/swift/swift-4.0.2-r101.ebuild
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -140,9 +140,6 @@ src_configure() {
$(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))" '')
-   lua_includedir="$(lua_get_include_dir)"
-   lua_libdir="${EPREFIX}/usr/$(get_libdir)"
-   lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
max_jobs="no"
optimize="no"
qt="${T}/qt"

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-24 Thread Conrad Kostecki

commit: 7fb18484cd11cdf968ea79ac82251afb8339d7e7
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Dec 25 00:40:43 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Dec 25 00:44:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb18484

net-im/swift: fix non lua compilation

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r101.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.2-r101.ebuild 
b/net-im/swift/swift-4.0.2-r101.ebuild
index 3027230dbbf..449ae295a37 100644
--- a/net-im/swift/swift-4.0.2-r101.ebuild
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -60,8 +60,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+   lua-single_pkg_setup
python-any-r1_pkg_setup
-   use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -137,6 +137,9 @@ src_configure() {
libnatpmp_force_bundled="false"
link="$(tc-getCXX)"
linkflags="${LDFLAGS}"
+   $(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))" '')
lua_includedir="$(lua_get_include_dir)"
lua_libdir="${EPREFIX}/usr/$(get_libdir)"
lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-20 Thread Conrad Kostecki

commit: 1bc0883e93b717c2a7e2a74da2d8adb5cd10f7d1
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Dec 20 23:27:33 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 20 23:28:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc0883e

net-im/swift: drop old version

Bug: https://bugs.gentoo.org/712174
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r100.ebuild | 229 ---
 1 file changed, 229 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r100.ebuild 
b/net-im/swift/swift-4.0.2-r100.ebuild
deleted file mode 100644
index c41fea304bf..000
--- a/net-im/swift/swift-4.0.2-r100.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-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 )
-   lua? ( ${LUA_REQUIRED_USE} )
-   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? ( ${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 )
-"
-
-# 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
-)
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-   use lua && lua-single_pkg_setup
-}
-
-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
-
-   # Use correct LIBDIR for Lua
-   sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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"
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-20 Thread Conrad Kostecki

commit: abd6b3317ae3fb1a5259ba6200654e59a0ed0833
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Dec 20 23:26:26 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec 20 23:28:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd6b331

net-im/swift: drop client use flag

Since dev-qt/qtwebkit:5 it deprecated and will be removed in future,
dropping all related features from ebuild, which need this dep.

This is basically the 'client' part, a full featured XMPP client, while
the lib part remains present, as it's needed by net-im/spectrum2.

Bug: https://bugs.gentoo.org/712174
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r101.ebuild | 196 +++
 1 file changed, 196 insertions(+)

diff --git a/net-im/swift/swift-4.0.2-r101.ebuild 
b/net-im/swift/swift-4.0.2-r101.ebuild
new file mode 100644
index 000..3027230dbbf
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit lua-single 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="expat +icu +idn lua test zeroconf"
+REQUIRED_USE="
+   || ( icu idn )
+   lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RDEPEND="
+   dev-db/sqlite:3
+   dev-libs/boost:=
+   dev-libs/openssl:0=
+   net-libs/libnatpmp
+   net-libs/miniupnpc:=
+   sys-libs/zlib
+   expat? ( dev-libs/expat )
+   !expat? ( dev-libs/libxml2:2 )
+   icu? ( dev-libs/icu:= )
+   idn? ( net-dns/libidn:= )
+   lua? ( ${LUA_DEPS} )
+"
+
+DEPEND="
+   ${RDEPEND}
+   >=dev-util/scons-3.0.1-r3
+   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
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+   use lua && lua-single_pkg_setup
+}
+
+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
+
+   # Use correct LIBDIR for Lua
+   sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || 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
+   rm -fr Swift Slimber || die
+   if ! use lua; then rm -fr Sluift || die; 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
+   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="no"
+   icu="$(usex icu)"
+   install_git_hooks="no"
+   libidn_bundled_enable="false"
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-12-03 Thread Marek Szuba

commit: 00201367e7537f8da7c2bbecec6a6a3cf240a997
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec  3 12:51:55 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec  3 12:54:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00201367

net-im/swift: limit unmigrated ebuilds to dev-lang/lua:0

Signed-off-by: Marek Szuba  gentoo.org>

 net-im/swift/swift-4.0.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.2-r4.ebuild 
b/net-im/swift/swift-4.0.2-r4.ebuild
index 4be7fcb239a..19967be4338 100644
--- a/net-im/swift/swift-4.0.2-r4.ebuild
+++ b/net-im/swift/swift-4.0.2-r4.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
gconf? ( gnome-base/gconf:2 )
icu? ( dev-libs/icu:= )
idn? ( net-dns/libidn:= )
-   lua? ( dev-lang/lua:= )
+   lua? ( dev-lang/lua:0= )
spell? ( app-text/hunspell:= )
 "

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/files/, net-im/swift/

2020-09-18 Thread Conrad Kostecki

commit: d86e2c0c6ee8b07019ccb674de6ef7b1e32d2b80
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Sep 18 08:01:01 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Sep 18 08:01:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86e2c0c

net-im/swift: drop old version

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...generated-files-handle-unicode-characters.patch |  38 
 net-im/swift/swift-4.0.2-r2.ebuild | 212 -
 2 files changed, 250 deletions(-)

diff --git 
a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
 
b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
deleted file mode 100644
index 7fd2e386d9d..000
--- 
a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001
-From: Thanos Doukoudakis 
-Date: Fri, 11 May 2018 11:26:39 +0100
-Subject: Make generated files handle Unicode characters
-
-This patch handles a case where some of the files used to generate COPYING,
-were containing unicode strings, which could lead to a failure when building
-sid package. The code now will check the type of the string before writing to
-the file, and if needed it will transform it to the appropriate format.
-
-Test-Information:
-Generated the sid package with package_all_platforms script with no problems.
-Created a debian sid box and tested the installation of the generated
-packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds
-through the "About" dialog in Swift.
-
-Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c
-
-diff --git a/BuildTools/SCons/Tools/textfile.py 
b/BuildTools/SCons/Tools/textfile.py
-index 89f8963..9b424f2 100644
 a/BuildTools/SCons/Tools/textfile.py
-+++ b/BuildTools/SCons/Tools/textfile.py
-@@ -113,7 +113,11 @@ def _action(target, source, env):
- lsep = None
- for s in source:
- if lsep: fd.write(lsep)
--fd.write(_do_subst(s, subs))
-+stringtowrite = _do_subst(s, subs)
-+if isinstance(stringtowrite, str):
-+  fd.write(stringtowrite)
-+elif isinstance(stringtowrite, unicode):
-+  fd.write(stringtowrite.encode('utf-8'))
- lsep = linesep
- fd.close()
- 
--- 
-cgit v0.10.2-6-g49f6
-

diff --git a/net-im/swift/swift-4.0.2-r2.ebuild 
b/net-im/swift/swift-4.0.2-r2.ebuild
deleted file mode 100644
index 7075d51f6f8..000
--- a/net-im/swift/swift-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils 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;
-
-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
-   "${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() {
-   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
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

2020-08-26 Thread Conrad Kostecki

commit: 4aeb8138d93cf2beb53622d4537e7c4a625948aa
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Aug 26 21:33:15 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Aug 26 21:34:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aeb8138

net-im/swift: fix compilation with qt-5.15

Also fixed QA notice for -r3, that the icon cache was not updated.

Closes: https://bugs.gentoo.org/739068
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/swift-4.0.2-qt-5.15-compatibility.patch  | 10 +++
 net-im/swift/swift-4.0.2-r2.ebuild |  1 +
 ...swift-4.0.2-r2.ebuild => swift-4.0.2-r4.ebuild} | 33 +-
 3 files changed, 30 insertions(+), 14 deletions(-)

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 000..37918db1980
--- /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 
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ 

diff --git a/net-im/swift/swift-4.0.2-r2.ebuild 
b/net-im/swift/swift-4.0.2-r2.ebuild
index b24e201e652..7075d51f6f8 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-r2.ebuild 
b/net-im/swift/swift-4.0.2-r4.ebuild
similarity index 84%
copy from net-im/swift/swift-4.0.2-r2.ebuild
copy to net-im/swift/swift-4.0.2-r4.ebuild
index b24e201e652..f32b568d38f 100644
--- a/net-im/swift/swift-4.0.2-r2.ebuild
+++ b/net-im/swift/swift-4.0.2-r4.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils scons-utils toolchain-funcs
+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;
+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"
+KEYWORDS="~amd64"
+IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
 REQUIRED_USE="
|| ( icu idn )
gconf? ( client )
@@ -25,7 +29,7 @@ RDEPEND="
dev-libs/openssl:0=
net-libs/libnatpmp
net-libs/miniupnpc:=
-   sys-libs/zlib:=
+   sys-libs/zlib
client? (
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -65,8 +69,9 @@ DOCS=(
 
 PATCHES=(
"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
-   "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
+   "${WORKDIR}"/${P}-python3-compatibility.patch
"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+   "${FILESDIR}"/${P}-qt-5.15-compatibility.patch
 )
 
 src_prepare() {
@@ -185,11 +190,11 @@ src_test() {
 
 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" '')
+   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}"
)
 
@@ -203,9 +208,9 @@ src_install() {
 }
 
 pkg_postinst() {
-   use client && gnome2_icon_cache_update
+   use client && xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   use client && gnome2_icon_cache_update
+   use client && xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-08-26 Thread Conrad Kostecki

commit: 04483649eebf3ebdbeb5bf138cc61969e6802899
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Aug 26 21:34:07 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Aug 26 21:35:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04483649

net-im/swift: drop old version

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r3.ebuild | 215 -
 1 file changed, 215 deletions(-)

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 efae168146b..000
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-08-24 Thread Conrad Kostecki

commit: f79bd753d5e43e52dc5fa08e467bd5ec82878a1d
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Mon Aug 24 21:32:49 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Aug 24 22:32:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79bd753

net-im/swift: add python3.9 support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/swift/swift-4.0.2-r3.ebuild 
b/net-im/swift/swift-4.0.2-r3.ebuild
index d2f464ac8c6..efae168146b 100644
--- a/net-im/swift/swift-4.0.2-r3.ebuild
+++ b/net-im/swift/swift-4.0.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit gnome2-utils python-any-r1 scons-utils toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-08-09 Thread Conrad Kostecki

commit: 82eafc8ea8cb637e5cf5e734c704c995a967
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Aug  9 11:30:44 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Aug  9 11:34:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82eafc8e

net-im/swift: migrate to python3

Also bumped to EAPI=7 and enabled client for default use flags.

Closes: https://bugs.gentoo.org/735548
Closes: https://bugs.gentoo.org/701016
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/Manifest  |   1 +
 net-im/swift/swift-4.0.2-r3.ebuild | 215 +
 2 files changed, 216 insertions(+)

diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index d0e86af54c3..197a384ef7a 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1 +1,2 @@
+DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 
17b75950bba9252bb76e30eb9fadb9ed6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a
 SHA512 
fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B 
de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812
 SHA512 
b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167

diff --git a/net-im/swift/swift-4.0.2-r3.ebuild 
b/net-im/swift/swift-4.0.2-r3.ebuild
new file mode 100644
index 000..d2f464ac8c6
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r3.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+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
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-08-01 Thread Conrad Kostecki

commit: d533bd0f6cfa75ef5bc50e5a033e2141521456f7
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Aug  1 19:19:18 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Aug  1 19:39:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d533bd0f

net-im/swift: don't include '/usr/lib*' for swiften-config

Bug: https://bugs.gentoo.org/731166
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r2.ebuild | 211 +
 1 file changed, 211 insertions(+)

diff --git a/net-im/swift/swift-4.0.2-r2.ebuild 
b/net-im/swift/swift-4.0.2-r2.ebuild
new file mode 100644
index 000..b24e201e652
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils 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;
+
+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
+   "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.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"
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-08-01 Thread Conrad Kostecki

commit: 0e8c17e566bd76373a7888666a027bcf5f9c13e2
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Aug  1 19:20:50 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Aug  1 19:40:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8c17e5

net-im/swift: drop old version

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-im/swift/swift-4.0.2-r1.ebuild | 208 -
 1 file changed, 208 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r1.ebuild 
b/net-im/swift/swift-4.0.2-r1.ebuild
deleted file mode 100644
index 40f92b5a1ab..000
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils 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;
-
-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
-   "${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
-   "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-)
-
-src_prepare() {
-   default
-
-   # 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"
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2020-02-08 Thread David Seifert

commit: b97a708cdd116bd2a465c2da191caa9ba5a24c9f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb  8 16:51:54 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  8 16:51:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97a708c

net-im/swift: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert  gentoo.org>

 net-im/swift/swift-4.0.2-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r1.ebuild 
b/net-im/swift/swift-4.0.2-r1.ebuild
index eac7d6fa9d5..78727eb9aba 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -74,9 +74,9 @@ src_prepare() {
 
# 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
+   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

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

2019-04-16 Thread David Seifert

commit: 26b399a75b631cb550ab18b499072dc6757e4541
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Apr 16 08:48:55 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Apr 16 11:04:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b399a7

net-im/swift: add patch for boost >= 1.69

Including upstreams patch to support newer boost versions, since it
fails with boost 1.69 and newer.

Closes: https://bugs.gentoo.org/683424
Closes: https://github.com/gentoo/gentoo/pull/11705
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: David Seifert  gentoo.org>

 .../swift-4.0.2-boost-1.69-compatibility.patch | 77 ++
 net-im/swift/swift-4.0.2-r1.ebuild |  1 +
 2 files changed, 78 insertions(+)

diff --git a/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch 
b/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch
new file mode 100644
index 000..a99dc10a2e1
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-boost-1.69-compatibility.patch
@@ -0,0 +1,77 @@
+From a21993d750396d755717df21e331df87af8a0c6a Mon Sep 17 00:00:00 2001
+From: Bruce Stephens 
+Date: Wed, 9 Jan 2019 16:21:20 +
+Subject: [PATCH] Don't assume that tribool has an implicit bool conversion
+
+In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's
+explicit and we must explicitly call it.
+
+Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd
+---
+ Swiften/Network/PlatformNATTraversalWorker.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp 
b/Swiften/Network/PlatformNATTraversalWorker.cpp
+index f56de0b78b..eaa13b30d3 100644
+--- a/Swiften/Network/PlatformNATTraversalWorker.cpp
 b/Swiften/Network/PlatformNATTraversalWorker.cpp
+@@ -157,7 +157,7 @@ NATTraversalInterface* 
PlatformNATTraversalWorker::getNATTraversalInterface() co
+ miniUPnPInterface = new MiniUPnPInterface();
+ miniUPnPSupported = miniUPnPInterface->isAvailable();
+ }
+-SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported 
<< std::endl;
++SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << 
static_cast(miniUPnPSupported) << std::endl;
+ if (miniUPnPSupported) {
+ return miniUPnPInterface;
+ }
+@@ -168,7 +168,7 @@ NATTraversalInterface* 
PlatformNATTraversalWorker::getNATTraversalInterface() co
+ natPMPInterface = new NATPMPInterface();
+ natPMPSupported = natPMPInterface->isAvailable();
+ }
+-SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << 
natPMPSupported << std::endl;
++SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << 
static_cast(natPMPSupported) << std::endl;
+ if (natPMPSupported) {
+ return natPMPInterface;
+ }
+From bb3bd8a32b220b9c1ffd566da00bcd0ba546156c Mon Sep 17 00:00:00 2001
+From: Miroslaw Stein 
+Date: Fri, 18 Jan 2019 14:30:24 +
+Subject: [PATCH] Avoid deprecated boost endianess include
+
+As of Boost 1.69.0, boost/detail/endian.h is deprecated in favour of
+boost/predef/other/endian.h, and BOOST_(LITTLE|BIG)_ENDIAN by
+BOOST_ENDIAN_(LITTLE|BIG)_BYTE.
+
+Test-Information:
+
+Unit tests pass on Debian 9
+
+Change-Id: If7076c559a4e35219ff97603f50b80cfbe05b29b
+---
+ Swiften/Base/Platform.h | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Swiften/Base/Platform.h b/Swiften/Base/Platform.h
+index 4deba2bdda..22dff30b14 100644
+--- a/Swiften/Base/Platform.h
 b/Swiften/Base/Platform.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010 Isode Limited.
++ * Copyright (c) 2010-2019 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -43,9 +43,9 @@
+ #endif
+ 
+ // Endianness
+-#include 
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include 
++#if defined(BOOST_ENDIAN_LITTLE_BYTE)
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif defined(BOOST_ENDIAN_BIG_BYTE)
+ #define SWIFTEN_BIG_ENDIAN
+ #endif

diff --git a/net-im/swift/swift-4.0.2-r1.ebuild 
b/net-im/swift/swift-4.0.2-r1.ebuild
index 3505fe4cc73..eac7d6fa9d5 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -64,6 +64,7 @@ DOCS=(
 )
 
 PATCHES=(
+   "${FILESDIR}"/${P}-boost-1.69-compatibility.patch
"${FILESDIR}"/${P}-make-generated-files-handle-unicode-characters.patch
"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
 )

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2019-04-13 Thread Agostino Sarubbo

commit: ccbbcfd49fb4b8ea8dbad85247225179f24df5a7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr 13 19:08:36 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr 13 19:08:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbbcfd4

net-im/swift: amd64 stable wrt bug #682754

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-im/swift/swift-4.0.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/swift/swift-4.0.2-r1.ebuild 
b/net-im/swift/swift-4.0.2-r1.ebuild
index 1fdb1c0dd08..3505fe4cc73 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://swift.im/downloads/releases/${P}/${P}.tar.gz;
 
 LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
 SLOT="4/0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="client expat gconf +icu +idn lua spell test zeroconf"
 REQUIRED_USE="
|| ( icu idn )

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2019-01-28 Thread Andrey Utkin

commit: 7b2b971ae676028b04c1e4c9e26ea9ceeff4a594
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sun Jan 27 14:23:08 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jan 28 01:49:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2b971a

net-im/swift: drop old version

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Andrey Utkin  gentoo.org>

 net-im/swift/swift-4.0.2.ebuild | 207 
 1 file changed, 207 deletions(-)

diff --git a/net-im/swift/swift-4.0.2.ebuild b/net-im/swift/swift-4.0.2.ebuild
deleted file mode 100644
index c67278ade28..000
--- a/net-im/swift/swift-4.0.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils 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;
-
-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}-make-generated-files-handle-unicode-characters.patch
-   "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-)
-
-src_prepare() {
-   default
-
-   # 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="yes"
-   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"
-

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2018-11-27 Thread Andrey Utkin

commit: 6deb11e4f07463dd58a521697b395e5ad5ce2e54
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Nov 27 19:03:12 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Tue Nov 27 19:17:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6deb11e4

net-im/swift: disable experimental option

For some users, net-im/swift crashes directly, when experimental is
active. According to upstream, this should be anyway disabled.
But experimental_ft stays enabled, since according to upstream, it is
considered stable, they have only forgotten to remove experimental from
it's name. Besides, it's needed for net-im/spectrum2.

Many thanks for testing goes to Martin Samek  vmsc.eu>

Closes: https://bugs.gentoo.org/671826
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Andrey Utkin  gentoo.org>

 net-im/swift/swift-4.0.2-r1.ebuild | 207 +
 1 file changed, 207 insertions(+)

diff --git a/net-im/swift/swift-4.0.2-r1.ebuild 
b/net-im/swift/swift-4.0.2-r1.ebuild
new file mode 100644
index 000..1fdb1c0dd08
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils 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;
+
+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}-make-generated-files-handle-unicode-characters.patch
+   "${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+)
+
+src_prepare() {
+   default
+
+   # 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"
+

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

2018-11-23 Thread Andrey Utkin

commit: 69bd066772638de9aa56483b6dbd7b9bb5a79308
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Fri Nov 16 23:46:47 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Nov 24 02:44:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bd0667

net-im/swift: New package

An elegant, secure, adaptable and intuitive XMPP client.

Closes: https://bugs.gentoo.org/334887
Closes: https://bugs.gentoo.org/652464
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Andrey Utkin  gentoo.org>

 net-im/swift/Manifest  |   1 +
 ...generated-files-handle-unicode-characters.patch |  38 
 .../files/swift-4.0.2-qt-5.11-compatibility.patch  |  35 
 net-im/swift/metadata.xml  |  23 +++
 net-im/swift/swift-4.0.2.ebuild| 207 +
 5 files changed, 304 insertions(+)

diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
new file mode 100644
index 000..d0e86af54c3
--- /dev/null
+++ b/net-im/swift/Manifest
@@ -0,0 +1 @@
+DIST swift-4.0.2.tar.gz 19083393 BLAKE2B 
de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812
 SHA512 
b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167

diff --git 
a/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
 
b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
new file mode 100644
index 000..7fd2e386d9d
--- /dev/null
+++ 
b/net-im/swift/files/swift-4.0.2-make-generated-files-handle-unicode-characters.patch
@@ -0,0 +1,38 @@
+From 39ff091cddf8fd5e01047d80c7ed60c150537705 Mon Sep 17 00:00:00 2001
+From: Thanos Doukoudakis 
+Date: Fri, 11 May 2018 11:26:39 +0100
+Subject: Make generated files handle Unicode characters
+
+This patch handles a case where some of the files used to generate COPYING,
+were containing unicode strings, which could lead to a failure when building
+sid package. The code now will check the type of the string before writing to
+the file, and if needed it will transform it to the appropriate format.
+
+Test-Information:
+Generated the sid package with package_all_platforms script with no problems.
+Created a debian sid box and tested the installation of the generated
+packages. Validated the output generated in Windows 10 and Ubuntu 16.04 builds
+through the "About" dialog in Swift.
+
+Change-Id: I05e518b758f316d9fbf23c1079be5a462e75106c
+
+diff --git a/BuildTools/SCons/Tools/textfile.py 
b/BuildTools/SCons/Tools/textfile.py
+index 89f8963..9b424f2 100644
+--- a/BuildTools/SCons/Tools/textfile.py
 b/BuildTools/SCons/Tools/textfile.py
+@@ -113,7 +113,11 @@ def _action(target, source, env):
+ lsep = None
+ for s in source:
+ if lsep: fd.write(lsep)
+-fd.write(_do_subst(s, subs))
++stringtowrite = _do_subst(s, subs)
++if isinstance(stringtowrite, str):
++  fd.write(stringtowrite)
++elif isinstance(stringtowrite, unicode):
++  fd.write(stringtowrite.encode('utf-8'))
+ lsep = linesep
+ fd.close()
+ 
+-- 
+cgit v0.10.2-6-g49f6
+

diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch 
b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
new file mode 100644
index 000..db633945b49
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch
@@ -0,0 +1,35 @@
+From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001
+From: Tobias Markmann 
+Date: Thu, 21 Jun 2018 13:04:56 +0200
+Subject: Add missing include for QAbstractItemModel
+
+This fixes building Swift with Qt 5.11.
+
+Test-Information:
+
+Builds and tests pass on macOS 10.13.5 with Qt 5.11.0.
+
+Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777
+
+diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h 
b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+index 0714ac1..fe536ab 100644
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
 b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010-2016 Isode Limited.
++ * Copyright (c) 2010-2018 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -8,6 +8,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ 
+ #include 
+-- 
+cgit v0.10.2-6-g49f6
+

diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
new file mode 100644
index 000..acb7295d48a
--- /dev/null
+++ b/net-im/swift/metadata.xml
@@ -0,0 +1,23 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ck+gen...@bl4ckb0x.de
+   Conrad Kostecki
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Swift is an elegant, secure, adaptable and intuitive XMPP

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

2018-11-23 Thread Andrey Utkin

commit: 3a9f54faf476855f471e1da194cf5bfdb8a45490
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sun Nov 18 18:39:31 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Nov 24 02:45:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9f54fa

net-im/swift: add myself as comaintainer

Package-Manager: Portage-2.3.49, Repoman-2.3.12
Signed-off-by: Andrey Utkin  gentoo.org>

 net-im/swift/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index acb7295d48a..c7c45c7e8bd 100644
--- a/net-im/swift/metadata.xml
+++ b/net-im/swift/metadata.xml
@@ -9,6 +9,10 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   andrey_ut...@gentoo.org
+   Andrey Utkin
+   

Swift is an elegant, secure, adaptable and intuitive XMPP 
client,
with features that make it suitable for a wide range of use 
scenarios.

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/files/, net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/, net-im/swift/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/swift/

35 matches

Site Navigation

Mail list logo

Footer information