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 8CC44139694 for ; Sat, 11 Mar 2017 06:10:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 575B0E0C2F; Sat, 11 Mar 2017 06:10:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 234FEE0C2F for ; Sat, 11 Mar 2017 06:10:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BB12340E75 for ; Sat, 11 Mar 2017 06:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BD5D642B for ; Sat, 11 Mar 2017 06:10:42 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1489212615.3f851c074fcf5b53ec3acd5f517bad783d59b0be.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/vym/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/vym/vym-9999.ebuild X-VCS-Directories: x11-misc/vym/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 3f851c074fcf5b53ec3acd5f517bad783d59b0be X-VCS-Branch: master Date: Sat, 11 Mar 2017 06:10:42 +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: 79b3cca0-21cb-42f2-95e0-f2bba92ef2ec X-Archives-Hash: 14b603001f99e1b13a551e1a661d2662 commit: 3f851c074fcf5b53ec3acd5f517bad783d59b0be Author: Jeroen Roovers gentoo org> AuthorDate: Sat Mar 11 06:10:15 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Mar 11 06:10:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f851c07 x11-misc/vym: Update live ebuild. Package-Manager: Portage-2.3.4, Repoman-2.3.2 x11-misc/vym/vym-9999.ebuild | 72 ++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild index f715ebabefe..7d4bc1509eb 100644 --- a/x11-misc/vym/vym-9999.ebuild +++ b/x11-misc/vym/vym-9999.ebuild @@ -1,59 +1,65 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils cmake-utils git-r3 +EAPI=6 + +PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW" + +inherit eutils git-r3 l10n qmake-utils DESCRIPTION="View Your Mind, a mindmap tool" HOMEPAGE="http://www.insilmaril.de/vym/" -EGIT_REPO_URI="git://git.code.sf.net/p/vym/code" +EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE="dbus" -VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW ) -IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}" - -DEPEND=" - dev-qt/qtgui:4[qt3support] - dev-qt/qtsvg:4 - dbus? ( dev-qt/qtdbus:4 ) -" RDEPEND=" - ${DEPEND} - app-arch/zip + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtxml:5 + dbus? ( dev-qt/qtdbus:5 ) +" +DEPEND=" + ${RDEPEND} + dev-qt/linguist-tools:5 " -DOCS=( README.txt ) +DOCS=( README.md ) src_prepare() { - epatch "${FILESDIR}"/${PN}-2.3.22-arrowobj.patch + default + + remove_locale() { + sed -i \ + -e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \ + vym.pro || die + } + + #remove dead en translation + rm lang/vym.en.ts || die + remove_locale en - sed -i \ - -e '/lang\/vym_en.ts/d' \ - CMakeLists.txt || die - rm -r lang/vym_en.ts || die + l10n_find_plocales_changes lang ${PN}. .ts + l10n_for_each_disabled_locale_do remove_locale + + "$(qt5_get_bindir)"/lrelease vym.pro || die } src_configure() { - local lingua - for lingua in ${VYM_LINGUAS[@]}; do - if ! use linguas_${lingua}; then - sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die - rm -r lang/vym_${lingua}.ts || die - fi - done - - local mycmakeargs=( - $(cmake-utils_use !dbus NO_DBUS) - ) - cmake-utils_src_configure + eqmake5 vym.pro \ + PREFIX="${EPREFIX}"/usr \ + DATADIR="${EPREFIX}"/usr/share \ + $(usex dbus "" NO_DBUS=1 ) } src_install() { - cmake-utils_src_install + emake INSTALL_ROOT="${D}" install + einstalldocs doman doc/vym.1.gz + make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education }