commit: dc94c6b06caff6a31786ff2d0ac704669e0bd0be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 23:12:42 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 23:13:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc94c6b0
kde-frameworks/kdelibs: Drop USE=opengl
Removes an annoying REQUIRED_USE construct.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild | 10 +++-------
kde-frameworks/kdelibs/metadata.xml | 1 -
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index e02222c8285..c7a824f9861 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -6,7 +6,6 @@ EAPI=6
CPPUNIT_REQUIRED="optional"
DECLARATIVE_REQUIRED="always"
KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
APPS_VERSION="17.08.2" # Don't forget to bump this
@@ -22,7 +21,6 @@ libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit
qt3support
spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
REQUIRED_USE="
- opengl? ( plasma )
udisks? ( udev )
upower? ( udev )
"
@@ -134,11 +132,9 @@ src_prepare() {
sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu
RENAME kde-4-applications.menu|g' \
-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for
applications.menu failed."
- if ! use opengl; then
- sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
- plasma/CMakeLists.txt plasma/tests/CMakeLists.txt
includes/CMakeLists.txt \
- || die "failed to sed out QT_QTOPENGL_FOUND"
- fi
+ sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+ plasma/CMakeLists.txt plasma/tests/CMakeLists.txt
includes/CMakeLists.txt \
+ || die "failed to sed out QT_QTOPENGL_FOUND"
}
src_configure() {
diff --git a/kde-frameworks/kdelibs/metadata.xml
b/kde-frameworks/kdelibs/metadata.xml
index 0c83fe5f780..ed16b85b6d7 100644
--- a/kde-frameworks/kdelibs/metadata.xml
+++ b/kde-frameworks/kdelibs/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="opengl">Enable OpenGL support for Plasma
(GLApplet)</flag>
<flag name="qt3support">Enable kde3support/qt3support for very
old applications</flag>
</use>
</pkgmetadata>