[gentoo-commits] repo/gentoo:master commit in: x11-misc/qt5ct/files/, x11-misc/qt5ct/

["Michał Górny" <mgorny@gentoo.org>]

commit:     c05131646070c21a91a2a572f5e33a1cf358bacf
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue May 16 20:09:50 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 21 21:03:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0513164

x11-misc/qt5ct: version bump to 0.32

Global menu support was added. It pulls the same deps as the system tray
support, thus group them together under dbus USE (renamed from systray).

Closes: https://github.com/gentoo/gentoo/pull/4650
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-misc/qt5ct/Manifest                            |  1 +
 .../files/qt5ct-0.32-fix-build-without-dbus.patch  | 16 +++++++
 x11-misc/qt5ct/metadata.xml                        |  1 +
 x11-misc/qt5ct/qt5ct-0.32.ebuild                   | 54 ++++++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index dba1022fc3e..eb2bc3f33f2 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1 +1,2 @@
 DIST qt5ct-0.31.tar.bz2 55724 SHA256 d5357768832a81e39aa9cd0a45d8144de9bd59302d8d122d8c2d1a231be2aba9 SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e WHIRLPOOL e63d91ea06956859abebef8990c3b697fddbda9656dcb092231fece95ed9f5ce8fe1597ca6b28468e63b76adcd311637b3591e7650ad0a1adb8a0f1958eafef4
+DIST qt5ct-0.32.tar.bz2 56146 SHA256 d501975f876aeb7a4c9814c9b9a46eb20804c3e0ee2b5d5e7b1b3d244dc7f53f SHA512 9d4ccbb808ce5c394b041f1c387502a373998930aa9141e151a8c854b79b978945ad77bfb2383c1a3e0b5f082bc8c260d01f30d137fa764f926405bbddad212c WHIRLPOOL 77fb3c34636331fda89814f4e6e9eef55e0aebf1c3d71e912d11566d97241c645ece974e31260c53d96d27e42e44ce51abbef271671d63899f77cdef1cdf9e40

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
new file mode 100644
index 00000000000..532413b954c
--- /dev/null
+++ b/x11-misc/qt5ct/files/qt5ct-0.32-fix-build-without-dbus.patch
@@ -0,0 +1,16 @@
+See https://sourceforge.net/p/qt5ct/tickets/36/
+
+diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
+--- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 408)
++++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(working copy)
+@@ -10,7 +10,9 @@
+   QT += gui-private platformsupport-private
+ }
+
+-greaterThan(QT_MINOR_VERSION, 5): QT += dbus
++!contains(DEFINES, QT_NO_DBUS):greaterThan(QT_MINOR_VERSION, 5) {
++    QT += dbus
++}
+
+ SOURCES += \
+     main.cpp \

diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml
index 2e9a3414145..a5fe4940379 100644
--- a/x11-misc/qt5ct/metadata.xml
+++ b/x11-misc/qt5ct/metadata.xml
@@ -14,6 +14,7 @@
 		icons, etc.) under DE/WM without Qt5 integration.
 	</longdescription>
 	<use>
+		<flag name="dbus">Enable system tray and global menu support</flag>
 		<flag name="systray">Enable system tray support</flag>
 	</use>
 	<upstream>

diff --git a/x11-misc/qt5ct/qt5ct-0.32.ebuild b/x11-misc/qt5ct/qt5ct-0.32.ebuild
new file mode 100644
index 00000000000..947237d1e28
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-0.32.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[dbus]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-build-without-dbus.patch" )
+
+src_configure() {
+	eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	echo 'QT_QPA_PLATFORMTHEME=qt5ct' > "${T}"/98${PN} || die
+	doenvd "${T}"/98${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}