[gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/

[Andreas Sturmlechner]

commit:     af7119e92057a34dd87ae2090e43672d6cb45b60
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 18:39:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:39:38 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=af7119e9

kde-plasma/breeze-gtk: Revert "Switch to python-r1"

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/breeze-gtk/breeze-gtk-5.15.49.9999.ebuild | 8 +++-----
 kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild         | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.15.49.9999.ebuild 
b/kde-plasma/breeze-gtk/breeze-gtk-5.15.49.9999.ebuild
index 13c04f755d..fe5865c1c7 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.15.49.9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.15.49.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-r1
+inherit kde5 python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git";
@@ -12,15 +12,13 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 BDEPEND="${PYTHON_DEPS}
        $(add_plasma_dep breeze)
-       dev-python/pycairo[${PYTHON_USEDEP}]
+       $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
        dev-ruby/sass
 "
 
 pkg_setup() {
-       python_setup
+       python-any-r1_pkg_setup
        kde5_pkg_setup
 }

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild 
b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index 13c04f755d..fe5865c1c7 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-r1
+inherit kde5 python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git";
@@ -12,15 +12,13 @@ LICENSE="LGPL-2.1+"
 KEYWORDS=""
 IUSE=""
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 BDEPEND="${PYTHON_DEPS}
        $(add_plasma_dep breeze)
-       dev-python/pycairo[${PYTHON_USEDEP}]
+       $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
        dev-ruby/sass
 "
 
 pkg_setup() {
-       python_setup
+       python-any-r1_pkg_setup
        kde5_pkg_setup
 }