gentoo resync : 13.10.2019

1 files changed, 30 insertions, 19 deletions

diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
index 11c02a413f1c..ca0b9b195131 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
 }