gnome-extra/cinnamon: fixup REQUIRED_USE

Generate python_targets flags using python_gen_useflags. We don't need
PYTHON_REQUIRED_USE since we generate a more strict set of flags anyway.

Package-Manager: portage-2.3.2

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
index 4a341c8c73138b7d4f4c0c759ad3275ac931800f..6926d9fcd3b4f7373f7d92ccddeadc2d7330c966 100644 (file)
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 IUSE="+nls +networkmanager" #+bluetooth
 
 # We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       python_targets_python2_7
-       || ( python_targets_python3_4 python_targets_python3_5 )
+REQUIRED_USE="
+       $(python_gen_useflags 'python2*')
+       || ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="amd64 x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
index c7b8dbffa66b5012e034ddcb15fe08507d4ad609..436d77202361b1c7248f03d1e9f098c7cab7a192 100644 (file)
--- a/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.6.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 IUSE="+nls +networkmanager" #+bluetooth
 
 # We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       python_targets_python2_7
-       || ( python_targets_python3_4 python_targets_python3_5 )
+REQUIRED_USE="
+       $(python_gen_useflags 'python2*')
+       || ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index db72f0097c98d89311fbea8a167c7388cc7d4399..374b93ae9208990cbacc08f4aa37f4a855e25150 100644 (file)
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 IUSE="+nls +networkmanager" #+bluetooth
 
 # We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       python_targets_python2_7
-       || ( python_targets_python3_4 python_targets_python3_5 )
+REQUIRED_USE="
+       $(python_gen_useflags 'python2*')
+       || ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="~amd64 ~x86"

diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
index dc5672e44051de81e3ed6c4a048e031ddaf1b655..0d4b6622ba673408b1f1659ba5f51227c3c3b9ad 100644 (file)
--- a/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7.ebuild
@@ -24,9 +24,9 @@ SLOT="0"
 IUSE="+nls +networkmanager" #+bluetooth
 
 # We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       python_targets_python2_7
-       || ( python_targets_python3_4 python_targets_python3_5 )
+REQUIRED_USE="
+       $(python_gen_useflags 'python2*')
+       || ( $(python_gen_useflags 'python3*') )
 "
 
 KEYWORDS="amd64 x86"