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 8531A138334 for ; Fri, 4 Oct 2019 18:43:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1909AE0848; Fri, 4 Oct 2019 18:43:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBA2BE0848 for ; Fri, 4 Oct 2019 18:43:12 +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 7A04234B914 for ; Fri, 4 Oct 2019 18:43:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFF26744 for ; Fri, 4 Oct 2019 18:43:08 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1570214418.a40bbd257936dc1719ea36e274e6fb96c113601a.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/tagainijisho/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/tagainijisho/tagainijisho-9999.ebuild X-VCS-Directories: app-i18n/tagainijisho/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a40bbd257936dc1719ea36e274e6fb96c113601a X-VCS-Branch: master Date: Fri, 4 Oct 2019 18:43:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a6dd8df1-3135-45b1-9d33-e3f736788db0 X-Archives-Hash: 6a76379599ee3ee1da716018982b3710 commit: a40bbd257936dc1719ea36e274e6fb96c113601a Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Oct 2 20:00:51 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Oct 4 18:40:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a40bbd25 app-i18n/tagainijisho: Use EAPI="7". Update code for non-live versions. Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> app-i18n/tagainijisho/tagainijisho-9999.ebuild | 49 ++++++++++++++++---------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild index 11c02a413f1..ca0b9b19513 100644 --- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild +++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2014-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils gnome2-utils +inherit cmake-utils xdg-utils if [[ "${PV}" == 9999 ]]; then inherit git-r3 @@ -14,9 +14,15 @@ elif [[ "${PV}" == *_pre* ]]; then TAGAINIJISHO_GIT_REVISION="" fi +if [[ "${PV}" != 9999 ]]; then + TAGAINIJISHO_VERSION="${PV%_p*_p*}" + JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" + JMDICT_DATE="${JMDICT_DATE%_p*}" + JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}" + KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" + KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" +fi if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - JMDICT_DATE="" - KANJIDIC2_DATE="" KANJIVG_VERSION="20160426" fi @@ -25,15 +31,13 @@ HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" if [[ "${PV}" == 9999 ]]; then SRC_URI="" elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" else - SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" fi -if [[ "${PV}" == *_pre* ]]; then +if [[ "${PV}" != 9999 ]]; then # Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" -fi -if [[ "${PV}" == *_pre* ]]; then # Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" fi @@ -45,27 +49,34 @@ LICENSE="GPL-3+ public-domain" SLOT="0" KEYWORDS="" IUSE="" +if [[ "${PV}" == 9999 ]]; then + PROPERTIES="live" +fi -RDEPEND=">=dev-db/sqlite-3.12:3 +BDEPEND="dev-qt/linguist-tools:5" +DEPEND=">=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" +RDEPEND="${DEPEND}" pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) IUSE+=" ${pkg_langs[@]/#/l10n_}" unset pkg_langs +if [[ "${PV}" != 9999 ]]; then + S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" +fi + src_unpack() { if [[ "${PV}" == 9999 ]]; then git-r3_src_unpack elif [[ "${PV}" == *_pre* ]]; then - unpack ${P}.tar.gz - mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die + unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz + mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die else - unpack ${P}.tar.gz + unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz fi if [[ "${PV}" == 9999 ]]; then @@ -118,7 +129,7 @@ src_unpack() { mkdir "${S}/3rdparty" || die gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die - elif [[ "${PV}" == *_pre* ]]; then + else mkdir "${S}/3rdparty" || die pushd "${S}/3rdparty" > /dev/null || die @@ -181,9 +192,9 @@ src_configure() { } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update }