commit: 359854334e5b10ae8f143d9ffa71423a74c009a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 23:40:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 19:13:18 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=35985433
*/*: IUSE gles2 -> gles2-only
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/analitza/analitza-20.03.90.ebuild | 2 +-
kde-apps/analitza/analitza-20.04.49.9999.ebuild | 2 +-
kde-apps/analitza/analitza-9999.ebuild | 2 +-
kde-apps/kdenlive/kdenlive-20.03.90.ebuild | 4 ++--
kde-apps/kdenlive/kdenlive-20.04.49.9999.ebuild | 4 ++--
kde-apps/kdenlive/kdenlive-9999.ebuild | 4 ++--
kde-apps/kdenlive/metadata.xml | 1 -
kde-frameworks/plasma/metadata.xml | 3 ---
kde-frameworks/plasma/plasma-9999.ebuild | 6 +++---
kde-plasma/kinfocenter/kinfocenter-5.18.49.9999.ebuild | 14 +++++++-------
kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 14 +++++++-------
kde-plasma/kinfocenter/metadata.xml | 1 -
kde-plasma/kwin/kwin-5.18.49.9999.ebuild | 7 ++++---
kde-plasma/kwin/kwin-9999.ebuild | 7 ++++---
kde-plasma/kwin/metadata.xml | 1 -
media-gfx/digikam/digikam-7.0.0_beta2.ebuild | 2 +-
media-gfx/digikam/digikam-9999.ebuild | 2 +-
media-gfx/krita/krita-9999.ebuild | 2 +-
18 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/kde-apps/analitza/analitza-20.03.90.ebuild
b/kde-apps/analitza/analitza-20.03.90.ebuild
index 37c37e1637..68e3b648b9 100644
--- a/kde-apps/analitza/analitza-20.03.90.ebuild
+++ b/kde-apps/analitza/analitza-20.03.90.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/analitza/analitza-20.04.49.9999.ebuild
b/kde-apps/analitza/analitza-20.04.49.9999.ebuild
index f83c44acff..4472222a2f 100644
--- a/kde-apps/analitza/analitza-20.04.49.9999.ebuild
+++ b/kde-apps/analitza/analitza-20.04.49.9999.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/analitza/analitza-9999.ebuild
b/kde-apps/analitza/analitza-9999.ebuild
index f83c44acff..4472222a2f 100644
--- a/kde-apps/analitza/analitza-9999.ebuild
+++ b/kde-apps/analitza/analitza-9999.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
b/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
index ba02bfabca..c20235cce0 100644
--- a/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/";
LICENSE="GPL-2"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="freesound gles2 semantic-desktop share v4l"
+IUSE="freesound gles2-only semantic-desktop share v4l"
BDEPEND="
sys-devel/gettext
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-20.04.49.9999.ebuild
b/kde-apps/kdenlive/kdenlive-20.04.49.9999.ebuild
index 5f8301a148..4728a04231 100644
--- a/kde-apps/kdenlive/kdenlive-20.04.49.9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.04.49.9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/";
LICENSE="GPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="freesound gles2 semantic-desktop share v4l"
+IUSE="freesound gles2-only semantic-desktop share v4l"
BDEPEND="
sys-devel/gettext
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild
b/kde-apps/kdenlive/kdenlive-9999.ebuild
index 5f8301a148..4728a04231 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/";
LICENSE="GPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="freesound gles2 semantic-desktop share v4l"
+IUSE="freesound gles2-only semantic-desktop share v4l"
BDEPEND="
sys-devel/gettext
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml
index aacea79d54..350073ec74 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="freesound">Enable freesound.org credentials support
via <pkg>dev-qt/qtwebkit</pkg> to download files</flag>
- <flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
<flag name="share">Enable support for a share menu using
<pkg>kde-frameworks/purpose</pkg></flag>
</use>
</pkgmetadata>
diff --git a/kde-frameworks/plasma/metadata.xml
b/kde-frameworks/plasma/metadata.xml
index 6b9e870031..2fdbf33d96 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -5,7 +5,4 @@
<email>k...@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
- </use>
</pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-9999.ebuild
b/kde-frameworks/plasma/plasma-9999.ebuild
index 6d2b1465a0..8ffdf82330 100644
--- a/kde-frameworks/plasma/plasma-9999.ebuild
+++ b/kde-frameworks/plasma/plasma-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma framework"
LICENSE="LGPL-2+"
KEYWORDS=""
-IUSE="gles2 wayland X"
+IUSE="gles2-only wayland X"
# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
BDEPEND="
@@ -22,7 +22,7 @@ BDEPEND="
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
@@ -45,7 +45,7 @@ RDEPEND="
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
=kde-frameworks/kwindowsystem-${PVCUT}*:5
=kde-frameworks/kxmlgui-${PVCUT}*:5
- !gles2? ( virtual/opengl )
+ !gles2-only? ( virtual/opengl )
wayland? (
=kde-frameworks/kwayland-${PVCUT}*:5
media-libs/mesa[egl]
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.49.9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-5.18.49.9999.ebuild
index 345c110b58..01e161d589 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.18.49.9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.18.49.9999.ebuild
@@ -16,15 +16,15 @@ SRC_URI+="
https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="gles2 ieee1394 +opengl +pci wayland"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
BDEPEND=">=dev-util/cmake-3.14.3"
COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -43,11 +43,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
x11-libs/libX11
+ gles2-only? ( media-libs/mesa[gles2] )
ieee1394? ( sys-libs/libraw1394 )
opengl? (
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
- media-libs/mesa[gles2?,X(+)]
- !gles2? ( media-libs/glu )
+ media-libs/mesa[X(+)]
+ !gles2-only? ( media-libs/glu )
)
pci? ( sys-apps/pciutils )
wayland? (
@@ -72,7 +72,7 @@ src_configure() {
$(cmake_use_find_package wayland KF5Wayland)
)
- if has_version "dev-qt/qtgui[gles2]"; then
+ if has_version "dev-qt/qtgui[gles2-only]"; then
mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
else
mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index 5a0e2a15c9..5dcfa7805a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -16,15 +16,15 @@ SRC_URI+="
https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="gles2 ieee1394 +opengl +pci wayland"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
BDEPEND=">=dev-util/cmake-3.14.3"
COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -43,11 +43,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
x11-libs/libX11
+ gles2-only? ( media-libs/mesa[gles2] )
ieee1394? ( sys-libs/libraw1394 )
opengl? (
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
- media-libs/mesa[gles2?,X(+)]
- !gles2? ( media-libs/glu )
+ media-libs/mesa[X(+)]
+ !gles2-only? ( media-libs/glu )
)
pci? ( sys-apps/pciutils )
wayland? (
@@ -72,7 +72,7 @@ src_configure() {
$(cmake_use_find_package wayland KF5Wayland)
)
- if has_version "dev-qt/qtgui[gles2]"; then
+ if has_version "dev-qt/qtgui[gles2-only]"; then
mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
else
mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
diff --git a/kde-plasma/kinfocenter/metadata.xml
b/kde-plasma/kinfocenter/metadata.xml
index e424c91095..25a8676da2 100644
--- a/kde-plasma/kinfocenter/metadata.xml
+++ b/kde-plasma/kinfocenter/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="gles2">Show OpenGL ES information in
kinfocenter</flag>
<flag name="pci">Show advanced PCI information</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/kwin/kwin-5.18.49.9999.ebuild
b/kde-plasma/kwin/kwin-5.18.49.9999.ebuild
index 348889723c..25b1d11a97 100644
--- a/kde-plasma/kwin/kwin-5.18.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.18.49.9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Flexible, composited Window Manager for
windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="caps gles2 multimedia"
+IUSE="caps gles2-only multimedia"
COMMON_DEPEND="
>=kde-frameworks/kactivities-${KFMIN}:5
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=kde-plasma/kscreenlocker-${PVCUT}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtsensors-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -59,7 +59,7 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
- media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+ media-libs/mesa[egl,gbm,wayland,X(+)]
virtual/libudev:=
x11-libs/libICE
x11-libs/libSM
@@ -73,6 +73,7 @@ COMMON_DEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
caps? ( sys-libs/libcap )
+ gles2-only? ( media-libs/mesa[gles2] )
"
RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 657b5c32cb..67f5ee847a 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Flexible, composited Window Manager for
windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="caps gles2 multimedia"
+IUSE="caps gles2-only multimedia"
COMMON_DEPEND="
>=kde-frameworks/kactivities-${KFMIN}:5
@@ -48,7 +48,7 @@ COMMON_DEPEND="
>=kde-plasma/kscreenlocker-${PVCUT}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtsensors-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -58,7 +58,7 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
- media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+ media-libs/mesa[egl,gbm,wayland,X(+)]
virtual/libudev:=
x11-libs/libICE
x11-libs/libSM
@@ -72,6 +72,7 @@ COMMON_DEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
caps? ( sys-libs/libcap )
+ gles2-only? ( media-libs/mesa[gles2] )
"
RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index e816cb21af..9b1b37b6a9 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
<flag name="multimedia">Enable effect video button in desktop
effects KCM</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
index 92c5c46e47..49e89080ca 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
diff --git a/media-gfx/digikam/digikam-9999.ebuild
b/media-gfx/digikam/digikam-9999.ebuild
index b7a206a7f9..b689a1d756 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
diff --git a/media-gfx/krita/krita-9999.ebuild
b/media-gfx/krita/krita-9999.ebuild
index 0033933a87..d31be1330d 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
