Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-frameworks/kdelibs/
Date: Sat, 30 Jun 2018 08:45:23
Message-Id: 1530348302.416659860ddcc02d07e9f14f34a657e59c391789.asturm@gentoo
1 commit: 416659860ddcc02d07e9f14f34a657e59c391789
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Jun 30 08:17:21 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 30 08:45:02 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=41665986
7
8 kde-frameworks/kdelibs: Re-add USE opengl for legacy revdeps
9
10 kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild | 12 ++++++++----
11 kde-frameworks/kdelibs/metadata.xml | 1 +
12 2 files changed, 9 insertions(+), 4 deletions(-)
13
14 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
15 index 1c8fe53..5e9c8eb 100644
16 --- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
17 +++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
18 @@ -14,10 +14,11 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
19 LICENSE="LGPL-2.1"
20 SLOT="4/4.14"
21 IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook jpeg2k kerberos
22 -libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell
23 +libressl lzma cpu_flags_x86_mmx nls openexr opengl +plasma +policykit qt3support spell
24 test cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower webkit zeroconf"
25
26 REQUIRED_USE="
27 + opengl? ( plasma )
28 udisks? ( udev )
29 upower? ( udev )
30 "
31 @@ -75,6 +76,7 @@ COMMONDEPEND="
32 media-libs/openexr:=
33 media-libs/ilmbase:=
34 )
35 + opengl? ( >=dev-qt/qtopengl-${QT_MINIMAL}:4 )
36 plasma? (
37 app-crypt/qca:2[qt4]
38 >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?]
39 @@ -146,9 +148,11 @@ src_prepare() {
40 sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
41 -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
42
43 - sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
44 - plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
45 - || die "failed to sed out QT_QTOPENGL_FOUND"
46 + if ! use opengl; then
47 + sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
48 + plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
49 + || die "failed to sed out QT_QTOPENGL_FOUND"
50 + fi
51 }
52
53 src_configure() {
54
55 diff --git a/kde-frameworks/kdelibs/metadata.xml b/kde-frameworks/kdelibs/metadata.xml
56 index b4bf47b..d6f2c0e 100644
57 --- a/kde-frameworks/kdelibs/metadata.xml
58 +++ b/kde-frameworks/kdelibs/metadata.xml
59 @@ -4,6 +4,7 @@
60 <!-- maintainer-needed -->
61 <use>
62 <flag name="legacyssl">Support for some deprecated ciphers. Don't use this flag unless you really need it</flag>
63 + <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
64 <flag name="qt3support">Enable kde3support/qt3support for very old applications</flag>
65 <flag name="utempter">Records user logins. Useful on multi-user systems</flag>
66 </use>