From dc41efad78c64df9b74ed6f94dcf25391b8fc5e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Mar 2024 18:44:29 +0000 Subject: gentoo auto-resync : 09:03:2024 - 18:44:28 --- net-im/Manifest.gz | Bin 9402 -> 9414 bytes net-im/swift/Manifest | 2 +- net-im/swift/swift-4.0.3-r1.ebuild | 212 --------------------- net-im/swift/swift-4.0.3-r2.ebuild | 212 +++++++++++++++++++++ net-im/transwhat/Manifest | 2 +- .../transwhat/transwhat-0.2.2_p20190426-r3.ebuild | 4 +- net-im/yowsup/Manifest | 2 +- net-im/yowsup/yowsup-3.3.0.ebuild | 4 +- 8 files changed, 219 insertions(+), 219 deletions(-) delete mode 100644 net-im/swift/swift-4.0.3-r1.ebuild create mode 100644 net-im/swift/swift-4.0.3-r2.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 925c7f7abc51..e22b595f24a4 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index be05673d13bf..fd973979f51a 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -4,5 +4,5 @@ AUX swift-4.0.3-gcc11-compatibility.patch 388 BLAKE2B a8b9d79d05accc9f07ec9db302 AUX swift-4.0.3-reproducible-build.patch 732 BLAKE2B e40c7e9c5e18aec72c6cd6290e89badbb0d57d15bc30fb06baef1050c4be52f795593f43dc9715a0634d19b9c5a0bb2afbb4025de2b6aa8bd0deb074c748ee2c SHA512 4f90dba4ebbd4ae33b40eeeaa100e647a1ae5cd6e32ed21b6bcbdc52104b57d59bdcc7dbb907a1a751a30f91e1e234d695278d999574f1393d3aaf499484270f 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.3-r1.ebuild 4636 BLAKE2B 02f18da6558085fb1f65708ff49d3a7b368f84555faef410b01d7d9ce25e5cbef217008cc6799d7c21eef677c465f045264f2297729ad7cdd765eeb9eb9104d9 SHA512 83f40ed28e75c70b129309cd92ea649be4d87c03becf93cd5cd01c4013ec363bad3921aa3ca5abe5448e84a99f687910eb81a9bdfb79683cf804f7b5d2aacbbc +EBUILD swift-4.0.3-r2.ebuild 4636 BLAKE2B 18a62689c6f9d23c87eda46f0c43a3a4d0d6c63f613ba2ed1d6a9c719f3b53ad7255d9ed6fb9f5afddf4da8080f9c4b45c953568a49c2921ed3e7e5d7c38973c SHA512 709dd1f9a0ee6d37181a1af22d53f544ab25011c1356d94a666dd89e7dbf5da5fa4785ec5a19d0c0c217d7b3fa3c395b99453555daf65a9eab913bfc3fe97a68 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 deleted file mode 100644 index ba59f4d41977..000000000000 --- a/net-im/swift/swift-4.0.3-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} luajit ) -PYTHON_COMPAT=( python3_{10..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-build/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-r2.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild new file mode 100644 index 000000000000..686e9cf6c7c7 --- /dev/null +++ b/net-im/swift/swift-4.0.3-r2.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) + +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-build/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/transwhat/Manifest b/net-im/transwhat/Manifest index 3cae4e847349..bf0fe10f55cc 100644 --- a/net-im/transwhat/Manifest +++ b/net-im/transwhat/Manifest @@ -1,3 +1,3 @@ DIST transwhat-0.2.2_p20190426.tar.gz 38373 BLAKE2B 3addf2ae66d042eaf4a5f6b54015b9592fea68b69f4c542c5ec0d97040c0eb473d15b893af35f6d6cf83671417ed718c9c91b6268242e667fa34397fc230d2d5 SHA512 7079d1015bf5dfcd97e729219306320055ef86ac3203bb727bebb1e96abb60a26787882a12f9a8f4cce2ef45652bebfbd824a98d37d97ed72ebe0269004c1a71 -EBUILD transwhat-0.2.2_p20190426-r3.ebuild 990 BLAKE2B 78a4728bac619d683233aa4f31c8ec475fb54f242bda9da45b3715ca6660fa339ac76e6cd425e2859e101f43652fb37032882c621669c17fcff7e010fdedbf48 SHA512 683eacc559341c5bcd812daa2d5ec1d8fc7fd05af8de8a1fd9a95b2b17405bc94a70a1752cbfe9d9da5b48c11775c0ee7da7d62cc1950abfbf7623c8f08b53d6 +EBUILD transwhat-0.2.2_p20190426-r3.ebuild 991 BLAKE2B d0e384bcdbd03854ca73ec1657640975d8943348fd2a18e1904b168644bb377b900752529e3f0964d34245876344471e319b1ee5f06263341998e40c8189ac47 SHA512 ee6b51b89a9cc77ecc3d9f26fa237c2fa2fc1ce21038d6e3a3e5ac0ac28aa920ea27c4a3b0837814e1180bba031ce552365fd27fa4b5462042e68e218d16e93a MISC metadata.xml 588 BLAKE2B f77a7b84b1d4bf96a606911a0086b19bac8f9589768c4fcbcf858242f665e2119d7664903cee678f5feae9b606624da069030c44c33a0ba7eeb302fd0c31a0af SHA512 159bfd2d01c75dc9d98ca64927e5cc776719554a505a33244e5acaf528c5484a0b45b311e68c6164ffb21d2a977dbdb890945a990e1c35d6b9763c4bef14e499 diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild index a6fbc475149e..3a1f9c589d2b 100644 --- a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild +++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165" DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest index b7f0d3d6098f..17d6965a3936 100644 --- a/net-im/yowsup/Manifest +++ b/net-im/yowsup/Manifest @@ -1,4 +1,4 @@ AUX yowsup-3.2.3_p20190905-fix-install-path.patch 819 BLAKE2B c1b30327dc0e56eb2516d4c397779a129d04ff1727b9c0b2a41f971a0ca27d855c59a58abf5d05c3a832756c951b281bda4c50bcec7bc75a44fe02a618a651b4 SHA512 2ee5d15f48d891f05c567e4bdf3b2b249963241dfdb825fab7c9dbce9d71007ed4f947a57a9565f6a4b49a79a4edf5043f9b651b6ba194a8761bc5a4d973c02d DIST yowsup-3.3.0.tar.gz 155950 BLAKE2B 7ade7f7e05aff14d5154d35d5c2a1841ee66893059bd995facb8297d7e6f1dde4468105dc3f03b5462efbf92cbd079c457440bb1580235bbbcfaddeab2244b56 SHA512 304409f02aa3720b0f70a83fe4dbe288fa1c5659642878d7bd1354359524a66c39b9f5baa9899224497f61f974d9b64ba67e07d866fda2589413070bb9ef1aad -EBUILD yowsup-3.3.0.ebuild 1227 BLAKE2B 1d6cd715b958b3691fd408920ac3596e701c73c78567467771118583db817e5010f48be90ad4f38aef4beb60f5eadfe7e53ef99ed61de8791990acb1ae22ee02 SHA512 41923cb29462605d776643002e460c23da72dd9277b9a2693693c1a8586d095e5504502cd27be54d321834eab88a0fe8f2eca0a3413ef61902e5bbe277b29f28 +EBUILD yowsup-3.3.0.ebuild 1228 BLAKE2B 992cf10c4a800708a28372119ab8dd2c1a0799c68e1d53ca6b9b97492273539df2622e5b8a37a96c3b43424617211053efc86af147d23422a566b70fa937eac3 SHA512 b05db63408c6aa191ac476fc018d98ef01aaef79bad547aa862c5b5293228322bb79f6e7681419366fef9719c73da35c3e054862ee5d1483b8b09df572c523ed MISC metadata.xml 756 BLAKE2B d0513b15622bb24f287bc5b987d3865ef2681a183edd7d2d1fb725c2d953124cc5341e08fc5811ef049fd78bb60225607490cf81c8e534e6830ac7b55081c6b7 SHA512 c28211cb67f9fa1ce01508dcdf0193e62cbd11266c2a0b9c5f2cd5d01dfaf330991ed8ac5451fe1034d9f9e32dc331f750aea206275e4c1548ae260b1f01568d diff --git a/net-im/yowsup/yowsup-3.3.0.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild index f0ae4ac76f6c..b1da807a7464 100644 --- a/net-im/yowsup/yowsup-3.3.0.ebuild +++ b/net-im/yowsup/yowsup-3.3.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="readline" inherit distutils-r1 -- cgit v1.2.3