From 1b2c0d19f75523db182b267901484f87abf732cf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Oct 2023 23:52:39 +0100 Subject: gentoo auto-resync : 04:10:2023 - 23:52:39 --- net-im/swift/Manifest | 2 +- net-im/swift/swift-4.0.3-r1.ebuild | 212 +++++++++++++++++++++++++++++++++++++ net-im/swift/swift-4.0.3.ebuild | 207 ------------------------------------ 3 files changed, 213 insertions(+), 208 deletions(-) create mode 100644 net-im/swift/swift-4.0.3-r1.ebuild delete mode 100644 net-im/swift/swift-4.0.3.ebuild (limited to 'net-im/swift') diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 245fd549ca21..333080338aa8 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -8,5 +8,5 @@ DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e 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 EBUILD swift-4.0.2-r102.ebuild 4378 BLAKE2B ab3383c06b7a61c6839b8a6fe8977f7b49e7e4f8b341cc97afdd1e88c9bf777956eb288b6da543583a91bf254341d70abc9afb311f8a43427cd5db6119f2a4dd SHA512 defb6b052b8296408690ee8852bf5dd48673ff2286d1dc30bcafae2523b54994544434093f4af6b12336f5620a982f9dc7cbd7e1e56126be59d7de460a8fda1c -EBUILD swift-4.0.3.ebuild 4502 BLAKE2B 16b72289e5ee13354ae6f833e36b0a1b72a54a814c22a0cb547843e13dd02c05b5c31db102fd7c1947678fd6eb880d884a80303c873510d3fa22247451a50c1e SHA512 c76c86483f6c5188fc00a82a322e1812eb4025e80719f537591f34a6daf7a36e74cafae27aa03383007dd20c4273796203897a4d75ea7dd1e9453badc1fe1a4d +EBUILD swift-4.0.3-r1.ebuild 4635 BLAKE2B 37fadff7975afd275562d9c7bfd4dee72e4976c9083bcc3badf56dae9838a51d036fb8335669a5cddc45c4563d63268db1a40b4488cc887a210f6b931da19383 SHA512 96119877700204de2c09d3a869d1ac433b1c0f4e79e43e4ebf1a52dca41777a5a1a35f947ba13127560ea452ca6ac3929e67f92764d848c734eaa8b4a14b81a7 MISC metadata.xml 572 BLAKE2B 844c5b114051f7e2292b7857c991d4c6ea9c52a7e697f5d7f93296f4047179da836519701425c3ac6e9fd9fae99d77565258e08f2493682b8f2629cac493344b SHA512 4ed15787f531624392d9e8489634094c99f32b2c077c1330d79713a662bb22c79bd808aa8c1616b21fb5824ec03908aa54ea1d1cf13aa3f011235ef3756a32c5 diff --git a/net-im/swift/swift-4.0.3-r1.ebuild b/net-im/swift/swift-4.0.3-r1.ebuild new file mode 100644 index 000000000000..0cd230963430 --- /dev/null +++ b/net-im/swift/swift-4.0.3-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} luajit ) +PYTHON_COMPAT=( python3_{9..11} ) + +inherit lua-single python-any-r1 scons-utils toolchain-funcs + +DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" +HOMEPAGE="https://www.swift.im/" +SRC_URI=" + https://swift.im/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2 + https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz +" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" +SLOT="4/0" +KEYWORDS="~amd64" +IUSE="expat +icu +idn lua test zeroconf" +REQUIRED_USE=" + || ( icu idn ) + lua? ( ${LUA_REQUIRED_USE} ) +" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/boost:= + dev-libs/openssl:0= + net-libs/libnatpmp + net-libs/miniupnpc:= + sys-libs/zlib + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2:2 ) + 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}"/${PN}-4.0.2-boost-1.69-compatibility.patch + "${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch + "${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-reproducible-build.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 + + if [[ ! -f VERSION.swift ]] ; then + # Source tarball from git doesn't include this file + echo "${PV}" > VERSION.swift || 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 +} diff --git a/net-im/swift/swift-4.0.3.ebuild b/net-im/swift/swift-4.0.3.ebuild deleted file mode 100644 index 36ac7c1ee8ed..000000000000 --- a/net-im/swift/swift-4.0.3.ebuild +++ /dev/null @@ -1,207 +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/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2 - https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz -" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" -SLOT="4/0" -KEYWORDS="~amd64" -IUSE="expat +icu +idn lua test zeroconf" -REQUIRED_USE=" - || ( icu idn ) - lua? ( ${LUA_REQUIRED_USE} ) -" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/boost:= - dev-libs/openssl:0= - net-libs/libnatpmp - net-libs/miniupnpc:= - sys-libs/zlib - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2:2 ) - 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}"/${PN}-4.0.2-boost-1.69-compatibility.patch - "${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch - "${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch - "${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch - "${FILESDIR}"/${PN}-4.0.3-reproducible-build.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 -} -- cgit v1.2.3