| 1 |
commit: a40bbd257936dc1719ea36e274e6fb96c113601a |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Wed Oct 2 20:00:51 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 4 18:40:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a40bbd25 |
| 7 |
|
| 8 |
app-i18n/tagainijisho: Use EAPI="7". Update code for non-live versions. |
| 9 |
|
| 10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
app-i18n/tagainijisho/tagainijisho-9999.ebuild | 49 ++++++++++++++++---------- |
| 14 |
1 file changed, 30 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild |
| 17 |
index 11c02a413f1..ca0b9b19513 100644 |
| 18 |
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild |
| 19 |
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Foundation |
| 22 |
+# Copyright 2014-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI="6" |
| 26 |
+EAPI="7" |
| 27 |
|
| 28 |
-inherit cmake-utils gnome2-utils |
| 29 |
+inherit cmake-utils xdg-utils |
| 30 |
|
| 31 |
if [[ "${PV}" == 9999 ]]; then |
| 32 |
inherit git-r3 |
| 33 |
@@ -14,9 +14,15 @@ elif [[ "${PV}" == *_pre* ]]; then |
| 34 |
|
| 35 |
TAGAINIJISHO_GIT_REVISION="" |
| 36 |
fi |
| 37 |
+if [[ "${PV}" != 9999 ]]; then |
| 38 |
+ TAGAINIJISHO_VERSION="${PV%_p*_p*}" |
| 39 |
+ JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" |
| 40 |
+ JMDICT_DATE="${JMDICT_DATE%_p*}" |
| 41 |
+ JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}" |
| 42 |
+ KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" |
| 43 |
+ KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" |
| 44 |
+fi |
| 45 |
if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then |
| 46 |
- JMDICT_DATE="" |
| 47 |
- KANJIDIC2_DATE="" |
| 48 |
KANJIVG_VERSION="20160426" |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -25,15 +31,13 @@ HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" |
| 52 |
if [[ "${PV}" == 9999 ]]; then |
| 53 |
SRC_URI="" |
| 54 |
elif [[ "${PV}" == *_pre* ]]; then |
| 55 |
- SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${P}.tar.gz" |
| 56 |
+ SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" |
| 57 |
else |
| 58 |
- SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 59 |
+ SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" |
| 60 |
fi |
| 61 |
-if [[ "${PV}" == *_pre* ]]; then |
| 62 |
+if [[ "${PV}" != 9999 ]]; then |
| 63 |
# Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz |
| 64 |
SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" |
| 65 |
-fi |
| 66 |
-if [[ "${PV}" == *_pre* ]]; then |
| 67 |
# Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz |
| 68 |
SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" |
| 69 |
fi |
| 70 |
@@ -45,27 +49,34 @@ LICENSE="GPL-3+ public-domain" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="" |
| 73 |
IUSE="" |
| 74 |
+if [[ "${PV}" == 9999 ]]; then |
| 75 |
+ PROPERTIES="live" |
| 76 |
+fi |
| 77 |
|
| 78 |
-RDEPEND=">=dev-db/sqlite-3.12:3 |
| 79 |
+BDEPEND="dev-qt/linguist-tools:5" |
| 80 |
+DEPEND=">=dev-db/sqlite-3.12:3 |
| 81 |
dev-qt/qtcore:5 |
| 82 |
dev-qt/qtnetwork:5 |
| 83 |
dev-qt/qtprintsupport:5 |
| 84 |
dev-qt/qtwidgets:5" |
| 85 |
-DEPEND="${RDEPEND} |
| 86 |
- dev-qt/linguist-tools:5" |
| 87 |
+RDEPEND="${DEPEND}" |
| 88 |
|
| 89 |
pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) |
| 90 |
IUSE+=" ${pkg_langs[@]/#/l10n_}" |
| 91 |
unset pkg_langs |
| 92 |
|
| 93 |
+if [[ "${PV}" != 9999 ]]; then |
| 94 |
+ S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" |
| 95 |
+fi |
| 96 |
+ |
| 97 |
src_unpack() { |
| 98 |
if [[ "${PV}" == 9999 ]]; then |
| 99 |
git-r3_src_unpack |
| 100 |
elif [[ "${PV}" == *_pre* ]]; then |
| 101 |
- unpack ${P}.tar.gz |
| 102 |
- mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die |
| 103 |
+ unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz |
| 104 |
+ mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die |
| 105 |
else |
| 106 |
- unpack ${P}.tar.gz |
| 107 |
+ unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz |
| 108 |
fi |
| 109 |
|
| 110 |
if [[ "${PV}" == 9999 ]]; then |
| 111 |
@@ -118,7 +129,7 @@ src_unpack() { |
| 112 |
mkdir "${S}/3rdparty" || die |
| 113 |
gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die |
| 114 |
gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die |
| 115 |
- elif [[ "${PV}" == *_pre* ]]; then |
| 116 |
+ else |
| 117 |
mkdir "${S}/3rdparty" || die |
| 118 |
pushd "${S}/3rdparty" > /dev/null || die |
| 119 |
|
| 120 |
@@ -181,9 +192,9 @@ src_configure() { |
| 121 |
} |
| 122 |
|
| 123 |
pkg_postinst() { |
| 124 |
- gnome2_icon_cache_update |
| 125 |
+ xdg_icon_cache_update |
| 126 |
} |
| 127 |
|
| 128 |
pkg_postrm() { |
| 129 |
- gnome2_icon_cache_update |
| 130 |
+ xdg_icon_cache_update |
| 131 |
} |
Archives