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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-27 14:02 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-27 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     0ed47ed8a8714e1afd39144b6dbbb127e594a23a
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 14:02:13 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 14:02:29 2020 +0000
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 <conikost <AT> 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..00000000000
--- 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)" '')
-		$(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '')
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="no"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="no"
-		try_expat="$(usex expat)"
-		try_gconf="no"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2024-03-09 17:41 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2024-03-09 17:41 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: add python3.12 support

Signed-off-by: Conrad Kostecki <conikost <AT> 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
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2023-11-11 23:37 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2023-11-11 23:37 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: amd64 stable

Signed-off-by: Conrad Kostecki <conikost <AT> 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 )


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2023-11-11 23:37 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2023-11-11 23:37 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: drop 4.0.2-r102

Signed-off-by: Conrad Kostecki <conikost <AT> 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 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a 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..000000000000
--- 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
-		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"
-		# 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"
-		link="$(tc-getCXX)"
-		linkflags="${LDFLAGS}"
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="no"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="no"
-		try_expat="$(usex expat)"
-		try_gconf="no"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-
-	if use lua; then
-		MYSCONS+=(
-			lua_includedir="$(lua_get_include_dir)"
-			lua_libdir="${EPREFIX}/usr/$(get_libdir)"
-			lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
-		)
-	fi
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2023-10-04 21:55 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2023-10-04 21:55 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: fix soname

