qt5ct : version bump

3 files changed, 50 insertions, 48 deletions

diff --git a/dev-qt/qt5ct/Manifest b/dev-qt/qt5ct/Manifest
index d40141c3..dba1022f 100644
--- a/dev-qt/qt5ct/Manifest
+++ b/dev-qt/qt5ct/Manifest
@@ -1 +1 @@
-DIST qt5ct-0.24.tar.bz2 42427 SHA256 d7acba4e36ed6478a4a27a8cc9359b45f2ecdbcb5f46e6a19e6fdd4252b3c24c SHA512 670e518d8b927eb937bbde6e190dba735cdd7d833ada0299f18093b502ddda340b10d5ad6e6be94a7f08c46335ffb84128800c5625063c6614cb1248a00287c1 WHIRLPOOL d85528748440f3d14b68f9cc9bcade1a65e74918960918babf798ce9f7aa3f4c0661a6d59c43340276070882119b2be95a767f1f35f69adc98e52f137083576d
+DIST qt5ct-0.31.tar.bz2 55724 SHA256 d5357768832a81e39aa9cd0a45d8144de9bd59302d8d122d8c2d1a231be2aba9 SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e WHIRLPOOL e63d91ea06956859abebef8990c3b697fddbda9656dcb092231fece95ed9f5ce8fe1597ca6b28468e63b76adcd311637b3591e7650ad0a1adb8a0f1958eafef4
diff --git a/dev-qt/qt5ct/qt5ct-0.24.ebuild b/dev-qt/qt5ct/qt5ct-0.24.ebuild
deleted file mode 100644
index be9cf289..00000000
--- a/dev-qt/qt5ct/qt5ct-0.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="Qt5 Configuration Tool"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/linguist-tools-5.4.0:5
-	>=dev-qt/qtcore-5.4.0:5
-	>=dev-qt/qtsvg-5.4.0:5
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/"${P}"
-
-src_configure(){
-	local myeqmakeargs=(
-		${PN}.pro
-		PREFIX="${EPREFIX}/usr"
-		DESKTOPDIR="${EPREFIX}/usr/share/applications"
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-	)
-	eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install(){
-	emake INSTALL_ROOT="${ED}" install || die
-}
-
-pkg_postinst(){
-	elog "After install this package, please, add the following"
-	elog "line into the ~/.xprofile (user) or /etc/environment (system):"
-	elog "export QT_QPA_PLATFORMTHEME=qt5ct"
-	elog "and it will work."
-}
diff --git a/dev-qt/qt5ct/qt5ct-0.31.ebuild b/dev-qt/qt5ct/qt5ct-0.31.ebuild
new file mode 100644
index 00000000..a774818d
--- /dev/null
+++ b/dev-qt/qt5ct/qt5ct-0.31.ebuild
@@ -0,0 +1,49 @@
+# 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="+systray"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	systray? ( dev-qt/qtgui:5[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 DEFINES="$(usex systray '' QT_NO_SYSTEMTRAYICON)" ${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
+}