Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/
Date: Tue, 30 May 2017 21:37:15
Message-Id: 1496180163.fa579ab1d2e4c4bc6de91e7451cbbd5ad849ed3e.monsieurp@gentoo
1 commit: fa579ab1d2e4c4bc6de91e7451cbbd5ad849ed3e
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue May 30 12:13:59 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue May 30 21:36:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa579ab1
7
8 x11-misc/qt5ct: remove old
9
10 Closes: https://github.com/gentoo/gentoo/pull/4808
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12
13 x11-misc/qt5ct/Manifest | 1 -
14 .../files/qt5ct-0.32-fix-build-without-dbus.patch | 16 -------
15 x11-misc/qt5ct/qt5ct-0.32.ebuild | 54 ----------------------
16 3 files changed, 71 deletions(-)
17
18 diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
19 index ca75a9de8b8..6de4e88dde8 100644
20 --- a/x11-misc/qt5ct/Manifest
21 +++ b/x11-misc/qt5ct/Manifest
22 @@ -1,3 +1,2 @@
23 DIST qt5ct-0.31.tar.bz2 55724 SHA256 d5357768832a81e39aa9cd0a45d8144de9bd59302d8d122d8c2d1a231be2aba9 SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e WHIRLPOOL e63d91ea06956859abebef8990c3b697fddbda9656dcb092231fece95ed9f5ce8fe1597ca6b28468e63b76adcd311637b3591e7650ad0a1adb8a0f1958eafef4
24 -DIST qt5ct-0.32.tar.bz2 56146 SHA256 d501975f876aeb7a4c9814c9b9a46eb20804c3e0ee2b5d5e7b1b3d244dc7f53f SHA512 9d4ccbb808ce5c394b041f1c387502a373998930aa9141e151a8c854b79b978945ad77bfb2383c1a3e0b5f082bc8c260d01f30d137fa764f926405bbddad212c WHIRLPOOL 77fb3c34636331fda89814f4e6e9eef55e0aebf1c3d71e912d11566d97241c645ece974e31260c53d96d27e42e44ce51abbef271671d63899f77cdef1cdf9e40
25 DIST qt5ct-0.33.tar.bz2 56448 SHA256 2e55484bdae7988ec8ce2629cfc252b226df8b07b2a0b6f8ee2fd10cc8e7c02f SHA512 670ec099978b569b7607d6a0af0c7e7b66b4b4a374041893c85a8749992ae6a931fa9678fa122baede8a672c0c9798fad8c30c60205c3f9d0ad3dd867e0753ba WHIRLPOOL f8ecb21aaa3aef538860fdd43095dc0b6b7aff72bb5ff6601f15783e5eb9bd398c4031e05139fda90800c0436606d8ac9f3fe66e09bb29f6ae8c704000d8b2b8
26
27 diff --git a/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch b/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch
28 deleted file mode 100644
29 index 532413b954c..00000000000
30 --- a/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch
31 +++ /dev/null
32 @@ -1,16 +0,0 @@
33 -See https://sourceforge.net/p/qt5ct/tickets/36/
34 -
35 -diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
36 ---- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro (revision 408)
37 -+++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro (working copy)
38 -@@ -10,7 +10,9 @@
39 - QT += gui-private platformsupport-private
40 - }
41 -
42 --greaterThan(QT_MINOR_VERSION, 5): QT += dbus
43 -+!contains(DEFINES, QT_NO_DBUS):greaterThan(QT_MINOR_VERSION, 5) {
44 -+ QT += dbus
45 -+}
46 -
47 - SOURCES += \
48 - main.cpp \
49
50 diff --git a/x11-misc/qt5ct/qt5ct-0.32.ebuild b/x11-misc/qt5ct/qt5ct-0.32.ebuild
51 deleted file mode 100644
52 index 6fc2aca5493..00000000000
53 --- a/x11-misc/qt5ct/qt5ct-0.32.ebuild
54 +++ /dev/null
55 @@ -1,54 +0,0 @@
56 -# Copyright 1999-2017 Gentoo Foundation
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI=6
60 -
61 -inherit qmake-utils
62 -
63 -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
64 -HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
65 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
66 -
67 -LICENSE="BSD-2"
68 -SLOT="0"
69 -KEYWORDS="~amd64"
70 -IUSE="+dbus"
71 -
72 -RDEPEND="
73 - dev-qt/qtcore:5
74 - dev-qt/qtgui:5=
75 - dev-qt/qtwidgets:5
76 - dbus? (
77 - dev-qt/qtdbus:5
78 - >=dev-qt/qtgui-5.7:5[dbus]
79 - )
80 -"
81 -DEPEND="${RDEPEND}
82 - dev-qt/linguist-tools:5
83 -"
84 -
85 -PATCHES=( "${FILESDIR}/${P}-fix-build-without-dbus.patch" )
86 -
87 -src_configure() {
88 - eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro
89 -}
90 -
91 -src_install() {
92 - emake INSTALL_ROOT="${D}" install
93 - einstalldocs
94 -
95 - echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
96 - doenvd "${T}"/98${PN}
97 -}
98 -
99 -pkg_postinst() {
100 - if [[ -z ${REPLACING_VERSIONS} ]]; then
101 - ewarn "qt5ct configuration won't be applied to the currently running sessions."
102 - ewarn "Please relogin."
103 - fi
104 - if ! has_version 'dev-qt/qtsvg:5'; then
105 - elog
106 - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
107 - elog
108 - fi
109 -}