From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CFCE8139694 for ; Sun, 18 Jun 2017 12:04:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 156B722400E; Sun, 18 Jun 2017 12:04:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4CBE22400E for ; Sun, 18 Jun 2017 12:04:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EFBC341706 for ; Sun, 18 Jun 2017 12:04:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BFA17477 for ; Sun, 18 Jun 2017 12:04:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1497787397.89b4006be09f5a68c2b7d96e6100bbce5c321724.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/vacuum/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/vacuum/metadata.xml net-im/vacuum/vacuum-9999.ebuild X-VCS-Directories: net-im/vacuum/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 89b4006be09f5a68c2b7d96e6100bbce5c321724 X-VCS-Branch: master Date: Sun, 18 Jun 2017 12:04:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9844a25f-8ed2-4462-a8ef-cd50fccff022 X-Archives-Hash: 8b89c730a3c1aca3cab5391cfd51f1e0 commit: 89b4006be09f5a68c2b7d96e6100bbce5c321724 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 18 11:45:03 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 18 12:03:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b4006b net-im/vacuum: Switch to building 'dev_qt5' branch - Bump to EAPI 6 - Switch to l10n.eclass Thanks-to: reagentoo gmail.com> Gentoo-bug: 588714, 620724 Package-Manager: Portage-2.3.5, Repoman-2.3.1 net-im/vacuum/metadata.xml | 1 - net-im/vacuum/vacuum-9999.ebuild | 71 ++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml index 3c658b4028b..3f054b4c28b 100644 --- a/net-im/vacuum/metadata.xml +++ b/net-im/vacuum/metadata.xml @@ -48,7 +48,6 @@ Allows other plugins to load data from custom types of URLs Enable obtaining peer's personal contact information Allow other plugins to handle XMPP URI queries - Add VCS revision to version number, INSECURE. Select app-text/aspell spell checker backend Select app-text/enchant spell checker backend Select app-text/hunspell spell checker backend diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild index 2b08c43193d..76ab422c67c 100644 --- a/net-im/vacuum/vacuum-9999.ebuild +++ b/net-im/vacuum/vacuum-9999.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -LANGS="de pl ru uk" +EAPI=6 -inherit cmake-utils git-r3 +EGIT_BRANCH="dev_qt5" +EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git" +PLOCALES="de es pl ru uk" +inherit cmake-utils git-r3 l10n -DESCRIPTION="Qt4 Crossplatform Jabber client" +DESCRIPTION="Qt Crossplatform Jabber client" HOMEPAGE="http://www.vacuum-im.org/" -EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git" LICENSE="GPL-3" -SLOT="0/31" # subslot = libvacuumutils soname version +SLOT="0/37" # subslot = libvacuumutils soname version KEYWORDS="" -PLUGINS=" adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries" +PLUGINS=( adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) SPELLCHECKER_BACKENDS="aspell +enchant hunspell" -IUSE="${PLUGINS// / +} ${SPELLCHECKER_BACKENDS} +spell vcs-revision" -for x in ${LANGS}; do - IUSE+=" linguas_${x}" -done +IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" REQUIRED_USE=" annotations? ( privatestorage ) @@ -41,27 +39,30 @@ REQUIRED_USE=" spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) ) " -RDEPEND=" - >=dev-qt/qtcore-4.8:4[ssl] - >=dev-qt/qtgui-4.8:4 - dev-qt/qtlockedfile[qt4(+)] - >=dev-libs/openssl-1.0.0 - adiummessagestyle? ( >=dev-qt/qtwebkit-4.8:4 ) - filemessagearchive? ( >=dev-qt/qtsql-4.8:4[sqlite] ) - messagearchiver? ( >=dev-qt/qtsql-4.8:4[sqlite] ) +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtlockedfile[qt5(+)] + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtxml:5 + net-dns/libidn + sys-libs/zlib[minizip] + x11-libs/libXScrnSaver + adiummessagestyle? ( dev-qt/qtwebkit:5 ) + filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) + messagearchiver? ( dev-qt/qtsql:5[sqlite] ) spell? ( aspell? ( app-text/aspell ) enchant? ( app-text/enchant ) hunspell? ( app-text/hunspell ) ) - net-dns/libidn - x11-libs/libXScrnSaver - sys-libs/zlib[minizip] +" +RDEPEND="${DEPEND} !net-im/vacuum-spellchecker " -DEPEND="${RDEPEND}" -DOCS="AUTHORS CHANGELOG README TRANSLATORS" +DOCS=( AUTHORS CHANGELOG README TRANSLATORS ) src_prepare() { # Force usage of system libraries @@ -71,34 +72,24 @@ src_prepare() { } src_configure() { - # linguas - local langs="none;" x - for x in ${LANGS}; do - use linguas_${x} && langs+="${x};" - done - local mycmakeargs=( -DINSTALL_LIB_DIR="$(get_libdir)" -DINSTALL_SDK=ON - -DLANGS="${langs}" + -DLANGS="$(l10n_get_locales)" -DINSTALL_DOCS=OFF -DFORCE_BUNDLED_MINIZIP=OFF -DPLUGIN_statistics=OFF + -DNO_WEBKIT=$(usex !adiummessagestyle) + -DPLUGIN_spellchecker=$(usex spell) ) - for x in ${PLUGINS}; do - mycmakeargs+=( "$(cmake-utils_use ${x} PLUGIN_${x})" ) + for x in ${PLUGINS[@]}; do + mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) done - mycmakeargs+=( "$(cmake-utils_use spell PLUGIN_spellchecker)" ) for i in ${SPELLCHECKER_BACKENDS//+/}; do use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" ) done - if use vcs-revision; then - subversion_wc_info # eclass is broken - mycmakeargs+=( -DVER_STRING="${ESVN_WC_REVISION}" ) - fi - cmake-utils_src_configure }