Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
Date: Sat, 04 Feb 2017 21:25:43
Message-Id: 1486243475.8033d2b3e284d62eed973121d245211b415aa5e8.soap@gentoo
1 commit: 8033d2b3e284d62eed973121d245211b415aa5e8
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 4 13:43:24 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 21:24:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033d2b3
7
8 x11-misc/qt5ct: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/3799
12
13 x11-misc/qt5ct/Manifest | 1 -
14 .../qt5ct/files/qt5ct-0.29-fix-kde-styles.patch | 20 ---------
15 x11-misc/qt5ct/qt5ct-0.29-r1.ebuild | 52 ----------------------
16 3 files changed, 73 deletions(-)
17
18 diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
19 index d2a3870..8a0c3f1 100644
20 --- a/x11-misc/qt5ct/Manifest
21 +++ b/x11-misc/qt5ct/Manifest
22 @@ -1,2 +1 @@
23 -DIST qt5ct-0.29.tar.bz2 49482 SHA256 a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc SHA512 b0417a5c7d736957194d96a44156f2eab2d9eedf7a8fa6a0aeb65ad3d50f0466b31329ef5ae414d036a34a4d675278e737cef3ecefdec61e106e1ff7503dd434 WHIRLPOOL 456414d9d2516b7de2098dda3479d6c0fd686d7f83e7af9261c18b51e82f61b66f77d496d82e25654cbe066221707552e2053d7618676ba7b11e54c22bf16ff1
24 DIST qt5ct-0.30.tar.bz2 49665 SHA256 e6d94d756ea928f330376a30660a75b3213bad234b360519416e634048e31ecc SHA512 3ea7ce731fcef2c665c9b92c5afe505bad9a119957c268a9705bb1c9ea8534547281133d51932d68933de93c78c7fd3be5a5511cf748644047acb8f716605a18 WHIRLPOOL 1af094cdd839cb46c44f051eb37b9403dad6fb60d757fddd69c98e3d9f8def65b9f7a9899ad278a6bcef6a7bdd1009ea16c24dfca28f639f7c2befea981236c9
25
26 diff --git a/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch b/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch
27 deleted file mode 100644
28 index d15609d..00000000
29 --- a/x11-misc/qt5ct/files/qt5ct-0.29-fix-kde-styles.patch
30 +++ /dev/null
31 @@ -1,20 +0,0 @@
32 -Correctly apply selected theme to KDE apps.
33 -
34 -https://sourceforge.net/p/qt5ct/tickets/32/
35 -
36 -Index: src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
37 -===================================================================
38 ---- a/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp (revision 368)
39 -+++ b/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp (revision 369)
40 -@@ -101,9 +101,8 @@
41 -
42 - const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
43 - {
44 -- if(m_customPalette && m_usePalette)
45 -- return m_customPalette;
46 -- return QPlatformTheme::palette(type);
47 -+ Q_UNUSED(type);
48 -+ return (m_usePalette ? m_customPalette : 0);
49 - }
50 -
51 - const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const
52
53 diff --git a/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild b/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild
54 deleted file mode 100644
55 index 2563ebe..00000000
56 --- a/x11-misc/qt5ct/qt5ct-0.29-r1.ebuild
57 +++ /dev/null
58 @@ -1,52 +0,0 @@
59 -# Copyright 1999-2017 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -# $Id$
62 -
63 -EAPI=6
64 -
65 -inherit qmake-utils
66 -
67 -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
68 -HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
69 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
70 -
71 -LICENSE="BSD-2"
72 -SLOT="0"
73 -KEYWORDS="~amd64"
74 -IUSE="+systray"
75 -
76 -RDEPEND="
77 - dev-qt/qtcore:5
78 - dev-qt/qtgui:5=
79 - dev-qt/qtwidgets:5
80 - systray? ( dev-qt/qtgui:5[dbus] )
81 -"
82 -DEPEND="${RDEPEND}
83 - dev-qt/linguist-tools:5
84 -"
85 -
86 -PATCHES=( "${FILESDIR}/${P}-fix-kde-styles.patch" )
87 -
88 -src_configure() {
89 - eqmake5 DEFINES="$(usex systray '' QT_NO_SYSTEMTRAYICON)" ${PN}.pro
90 -}
91 -
92 -src_install() {
93 - emake INSTALL_ROOT="${D}" install
94 - einstalldocs
95 -
96 - echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
97 - doenvd "${T}"/98${PN}
98 -}
99 -
100 -pkg_postinst() {
101 - if [[ -z ${REPLACING_VERSIONS} ]]; then
102 - ewarn "qt5ct configuration won't be applied to the currently running sessions."
103 - ewarn "Please relogin."
104 - fi
105 - if ! has_version 'dev-qt/qtsvg:5'; then
106 - elog
107 - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
108 - elog
109 - fi
110 -}