From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 31 Jan 2019 16:00:27 +0000 Subject: gentoo resync 31.01.2019 --- net-im/Manifest.gz | Bin 9737 -> 9748 bytes net-im/sendxmpp/Manifest | 2 +- net-im/sendxmpp/sendxmpp-1.24.ebuild | 4 +- net-im/spectrum2/Manifest | 2 + net-im/spectrum2/spectrum2-2.0.10.ebuild | 122 ++++++++++++++++++ net-im/swift/Manifest | 1 - net-im/swift/swift-4.0.2.ebuild | 207 ------------------------------- 7 files changed, 127 insertions(+), 211 deletions(-) create mode 100644 net-im/spectrum2/spectrum2-2.0.10.ebuild delete mode 100644 net-im/swift/swift-4.0.2.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 54ff1fbc49e8..ba554e425e8b 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest index 6fdea49459e0..a2e306f113fb 100644 --- a/net-im/sendxmpp/Manifest +++ b/net-im/sendxmpp/Manifest @@ -1,5 +1,5 @@ DIST sendxmpp-1.24.tar.gz 9657 BLAKE2B c1dbf65c031d7178b996b4309cab149038774c40aa903185d99f1cf26c9a803b623d5a72e3991e30c929b9f236d7cfe2e2828e92b1f135e7e791e001d58142e1 SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842 DIST sendxmpp_1.23.orig.tar.gz 9196 BLAKE2B 16ec292478610d58c92ea50a46e24ac86656102966dfda3eb917b65af7c6cb13fb254b257fbf78d1f8040e2237d378450774c72f090c22cbd2bd3aed77da1367 SHA512 65cbda52450a3537982d0c8f94265a1f8c336379ea4e4bc56c772bb613ea03fe25feb85fb4c8e3b26a48ad03d0c5e07188268e07c1da9981cb1dab87b17d9ba8 EBUILD sendxmpp-1.23.ebuild 520 BLAKE2B fe783206d54370c55309b77de5c894e90f7880247d9b359951bc68d3f08e2d6f0fb8741a9b106db6416fe4f6902e7dc2f77600ee35d991f8ecd251dbbffa8ca0 SHA512 e33d5b689932055d70a1ffcb0f199733c1236d0b0a1f901946efc9a54b02346de2a6fb9f0febadfb5fbe825ee53f0d402a42268cb476c5b18aa17e2b8b74da22 -EBUILD sendxmpp-1.24.ebuild 496 BLAKE2B 981a01b73a0af818961093c2bd4695b590efe3940a7347a52555ee01a80ed97e96a021bf61532f1ba1644df6a9551ffcdbd470f5be1c47496c8863adee2c0499 SHA512 d47476d84c82e581693d40581794f3c7e197339101cba6c5ed7cd27654a7fe146409ccd21bbea5cc8e36ce963a4aee7db21d7369a6815d4db72b4e2585ee50d4 +EBUILD sendxmpp-1.24.ebuild 491 BLAKE2B ec47a6a7ac356d25467652bf17ca287addfd8c2efbac73e0ff69e830a8ab8829caedf0a17d12033981b13e0016407605ad25c4dc45ba2424064237b506aaff71 SHA512 ff0d4703f7e0a644a45b4b6fbbd51247b69b8bd0ee7c46b2b31f54c2ec8311399173f06c697e0f4564fb3d7b4b6f1bb190a55ff4226a07797fe0b79ea1f382c1 MISC metadata.xml 246 BLAKE2B 113c4d0217bba0bce6df81f39bc20882e47ed9dded43fb367e2c6c545fe1092ddea56d00d6e8d4f80cd751804f0206bb486795ee4ab592a85bc8937a879e7650 SHA512 b64c7aae46e2d47987372d30818221d17e5635606a61a1f87737bd3820e9db37d6ad91a470fdeac55fe42c85d3e86f3c28e81d45bc7a0d5440f8c6d5f52bd28d diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild index 6f0f864fb38b..91478bd62d4b 100644 --- a/net-im/sendxmpp/sendxmpp-1.24.ebuild +++ b/net-im/sendxmpp/sendxmpp-1.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="~amd64 hppa ~ppc sparc ~x86" IUSE="" RDEPEND="dev-perl/Net-XMPP diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index c3c49e373f72..583c57c3f560 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -3,6 +3,8 @@ AUX spectrum2-2.0.9-use_qt5_libcommuni.patch 2428 BLAKE2B d6f377f9ac1d99d5af51a6 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2 AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785 +DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c DIST spectrum2-2.0.9.tar.gz 842688 BLAKE2B 32cdb95c161aa97338895fb144200ac94d200aefb58300a8f55b03457b3aae1a0ef4a60311f0e2be8e3f3e331625d04ecd61a9583d07794c4398762e1348b939 SHA512 f111133d3d327619ebbeeaa8c329b09dbdbef9c66ec7bc06eb6eac8c54e144cbf2d81d2751699bf97ae1d1bf0a94581f3971394a7f06b9a4d69f6248f1497982 +EBUILD spectrum2-2.0.10.ebuild 2862 BLAKE2B 10a32320909ffcacd099979062f557f6e5b9bc9f9c0a4fb1c698d2ce2845741b6f6b89d7370b61b93263440f07dbde67dd2561b6b12afc25a12740df81c0b8c4 SHA512 3a37a2fa257f54b422cc4a3f60bf3ee725dbce7fd311b55159a52ea70511c4094f305066234083714411652b384853af0aade34ca3ec12647ff4ff3c48598c7a EBUILD spectrum2-2.0.9.ebuild 2901 BLAKE2B c0dedfd2f7693469ce936daf90ce512546239343a387a453798e5c48e964b886df8355d0716c6e447a8bf378098994ca403f35b271a7e3a742b81ab15a44a844 SHA512 2f9c427748e3ccbeac88986e82b83ed785b6f950a04ba18fc6049309e494b9f4f9bd0d72df2eb7757eba80a07e6f3431479a3bce86bd00537f3ae734ef172f07 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6 diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild new file mode 100644 index 000000000000..285dd6d49820 --- /dev/null +++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils python-single-r1 systemd user + +DESCRIPTION="An open source instant messaging transport" +HOMEPAGE="https://www.spectrum.im" +SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +RDEPEND=" + dev-libs/boost:= + dev-libs/expat + dev-libs/libev:= + dev-libs/log4cxx + dev-libs/jsoncpp:= + dev-libs/openssl:0= + dev-libs/popt + dev-libs/protobuf:= + net-dns/libidn:0= + net-im/swift:= + net-misc/curl + sys-libs/zlib:= + frotz? ( !games-engines/frotz ) + irc? ( net-im/libcommuni ) + mysql? ( + || ( + dev-db/mariadb-connector-c + dev-db/mysql-connector-c + ) + ) + postgres? ( dev-libs/libpqxx:= ) + purple? ( + dev-libs/glib + net-im/pidgin:= + ) + sms? ( app-mobilephone/smstools ) + sqlite? ( dev-db/sqlite:3 ) + twitter? ( net-misc/curl ) + whatsapp? ( net-im/transwhat )" + +DEPEND=" + ${PYTHON_DEPS} + ${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( + dev-python/sleekxmpp[${PYTHON_USEDEP}] + dev-util/cppunit + net-irc/ngircd + ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" ) + +# Tests are currently restricted, as they do completly fail +RESTRICT="test" + +pkg_setup() { + enewgroup spectrum + enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum + + use test && python-single-r1_pkg_setup +} + +src_prepare() { + # Respect users LDFLAGS + sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die + + # Respect users CFLAGS, when compiling for debug mode + # Since Spectrum2 searches for a qt4 compiled libcommuni, + # it must be patched, to find the qt5 compiled libcommuni, + # See: https://github.com/SpectrumIM/spectrum2/pull/253 + cmake-utils_src_prepare +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE="Debug" + + local mycmakeargs=( + -DENABLE_DOCS="$(usex doc)" + -DENABLE_FROTZ="$(usex frotz)" + -DENABLE_IRC="$(usex irc)" + -DENABLE_MYSQL="$(usex mysql)" + -DENABLE_PQXX="$(usex postgres)" + -DENABLE_PURPLE="$(usex purple)" + -DENABLE_SMSTOOLS3="$(usex sms)" + -DENABLE_SQLITE3="$(usex sqlite)" + -DENABLE_TESTS="$(usex test)" + -DENABLE_TWITTER="$(usex twitter)" + -DENABLE_XMPP="$(usex xmpp)" + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + + cmake-utils_src_configure +} + +src_test() { + cd tests/libtransport && "${EPYTHON}" ../start.py || die +} + +src_install() { + cmake-utils_src_install + + diropts -o spectrum -g spectrum + keepdir /var/log/spectrum2 /var/lib/spectrum2 + diropts + + newinitd "${FILESDIR}"/spectrum2.initd spectrum2 + systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service + systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf + + einstalldocs +} diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index ac464da24f54..b1b4128b8a13 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -2,5 +2,4 @@ AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167 EBUILD swift-4.0.2-r1.ebuild 4328 BLAKE2B abe8a088feb575117ef747e8069ad87244438b24886134e02b12dce5a7d3e5e9d7cc0676422ce2778b59d2eee67f3ad7bcaaded2a9bf67ba6f93e48cb5652404 SHA512 00c5ef5b7941be9b5ba2090121fbed3355dbdc31e0476cde5f764b13a531d0a361c8ef1d15a8dd388fc639691005585f118d3a0ad1b4666c231a0e3e827dbf96 -EBUILD swift-4.0.2.ebuild 4329 BLAKE2B cac1a60927e5ee80d8827963253b5e1f3972ea795d0048ec7b59b876e701aa5925ddaf77d1b57f716e821e2234a1290a2fce3178085980529b3b437d7ea1d1fe SHA512 4e267eb44ac4d7a4c529c948cdfd6717ee7e5fa41000f1df30a842386e424cfd33621696a5dd471b12c853d26b6e52a4d7b42f1a3617f7d3a9248c0f415114f0 MISC metadata.xml 970 BLAKE2B ff45a5b75d9ec07a6d6bd1e65acaac799f56ef2f01d689d3e5e887a9a135e7d446a789c4d0445a64f1d904386d7c9ff0d12a990d71df024ab2f647bb8bf19a27 SHA512 6e820b2770aa305bfc1a1c9605f62404ee35485759451ce7fb1155329f666182238a8075f1e2ebcc77b1e9e5896040bca8ecbd541a813be5b09bcd2aa6ae2584 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 c67278ade281..000000000000 --- 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 -} -- cgit v1.2.3