Signed-off-by: Robert Förster <Dessa <AT> gmake.de>
Closes: https://github.com/gentoo/gentoo/pull/33198
Signed-off-by: Conrad Kostecki <conikost <AT> 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() {


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2022-11-03 23:15 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2022-11-03 23:15 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: fix QA StaticSrcUri

Signed-off-by: Conrad Kostecki <conikost <AT> 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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2022-11-03 22:37 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2022-11-03 22:37 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: add python3.11 support

Signed-off-by: Conrad Kostecki <conikost <AT> 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
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2022-04-13 14:46 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2022-04-13 14:46 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: retire andrey_utkin

Signed-off-by: Sam James <sam <AT> 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 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
 	<longdescription>
 		Swift is an elegant, secure, adaptable and intuitive XMPP client,
 		with features that make it suitable for a wide range of use scenarios.


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2021-07-01 21:16 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2021-07-01 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     45c07f3fc4ec0c084f20bd02896f0e4d85bc82ef
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  1 20:43:03 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jul  1 21:15:35 2021 +0000
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 <conikost <AT> 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
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2021-03-07 16:27 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2021-03-07 16:27 UTC (permalink / raw
  To: gentoo-commits

commit:     330346ce66cae755165a2a786527b0605d521279
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 16:26:14 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 16:27:00 2021 +0000
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 <conikost <AT> 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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2021-01-27 20:16 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2021-01-27 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     6e5554bc49e69fc438269d91774952e7ac6f673f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 20:13:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 20:13:05 2021 +0000
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 <conikost <AT> 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.
 	</longdescription>
-	<use>
-		<flag name="client">Build the full graphical XMPP client.</flag>
-		<flag name="gconf">Enable configuration through <pkg>gnome-base/gconf</pkg>.</flag>
-	</use>
 </pkgmetadata>

diff --git a/net-im/swift/swift-4.0.2-r4.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild
deleted file mode 100644
index 19967be4338..00000000000
--- a/net-im/swift/swift-4.0.2-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
-HOMEPAGE="https://www.swift.im/"
-SRC_URI="
-	https://swift.im/downloads/releases/${P}/${P}.tar.gz
-	https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
-REQUIRED_USE="
-	|| ( icu idn )
-	gconf? ( client )
-	spell? ( client )
-"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	lua? ( dev-lang/lua:0= )
-	spell? ( app-text/hunspell:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
-	test? ( net-dns/avahi )
-"
-
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
-RESTRICT="test"
-
-DOCS=(
-	"DEVELOPMENT.md"
-	"README.md"
-	"Swiften/ChangeLog.md"
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
-	"${WORKDIR}"/${P}-python3-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.15-compatibility.patch
-)
-
-src_prepare() {
-	default
-
-	# Don't include '/usr/lib*' in the link command line for `swiften-config`
-	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
-
-	# Hack for finding Qt system libs
-	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
-
-	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
-	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
-
-	# Remove '3rdParty', as the system libs should be used
-	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
-	local my3rdparty=(
-		Boost
-		Breakpad
-		DocBook
-		Expat
-		LCov
-		Ldns
-		LibIDN
-		LibMiniUPnPc
-		LibNATPMP
-		Lua
-		OpenSSL
-		SCons
-		SQLite
-		Unbound
-		ZLib
-	)
-
-	if use test; then
-		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
-	else
-		rm -fr 3rdParty || die
-	fi
-}
-
-src_configure() {
-	MYSCONS=(
-		ar="$(tc-getAR)"
-		allow_warnings="yes"
-		assertions="no"
-		build_examples="yes"
-		boost_bundled_enable="false"
-		boost_force_bundled="false"
-		cc="$(tc-getCC)"
-		ccache="no"
-		ccflags="${CFLAGS}"
-		coverage="no"
-		cxx="$(tc-getCXX)"
-		cxxflags="${CXXFLAGS}"
-		debug="no"
-		distcc="no"
-		experimental="no"
-		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
-		icu="$(usex icu)"
-		install_git_hooks="no"
-		libidn_bundled_enable="false"
-		libminiupnpc_force_bundled="false"
-		libnatpmp_force_bundled="false"
-		link="$(tc-getCXX)"
-		linkflags="${LDFLAGS}"
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2021-01-27 19:55 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-01-27 19:55 UTC (permalink / raw
  To: gentoo-commits

commit:     8bc3938a294a5e46f104f016bfdd0168f05c9966
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 19:55:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 19:55:30 2021 +0000
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 <sam <AT> 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 )


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-27 14:02 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-27 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     635645e4df3d22ce0163e2c070b29f7e661f3786
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 13:50:27 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 14:02:28 2020 +0000
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 <conikost <AT> 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 00000000000..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"
+		qt5="no"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="no"
+		try_expat="$(usex expat)"
+		try_gconf="no"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+
+	if use lua; then
+		MYSCONS+=(
+			lua_includedir="$(lua_get_include_dir)"
+			lua_libdir="${EPREFIX}/usr/$(get_libdir)"
+			lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		)
+	fi
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-25 14:41 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-25 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     51b41f0667ac598c839348119eca17e2460afd0a
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 14:39:14 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 14:39:14 2020 +0000
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 <conikost <AT> 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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-25  0:44 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-25  0:44 UTC (permalink / raw
  To: gentoo-commits

commit:     7fb18484cd11cdf968ea79ac82251afb8339d7e7
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 00:40:43 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 00:44:41 2020 +0000
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 <conikost <AT> 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))"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-20 23:28 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-20 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     abd6b3317ae3fb1a5259ba6200654e59a0ed0833
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 23:26:26 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 23:28:08 2020 +0000
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 <conikost <AT> 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 00000000000..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"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		lua_includedir="$(lua_get_include_dir)"
+		lua_libdir="${EPREFIX}/usr/$(get_libdir)"
+		lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="no"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="no"
+		try_expat="$(usex expat)"
+		try_gconf="no"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-20 23:28 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-12-20 23:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1bc0883e93b717c2a7e2a74da2d8adb5cd10f7d1
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 23:27:33 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 23:28:09 2020 +0000
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 <conikost <AT> 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..00000000000
--- 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"
-		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}"
-		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"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-12-03 12:54 Marek Szuba
  0 siblings, 0 replies; 28+ messages in thread
From: Marek Szuba @ 2020-12-03 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     00201367e7537f8da7c2bbecec6a6a3cf240a997
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 12:51:55 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 12:54:30 2020 +0000
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 <marecki <AT> 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:= )
 "
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-08-26 21:43 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-08-26 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     04483649eebf3ebdbeb5bf138cc61969e6802899
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 21:34:07 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 21:35:03 2020 +0000
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 <conikost <AT> 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..00000000000
--- a/net-im/swift/swift-4.0.2-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit gnome2-utils python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
-HOMEPAGE="https://www.swift.im/"
-SRC_URI="
-	https://swift.im/downloads/releases/${P}/${P}.tar.gz
-	https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="~amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
-REQUIRED_USE="
-	|| ( icu idn )
-	gconf? ( client )
-	spell? ( client )
-"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	lua? ( dev-lang/lua:= )
-	spell? ( app-text/hunspell:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
-	test? ( net-dns/avahi )
-"
-
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
-RESTRICT="test"
-
-DOCS=(
-	"DEVELOPMENT.md"
-	"README.md"
-	"Swiften/ChangeLog.md"
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
-	"${WORKDIR}"/${P}-python3-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-)
-
-src_prepare() {
-	default
-
-	# Don't include '/usr/lib*' in the link command line for `swiften-config`
-	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
-
-	# Hack for finding Qt system libs
-	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
-
-	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
-	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
-
-	# Remove '3rdParty', as the system libs should be used
-	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
-	local my3rdparty=(
-		Boost
-		Breakpad
-		DocBook
-		Expat
-		LCov
-		Ldns
-		LibIDN
-		LibMiniUPnPc
-		LibNATPMP
-		Lua
-		OpenSSL
-		SCons
-		SQLite
-		Unbound
-		ZLib
-	)
-
-	if use test; then
-		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
-	else
-		rm -fr 3rdParty || die
-	fi
-}
-
-src_configure() {
-	MYSCONS=(
-		ar="$(tc-getAR)"
-		allow_warnings="yes"
-		assertions="no"
-		build_examples="yes"
-		boost_bundled_enable="false"
-		boost_force_bundled="false"
-		cc="$(tc-getCC)"
-		ccache="no"
-		ccflags="${CFLAGS}"
-		coverage="no"
-		cxx="$(tc-getCXX)"
-		cxxflags="${CXXFLAGS}"
-		debug="no"
-		distcc="no"
-		experimental="no"
-		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
-		icu="$(usex icu)"
-		install_git_hooks="no"
-		libidn_bundled_enable="false"
-		libminiupnpc_force_bundled="false"
-		libnatpmp_force_bundled="false"
-		link="$(tc-getCXX)"
-		linkflags="${LDFLAGS}"
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-08-24 22:33 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-08-24 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f79bd753d5e43e52dc5fa08e467bd5ec82878a1d
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 21:32:49 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 22:32:58 2020 +0000
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 <conikost <AT> 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
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-08-09 11:38 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-08-09 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     82eafc8ea8cb637e5cf5e734c704aaaac995a967
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 11:30:44 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 11:34:43 2020 +0000
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 <conikost <AT> 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 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a 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 00000000000..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
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="no"
+		experimental_ft="yes"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-08-01 19:40 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-08-01 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     0e8c17e566bd76373a7888666a027bcf5f9c13e2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 19:20:50 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 19:40:00 2020 +0000
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 <conikost <AT> 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..00000000000
--- 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"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED%/}/usr"
-		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-08-01 19:40 Conrad Kostecki
  0 siblings, 0 replies; 28+ messages in thread
From: Conrad Kostecki @ 2020-08-01 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d533bd0f6cfa75ef5bc50e5a033e2141521456f7
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 19:19:18 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 19:39:59 2020 +0000
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 <conikost <AT> 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 00000000000..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"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED%/}/usr"
+		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2020-02-08 16:53 David Seifert
  0 siblings, 0 replies; 28+ messages in thread
From: David Seifert @ 2020-02-08 16:53 UTC (permalink / raw
  To: gentoo-commits

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

net-im/swift: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap <AT> 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


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2019-04-13 19:10 Agostino Sarubbo
  0 siblings, 0 replies; 28+ messages in thread
From: Agostino Sarubbo @ 2019-04-13 19:10 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Agostino Sarubbo <ago <AT> 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 )


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2019-01-28  1:52 Andrey Utkin
  0 siblings, 0 replies; 28+ messages in thread
From: Andrey Utkin @ 2019-01-28  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7b2b971ae676028b04c1e4c9e26ea9ceeff4a594
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Jan 27 14:23:08 2019 +0000
Commit:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 01:49:08 2019 +0000
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 <conrad <AT> kostecki.com>
Signed-off-by: Andrey Utkin <andrey_utkin <AT> 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..00000000000
--- 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"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED%/}/usr"
-		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2018-11-27 19:20 Andrey Utkin
  0 siblings, 0 replies; 28+ messages in thread
From: Andrey Utkin @ 2018-11-27 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     6deb11e4f07463dd58a521697b395e5ad5ce2e54
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Nov 27 19:03:12 2018 +0000
Commit:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 19:17:30 2018 +0000
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 <mr <AT> vmsc.eu>

Closes: https://bugs.gentoo.org/671826
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Andrey Utkin <andrey_utkin <AT> 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 00000000000..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"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED%/}/usr"
+		SWIFTEN_LIBDIR="${ED%/}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED%/}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED%/}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
@ 2018-11-24  2:46 Andrey Utkin
  0 siblings, 0 replies; 28+ messages in thread
From: Andrey Utkin @ 2018-11-24  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3a9f54faf476855f471e1da194cf5bfdb8a45490
Author:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 18:39:31 2018 +0000
Commit:     Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
CommitDate: Sat Nov 24 02:45:18 2018 +0000
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 <andrey_utkin <AT> 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 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<longdescription>
 		Swift is an elegant, secure, adaptable and intuitive XMPP client,
 		with features that make it suitable for a wide range of use scenarios.


^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2024-03-09 17:41 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-27 14:02 [gentoo-commits] repo/gentoo:master commit in: net-im/swift/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-03-09 17:41 Conrad Kostecki
2023-11-11 23:37 Conrad Kostecki
2023-11-11 23:37 Conrad Kostecki
2023-10-04 21:55 Conrad Kostecki
2022-11-03 23:15 Conrad Kostecki
2022-11-03 22:37 Conrad Kostecki
2022-04-13 14:46 Sam James
2021-07-01 21:16 Conrad Kostecki
2021-03-07 16:27 Conrad Kostecki
2021-01-27 20:16 Conrad Kostecki
2021-01-27 19:55 Sam James
2020-12-27 14:02 Conrad Kostecki
2020-12-25 14:41 Conrad Kostecki
2020-12-25  0:44 Conrad Kostecki
2020-12-20 23:28 Conrad Kostecki
2020-12-20 23:28 Conrad Kostecki
2020-12-03 12:54 Marek Szuba
2020-08-26 21:43 Conrad Kostecki
2020-08-24 22:33 Conrad Kostecki
2020-08-09 11:38 Conrad Kostecki
2020-08-01 19:40 Conrad Kostecki
2020-08-01 19:40 Conrad Kostecki
2020-02-08 16:53 David Seifert
2019-04-13 19:10 Agostino Sarubbo
2019-01-28  1:52 Andrey Utkin
2018-11-27 19:20 Andrey Utkin
2018-11-24  2:46 Andrey Utkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox