diff options
Diffstat (limited to 'net-im/psi')
| -rw-r--r-- | net-im/psi/Manifest | 4 | ||||
| -rw-r--r-- | net-im/psi/metadata.xml | 25 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 92 |
3 files changed, 49 insertions, 72 deletions
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index e61c761cdd88..2a07ca9fbf6e 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,5 +1,5 @@ DIST psi-1.4.tar.xz 2119840 BLAKE2B 28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8 SHA512 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1 DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea SHA512 ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d EBUILD psi-1.4.ebuild 3044 BLAKE2B 8806290884b2fba05e96e1a62871ce5725ac3d98fab8911f1ca8cff417782e7e0d1ec17ce526057ae7e531960235a6f6e720f627b0d3b5e86ccd96b63fe242a6 SHA512 e2074aa6e9f7add4eb7c4114cb48d987c2ae8e54e258a84ee08c2db15faf9189bafb099a3d3c4648294fdca8b7f35e3ba91830d34d6756a3910f9b9ef8f34f95 -EBUILD psi-9999.ebuild 5175 BLAKE2B 83a9037c5cfed1b974b30f05844b8c5e10c7a069fc1bdc6b69ae11f14cc38d662853d4f2f0a34857044213cb8dea1fcab58a9c4a0aced35a84f32e1e1a352541 SHA512 c9f50f83972dfbc450f56435919067a828dc7124e02a49b004feb64a1910a5178db8e2bc0d6574bb1e17e51296a566df39486ccb120d8f10a3f26b314e146780 -MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820 +EBUILD psi-9999.ebuild 4107 BLAKE2B fc7ec67e8cea56c0d46c8ae7daf46fde53bb47b0de8ab493594fc74d4780623dd710cb85defa66701eeb5b625004f8a09d55facea00ae171d253da2dc1037289 SHA512 96f1c6fa0c51ec73669353cab19ec1ec81847e67fd77bf71a8faa80f660efd4686051dcc84a46b60086e76754be080318a59d9d02511c72b58eec9e71d160300 +MISC metadata.xml 1590 BLAKE2B 62e74a8df75bc595d981c86b88e40344d76bddb46aff04aeb02f22207c8061e7b8c19d3794b6019e61790ea0aeaebed8c5dcd09a7070a7c6269f406eebaddea1 SHA512 4cac19074bd1080d9af4105adf61abfd25a7f07cc4d1581683a716bf2546450eda90347e9da0e11d012b148cec2ff35b32906a469000960e1465cb9c167855b8 diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml index 96ff15122396..d1fdaf8e1f54 100644 --- a/net-im/psi/metadata.xml +++ b/net-im/psi/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> @@ -9,17 +9,20 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription>Psi is a very good XMPP client that uses Qt</longdescription> + <longdescription> + Psi is a multi-platform XMPP client based on Qt and supports a wide range of XMPP extensions. It is extremely configurable and extendable with plugins. + </longdescription> <use> - <flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag> - <flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag> - <flag name='extras'>Enable Psi+ patcheset</flag> - <flag name='hunspell'>Enable spellchecking using <pkg>app-text/hunspell</pkg></flag> - <flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag> - <flag name='sql'>Enable psi-new-history extras patch</flag> - <flag name='webengine'>Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag> - <flag name='webkit'>Enable themed, html-based chatlogs</flag> - <flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag> + <flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag> + <flag name="enchant">Enable spellchecking using <pkg>app-text/enchant</pkg></flag> + <flag name="extras">Enable Psi+ patchset</flag> + <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag> + <flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag> + <flag name="keyring">Enable storing password in system keyring manager</flag> + <flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag> + <flag name="webkit">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebkit</pkg></flag> + <flag name="whiteboarding">Enable experimental interactive SVG drawing</flag> + <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag> </use> <upstream> <remote-id type="github">psi-im/psi</remote-id> diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index e1a2ea1f5729..6e6329011f16 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -3,10 +3,10 @@ EAPI=7 -PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" +PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit l10n git-r3 qmake-utils xdg +inherit git-r3 cmake l10n qmake-utils xdg DESCRIPTION="Qt XMPP client" HOMEPAGE="https://psi-im.org" @@ -20,13 +20,11 @@ EGIT_MIN_CLONE_TYPE="single" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql webengine webkit whiteboarding xscreensaver" +IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine webkit xscreensaver" REQUIRED_USE=" ?? ( aspell enchant hunspell ) iconsets? ( extras ) - sql? ( extras ) - webengine? ( !webkit ) " BDEPEND=" @@ -43,28 +41,30 @@ DEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 net-dns/libidn:0 + net-libs/http-parser:= sys-libs/zlib[minizip] x11-libs/libX11 x11-libs/libxcb aspell? ( app-text/aspell ) dbus? ( dev-qt/qtdbus:5 ) - enchant? ( >=app-text/enchant-1.3.0:0 ) + enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) + keyring? ( dev-libs/qtkeychain:= ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] net-libs/http-parser ) webkit? ( dev-qt/qtwebkit:5 ) - whiteboarding? ( dev-qt/qtsvg:5 ) - xscreensaver? ( x11-libs/libXScrnSaver ) " RDEPEND="${DEPEND} dev-qt/qtimageformats + crypt? ( app-crypt/qca[gpg] ) " RESTRICT="test iconsets? ( bindist )" @@ -83,6 +83,8 @@ pkg_setup() { ewarn "and has not clear licensing." ewarn "Possibly this build is not redistributable in some countries." fi + + EGIT_REPO_URI="${PSI_PLUS_URI}/${MY_PN}-snapshots.git" fi } @@ -95,75 +97,47 @@ src_unpack() { EGIT_CHECKOUT_DIR="${WORKDIR}/psi-l10n" git-r3_src_unpack - if use extras; then + if use iconsets; then unset EGIT_BRANCH EGIT_COMMIT - EGIT_CHECKOUT_DIR="${WORKDIR}/psi-plus" \ - EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \ + EGIT_REPO_URI="${PSI_URI}/resources.git" \ git-r3_src_unpack - - if use iconsets; then - unset EGIT_BRANCH EGIT_COMMIT - EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \ - EGIT_REPO_URI="${PSI_PLUS_URI}/resources.git" \ - git-r3_src_unpack - fi fi } src_prepare() { - default - if use extras; then - cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets" - if use iconsets; then - cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets" - fi - - eapply "${WORKDIR}/psi-plus/patches"/*.diff - use sql && eapply "${WORKDIR}/psi-plus/patches/dev/psi-new-history.patch" - - vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version" - features="$(use webkit && echo '--webkit') $(use webengine && echo '--webengine') $(use sql && echo '--sql')" - NIGHTLY_VER=$("${vergen}" ./ $features) - elog "Prepared version: ${NIGHTLY_VER}" - echo "${NIGHTLY_VER}" > version || die "Failed to write version file" - - qconf || die "Failed to create ./configure." + cmake_src_prepare + if use iconsets; then + cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets" fi } src_configure() { - CONF=( - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/$(get_libdir) - --no-separate-debug-info - --qtdir="$(qt5_get_bindir)/.." - $(use_enable aspell) - $(use_enable dbus qdbus) - $(use_enable enchant) - $(use_enable hunspell) - $(use_enable xscreensaver xss) - $(use_enable whiteboarding) + local chattype=basic + use webengine && chattype=webengine + use webkit && chattype=webkit + + local mycmakeargs=( + -DUSE_ASPELL=$(usex aspell) + -DUSE_ENCHANT=$(usex enchant) + -DUSE_HUNSPELL=$(usex hunspell) + -DUSE_DBUS=$(usex dbus) + -DINSTALL_PLUGINS_SDK=1 + -DUSE_KEYCHAIN=$(usex keyring) + -DCHAT_TYPE=$chattype + -DUSE_XSS=$(usex xscreensaver) + -DPSI_PLUS=$(usex extras) ) - - use debug && CONF+=("--debug") - use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") - use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit") - - # This may generate warnings if passed option already matches with default. - # Just ignore them. It's how qconf-based configure works and will be fixed in - # future qconf versions. - ./configure "${CONF[@]}" || die "configure failed" - - eqmake5 psi.pro + cmake_src_configure } src_compile() { - emake + cmake_src_compile use doc && emake -C doc api_public } src_install() { - emake INSTALL_ROOT="${D}" install + cmake_src_install # this way the docs will be installed in the standard gentoo dir rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "doc files set seems to have changed" |