[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

[Tim Harder]

commit:     d96787fd9d20aaa1d2e0ccba8ce804a712587297
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 21:52:34 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 21:56:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96787fd

x11-terms/kitty: update to EAPI 7 and fix BDEPEND

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 .../{kitty-9999.ebuild => kitty-0.14.6-r1.ebuild}      | 18 +++++++++---------
 x11-terms/kitty/kitty-9999.ebuild                      | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-0.14.6-r1.ebuild
similarity index 86%
copy from x11-terms/kitty/kitty-9999.ebuild
copy to x11-terms/kitty/kitty-0.14.6-r1.ebuild
index c51e3ffd52d..8fa3a58dc70 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-0.14.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit python-single-r1 toolchain-funcs gnome2-utils
+inherit python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git";
@@ -49,13 +49,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
        media-libs/mesa[X(+)]
        sys-libs/ncurses
-       virtual/pkgconfig
 "
 [[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-       "${FILESDIR}"/${P}-flags.patch
-       "${FILESDIR}"/${P}-svg-icon.patch
+       "${FILESDIR}"/${PN}-0.14.4-flags.patch
+       "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 
 src_prepare() {
@@ -90,8 +90,8 @@ src_test() {
 }
 
 src_install() {
-       mkdir -p "${ED}"usr || die
-       cp -r linux-package/* "${ED}usr" || die
+       mkdir -p "${ED}"/usr || die
+       cp -r linux-package/* "${ED}/usr" || die
        python_fix_shebang "${ED}"
 
        if ! use doc; then
@@ -100,9 +100,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index c51e3ffd52d..1d1a09c24c6 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit python-single-r1 toolchain-funcs gnome2-utils
+inherit python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git";
@@ -49,9 +49,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
        media-libs/mesa[X(+)]
        sys-libs/ncurses
-       virtual/pkgconfig
 "
 [[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
        "${FILESDIR}"/${P}-flags.patch
@@ -90,8 +90,8 @@ src_test() {
 }
 
 src_install() {
-       mkdir -p "${ED}"usr || die
-       cp -r linux-package/* "${ED}usr" || die
+       mkdir -p "${ED}"/usr || die
+       cp -r linux-package/* "${ED}/usr" || die
        python_fix_shebang "${ED}"
 
        if ! use doc; then
@@ -100,9 +100,9 @@ src_install() {
 }
 
 pkg_postinst() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }
 
 pkg_postrm() {
-       gnome2_icon_cache_update
+       xdg_icon_cache_update
 }