From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- net-im/Manifest.gz | Bin 8564 -> 8735 bytes net-im/kadu/Manifest | 2 +- net-im/kadu/kadu-4.3-r2.ebuild | 2 +- net-im/libcommuni/Manifest | 4 ++ net-im/libcommuni/files/uchardet.pri | 17 +++++ net-im/libcommuni/libcommuni-3.5.0.ebuild | 74 +++++++++++++++++++++ net-im/libcommuni/metadata.xml | 21 ++++++ net-im/signal-desktop-bin/Manifest | 4 +- .../signal-desktop-bin-1.10.0.ebuild | 56 ++++++++++++++++ .../signal-desktop-bin-1.8.0.ebuild | 56 ---------------- 10 files changed, 176 insertions(+), 60 deletions(-) create mode 100644 net-im/libcommuni/Manifest create mode 100644 net-im/libcommuni/files/uchardet.pri create mode 100644 net-im/libcommuni/libcommuni-3.5.0.ebuild create mode 100644 net-im/libcommuni/metadata.xml create mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild delete mode 100644 net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 0cdfedf4b750..9bb48cd3cf34 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index a306e046bc48..e26f85427d53 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -6,5 +6,5 @@ AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8 DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 EBUILD kadu-2.1-r1.ebuild 2753 BLAKE2B e113a680d09511ed47661fff15025fd5f018b2f260b5f2a139efb4852fc7dd8732effee8c75518229ab40d86c5e164eea8f79c62af2cc8e1de6198cd03fa2396 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e -EBUILD kadu-4.3-r2.ebuild 2584 BLAKE2B f4ce1206f8989d40aa6e05a5cf4b4e3739a0febc217e5c6dced5ca35ad24066b946cf042717dcba92c71cda662cad2257985fe2eca1941cc26b26a5a351a1ebf SHA512 3752855bcb6588f7c3d20f431a39ba77dd508cd38a6afe5d963802caf737e3a3aa0597a70413f4e0860a0b9e7d02a68b450315ec8a916d3624a9ef473956397d +EBUILD kadu-4.3-r2.ebuild 2583 BLAKE2B 75dea3c689db049c9d7649ac5746c6bdb0d76e8947f21f6c48eb7a2e56408c7c7ca3a947220f34b09611e68907dbc51b187151e4ac415852b2af006d4412a89b SHA512 485c06669a74a70a6da64bd336c92acb3e6b5614a53174aca14d34d8200da8ff90df755f25052c2113da34479f3430ff481b43e0c7c1cc8575d39e3f97d8201b MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571 diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild index fd0611532b63..e348cb31a4d5 100644 --- a/net-im/kadu/kadu-4.3-r2.ebuild +++ b/net-im/kadu/kadu-4.3-r2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.kadu.net" SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" SLOT="0" IUSE="+gadu mpd otr sdk speech spell xmpp" REQUIRED_USE=" diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest new file mode 100644 index 000000000000..080dbb792f77 --- /dev/null +++ b/net-im/libcommuni/Manifest @@ -0,0 +1,4 @@ +AUX uchardet.pri 473 BLAKE2B 811ea967aa76d8c59b4077042819aa952d2b35364fc3d8f7d9b4922839f05c8f31a9a9d33d01a23d8de7b0d0f0c4273c0f60dd27458be120c53aa229c5292917 SHA512 9661b94e66ea1223a3b76927ff88f7d50710706f9183bce2a2f3b612c280e300a9e92fa5e16b3296c26c4ce365f6c93d650c0d2e96ddbfa0159f46b819f111b1 +DIST libcommuni-3.5.0.tar.gz 646734 BLAKE2B 81e2c783625a0befe2d364423e862967bc76e8a66e9b5d7f2f94f46f46530d54b030bfd3a48d7877532092c607295cff5a77ecd8bb669112d53507a1ea18c5b0 SHA512 4d62f7e5edd32b9121f2b69d15a4022ad5d6cf7136dc48d0a1ca4bd413b3334533d7734d6939906fa3426f8db9bc255696107ecada19875c60ce59990b54dee4 +EBUILD libcommuni-3.5.0.ebuild 2246 BLAKE2B 7b32a7bdc00b5e2e0423da7c8d12e040615d9be2ed73dbac4d42c03f0805b3d050eaf65ce98bf4a312911463fdbce5f91b2b41e3fb0ea7e86a888dc7be2cb901 SHA512 008c8942a62a2eeafa66b4d983875d51be1fbdaa42fcc648d120634cc35cae91cce359df08f74012de09c81cd3477ed60fab8b2addbbd29bc2f0a9d4de254f02 +MISC metadata.xml 797 BLAKE2B 9dc5a8109d9b5421c2ae2b8fa49bef5012107e5356975fe3ec2879bf02395d0762b370400c19a9bcefb90583b985c91bfcc42b934849b964496b2857640bccc2 SHA512 61814cbb96bb1a263bdecdba5adf4620dd35d9444065499af20523674573c9297ea39f52b740e7bf19cabf6cb63a116209f95a9a6edc4d25fe7d2966c9e36d7e diff --git a/net-im/libcommuni/files/uchardet.pri b/net-im/libcommuni/files/uchardet.pri new file mode 100644 index 000000000000..d22393b76d26 --- /dev/null +++ b/net-im/libcommuni/files/uchardet.pri @@ -0,0 +1,17 @@ +###################################################################### +# Communi +###################################################################### + +include(../pkg.pri) + +pkgExists(uchardet) { + CONFIG += link_pkgconfig + PKGCONFIG += uchardet +} + +isEmpty(PKGCONFIG) { + error("UChardet support has been enabled, but the UChardet installation has not been found. Did you emerged app-i18n/uchardet?") +} else { + LIBS += -luchardet + INCPATH += -isystem /usr/include/uchardet +} diff --git a/net-im/libcommuni/libcommuni-3.5.0.ebuild b/net-im/libcommuni/libcommuni-3.5.0.ebuild new file mode 100644 index 000000000000..166369b11ab3 --- /dev/null +++ b/net-im/libcommuni/libcommuni-3.5.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="A cross-platform IRC framework written with Qt" +HOMEPAGE="http://communi.github.io/" +SRC_URI="https://github.com/communi/libcommuni/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="qml test +uchardet" + +# Compiling with USE="test" is currently broken with dev-libs/icu +# See: https://github.com/communi/libcommuni/issues/60 +REQUIRED_USE="test? ( uchardet )" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + uchardet? ( app-i18n/uchardet ) + !uchardet? ( dev-libs/icu:= )" + +DEPEND="test? ( dev-qt/qttest:5 ) + ${RDEPEND}" + +RESTRICT="!test? ( test )" + +src_prepare() { + default + + # Don't use bundled uchardet, use instead app-i18n/uchardet + rm -rf src/3rdparty/uchardet-0.0.1/* || die + cp "${FILESDIR}"/uchardet.pri src/3rdparty/uchardet-0.0.1/uchardet.pri || die +} + +src_configure() { + local myqmakeargs=( libcommuni.pro + # Disables compile run-time benchmarks, as they don't make any sense + -config no_benchmarks + # Disables examples, as no new files are installed + -config no_examples + # Is needed for fixing the QA Notice: The following files contain insecure RUNPATHs + -config no_rpath + # Compile libcommuni always in Release mode, as Debug seems to do nothing + -config release + # Don't silence all compile messages + -config verbose + -config $(usex qml '' 'no_')install_imports + -config $(usex qml '' 'no_')install_qml + -config $(usex test '' 'no_')tests + -config $(usex uchardet 'no_' '')icu + -config $(usex uchardet '' 'no_')uchardet ) + + eqmake5 "${myqmakeargs[@]}" +} + +src_test() { + # This is a hack to delete the existing LD_LIBRARY_PATH and set a new one, + # otherwise a test will fail, because it uses the system installed lib instead of the new compiled lib. + # The test will fail, when libcommuni is emerged with USE="uchardet" and + # libcommuni is already installed with USE="-uchardat", or the other way around. + find "${S}" -type f -name 'target_wrapper.sh' -exec sed -i -e "/.*LD_LIBRARY_PATH.*/d" {} \; || die + local -x LD_LIBRARY_PATH="${S}/lib" + + default +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +} diff --git a/net-im/libcommuni/metadata.xml b/net-im/libcommuni/metadata.xml new file mode 100644 index 000000000000..40dcff97d647 --- /dev/null +++ b/net-im/libcommuni/metadata.xml @@ -0,0 +1,21 @@ + + + + + ck+gentoo@bl4ckb0x.de + Conrad Kostecki + + + proxy-maint@gentoo.org + Proxy Maintainers + + + A cross-platform IRC framework written with Qt. + Communi provides a set of tools for enabling + IRC connectivity in Qt-based C++ and QML applications. + + + Install optional qml files. + Use app-i18n/uchardet, which is upstreams default, instead of dev-libs/icu, which makes impossible to run tests. + + diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index 6a6a0dad6f12..11370afbc0e9 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST signal-desktop_1.8.0_amd64.deb 64534608 BLAKE2B dfa58aeaafec4c4939ac5d6fc09deec48511038ae25b133e45b2d14459241254c66a46474d5799dfb9952c2dc09b62f657803189e6990db7c997d620ab88e16d SHA512 e4bd200362476ac25c37322c42a06dae2824fea57a3224919ccdb8f07d5b217c0a2f54b3b57cc3db789b7d83909949ecfcab1fba0a98360502f2ce04bff9e3fe -EBUILD signal-desktop-bin-1.8.0.ebuild 1231 BLAKE2B f5d6133c1f09d6335074a7d22b61f866b626a881e074f20df41484f97498d6ed4fc5cbb88eec6c86663f94c7f2ada04cbcca419b7b2d33d3cb0ca7730e080568 SHA512 dac032025dfb40ed7e88739f180fdecb64a2001d5b294e10afb2752fe54814876329250e669ed78c986b670a3d2e7a00e4d61b702c080ddd355d765a9b88cea6 +DIST signal-desktop_1.10.0_amd64.deb 64197564 BLAKE2B 2dbf673094a532f49c89d25de2689303ae5f36abefa7fdcc38e9899a51a1093db5699a31fa0b0f6fd5641292c6fa707bc8c9dbb0710ce391c40302219ddd681a SHA512 07d5c6e59c5788cd4c15b82c72f90af39f3a232a2f5d92ac80b484dcd55c3e45d1e6bd8714b90906567b0f45d5833d9b0b1818731482f72517d9b22a50cd1fa1 +EBUILD signal-desktop-bin-1.10.0.ebuild 1231 BLAKE2B f5d6133c1f09d6335074a7d22b61f866b626a881e074f20df41484f97498d6ed4fc5cbb88eec6c86663f94c7f2ada04cbcca419b7b2d33d3cb0ca7730e080568 SHA512 dac032025dfb40ed7e88739f180fdecb64a2001d5b294e10afb2752fe54814876329250e669ed78c986b670a3d2e7a00e4d61b702c080ddd355d765a9b88cea6 MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild new file mode 100644 index 000000000000..5fec1e934090 --- /dev/null +++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.10.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_PN="${PN/-bin/}" + +inherit gnome2-utils pax-utils unpacker xdg-utils +DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" +HOMEPAGE="https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop" +SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ayatana" + +RESTRICT="bindist mirror" + +RDEPEND=" + gnome-base/gconf:2 + dev-libs/nss + x11-libs/libXScrnSaver + x11-libs/libXtst + net-print/cups + ayatana? ( dev-libs/libappindicator:3 ) + " + +QA_PREBUILT="opt/Signal/signal-desktop + opt/Signal/libnode.so + opt/Signal/libffmpeg.so" + +S="${WORKDIR}" + +src_install() { + insinto / + dodoc -r usr/share/doc/signal-desktop/. + doins -r opt + insinto /usr/share + doins -r usr/share/applications + doins -r usr/share/icons + fperms +x /opt/Signal/signal-desktop + pax-mark m opt/Signal/signal-desktop + + dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild deleted file mode 100644 index 5fec1e934090..000000000000 --- a/net-im/signal-desktop-bin/signal-desktop-bin-1.8.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/-bin/}" - -inherit gnome2-utils pax-utils unpacker xdg-utils -DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" -HOMEPAGE="https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop" -SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ayatana" - -RESTRICT="bindist mirror" - -RDEPEND=" - gnome-base/gconf:2 - dev-libs/nss - x11-libs/libXScrnSaver - x11-libs/libXtst - net-print/cups - ayatana? ( dev-libs/libappindicator:3 ) - " - -QA_PREBUILT="opt/Signal/signal-desktop - opt/Signal/libnode.so - opt/Signal/libffmpeg.so" - -S="${WORKDIR}" - -src_install() { - insinto / - dodoc -r usr/share/doc/signal-desktop/. - doins -r opt - insinto /usr/share - doins -r usr/share/applications - doins -r usr/share/icons - fperms +x /opt/Signal/signal-desktop - pax-mark m opt/Signal/signal-desktop - - dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} -- cgit v1.2.3