Add Qt 5 support wrt bug #534304.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 143 insertions, 18 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index 91293d0404d0..bea492618e71 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtsingleapplication
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.8 2014/07/14 11:53:59 pesa Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.9 2015/01/02 18:17:33 kensington Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r2 (02 Jan 2015)
+
+  02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/qtsingleapplication5.prf,
+  +qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+  Add Qt 5 support wrt bug #534304.
 
   14 Jul 2014; Davide Pesavento <pesa@gentoo.org>
   qtsingleapplication-2.6.1_p20130904-r1.ebuild:
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index 724329792021..767c2ba80bbc 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -4,26 +4,27 @@ Hash: SHA256
 AUX 2.6.1_p20130904-no-gui.patch 2294 SHA256 164df2885860282c09534da83c9ac1ee56ee6b03d33efb39f75f54df552929cf SHA512 68b6ccf490483df0590af59c447fdfe99f421fd9dbc6211a7666f7ad0557025e13640b1c579fd25477fc0c197f49efa63c017e24a47b91291d99c773a7ad8dc9 WHIRLPOOL a62315f94e8fae5620b6e29eeccc1105fb0c5f3d8ab7f23f0a94b889844cf65b24eb599e0e372f29359eb9c17f1f577aa62849a7e9ebe55b44c4536a9663765a
 AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 SHA256 e5efb144ab9b1d442fb8f3c6616090eff635978b63b3bb72f0929dc3e78e6aa4 SHA512 96a1dd68e8ba841c5466183cfdcb9693e01d2096878f52f0f521bcee14ec38fb005bace877af473b645aa035c3651c136220fd2fc5dfb7a8883b9a75cdc55eba WHIRLPOOL 0d97ae41b2e449259d6e53b5df772e5e2ca129e023c329b8c5a02e25da5b9ebad8d2ba683c7ac85e87b9e11cd666f6a01f3cb410a6007cc92c98fcedcf1c871b
 AUX qtsingleapplication.prf 148 SHA256 8ec2ad9c025496b5c1002a34f3603b78c7e9e5986c4706eb533db0090346fb04 SHA512 674d9b16bd774b7fe5e5e1a1e0ef7a7ab898482affb22bc3d72ddfbed8e3cbb42f43810dcc56d3ac4808809f03ed192187ae4b3f8bdeaa8cda2e9b155ee327c5 WHIRLPOOL 069fe748ecf97e2389d0c0f924d9f4b7b185da1fcab5bf5d91f412bc7a589911e4386c9dd4d7d90aa055b6b515efbded5c747ac792305b24f1762bc88722237b
+AUX qtsingleapplication5.prf 159 SHA256 fc6d55650bbfe00571d6de651d08b06259046cb8f845bf0e188ec89da1ad47be SHA512 ce744840f111c88024302b3965d7cb85da43c8f3584aac06fef3a71a78d0c86f1c64419160df8f21037fb776a0e32ba26d9c1830805b5733eeadd56519b89395 WHIRLPOOL 603f0cd9d6bcd5540e4bbda6fc3a43d699b306c8895670415a1d210a05dc8e15b3a582a166371993273217afce260bcb775a0d13a40d6ef977c6ba3b34de6cad
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
 EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1484 SHA256 f79887c254965e204770791f123b00ae77d0c74a327bb3d973297afad44ce37e SHA512 899b4804b7a1d0acbe015621926df7dbbcc10260ccc85cdebc5c130f17af3a636d4bb253077e94e4237f7343f4376b5b7a642d017ca783d3448461dc3ba21559 WHIRLPOOL 6be47e8b2072cbbd27f978986c1d3b52639792b6cebcaee65accb4659f032bb0ba75166baddc2f75ba9e2ba6bb4393bb9f7a456dcf5cc170813bacad51290891
-MISC ChangeLog 2156 SHA256 b95d8825303416f1a9499d12d14e67ce470f692fc50b4349dcde40d65efa1833 SHA512 10aa18240a24c6d06813e85d3ac0b52a64f98a121593b8e6fca5820cd37660614328f0e8e2e8fd9835d163d900eb27e196cff7f5a190942eb8d31cc5aaf3430b WHIRLPOOL a407fa8011dea6a5f7ce7eac2f317addd9c4e48e34bda4be1c669df20a924b9dd8f9d8523aa556dc7855eb26a3907a5ec0414089482fe8255e9b483c7f4e65c4
+EBUILD qtsingleapplication-2.6.1_p20130904-r2.ebuild 2640 SHA256 0eabc2c7a25c0febe017682710107d3d1b983a4c606449de3b983a9ed109801f SHA512 5781d2ffad93609ebf69c4efb062789060ef8b3ccb5e6c27171bcb089b808c6a53900f23e8c2a186d606d1dce559ef5fee75fd472019cfe7350bf78ae6148f36 WHIRLPOOL c7a82baabbd1f4f64f3613e3bc0dade8344d76258e1fa650a4b7756033db139f82af81f4cd15f32f0e1533ba1ca2299f2b0463f95ab38b74f62e4b7a9fe57038
+MISC ChangeLog 2395 SHA256 7e5a2801929109f3f8bca70b566cb828eaa2589cc19476fc9bb75481e057428e SHA512 0c064c8e5d1199cc491e09d2209c1090a2b8d7fd5aa3dc9f923b77262bc95362dd5acb20571726fa0d3afb67057836503de543896052f8cd32c8da691f0b7ca9 WHIRLPOOL f3d64662639538ea064ea984b3da940780302e253388900ddb792858861f6399dbd3fa974e7879cff62fd03ef8fdfac9e8a34aa51737a008fd45ae60e66e4fbf
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTw8TYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV95I0QAI1U8SgScyq2m0aMfjkA6aLl
-xfqaBYEvQcryINaeP6p8muR2B1VFUgDBqFCAggz0MmcAJihArEgySB683PvCQbhl
-MqTNkg0TsHBtYKURKsWdFA0kkkbtfUb1Zi3qLbowA1TWtM7E0g2Pqh+fNMlRGoLH
-KCAHziqa/WEdmYX3WYdgeO/gwqslaWrR/mxasOpTEQoAHM4Bi7o/E3UATEZ6l7my
-TT96O04csjT82/hs5JH8j+C4E0qR/6j6YOsaGZ5srXy1kMD4RMT00VQSPcdlIrvn
-Esbn39xZD0XWOhqw1woUPHP/9l+d0kfTq6rWOWT/AoDDMoxP8zcFosgegKmI07qp
-nXlr6F07xXSPgQGPIchKwr0LeKw6cp7ekEEIqdQVUJzIrjMySFyDpqlQiMcHpEdp
-aL6SjVSDYUEmMdXY0MkMioJoGmeyjRsYBpm4hYvCHnw21YuJrtTOaclW61WF3Ve8
-94bpaFGYeUm4Id+qZuZNaCy2jRpD5ZpWSAhXBQDOR/Tijbc7TEvHngToU7ys/RuV
-G8CjHSoCHgDM/KM2TPLWd1nRsvu7ldEWfkV16EE2dmJxK3+0iq+EC6MaqUD6HWl2
-8qjftXAP3Sp+zksCrPDDIMbw4QeOUahhm/EcNbgSjb5msf//q3vxEEz30KYPjAL1
-lAx0cpFKawzhxzAEPslm
-=DTdT
+iQJiBAEBCABMBQJUpuDCRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7I0+EACgI7TptjtN+1ZEFZiU9MEUXScb8I/2yvVo+5GJgguVce8CS3zV07iaEDkR
+CjfTtmEoaCJkHA1zAU+RsoJQyffsKHiturI+o9DIJmuYbbfr6T49V6ay8iqF4eOA
+szer+ZD9uxbtxZiYzVwS3xMQW1xO21iD877LgiH9qXDzrgrLJYkvkgIxr/wY2704
+Cx+8OCpXX6CxHPuhJ4t3jU1fXE+kfYCFCaJQLSKIOiUMieg1RE5wQ8qBDW0ruWGq
+91VI0B3XUG5V9ofkLz4g75qSiLqB++uY/5g32BGXaCPSahlSN8RVXDdJc6wGcUcP
+9R6msN5MnrkFwVOpnLaOEGX7nV+goW/JuiNTOQDjHSIMlZ0GKvh6GUVVinCdzC8u
+58lItI0LZYlqCeSa7b7793IGZWgf337DJYLcFqhX71e7rqEQfuowDevDaZyrwLVa
+a5D8HNThN4y36btmB1slJzS+BWgP4SSLM2ozTrmUObGcFuBHRnaFWc5v1eb6bz+t
+Gv4KvDHlktuFT4gQquPJj3l/+eVEZVpsLam9DSGw/ERVXmzXeqMWffD/0y6JYFUO
+qnSu1nRcn7EWLpBoI54oTkMpAk3hGkw1QUHRgnjEydF13j1VSX8mzKAJVWjOYoyf
+YzopZLCQeO9em2Q7Bkrv3IRH8WE+YJkoG9J3gDVaefklxRoTfw==
+=4HDm
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf
new file mode 100644
index 000000000000..1e5061dfab67
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf
@@ -0,0 +1,4 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+DEPENDPATH  *= $$[QT_INSTALL_HEADERS]/QtSolutions
+LIBS *= -lQt5Solutions_SingleApplication-2.6
+QT *= network
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
new file mode 100644
index 000000000000..519ed39fa297
--- /dev/null
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.1 2015/01/02 18:17:33 kensington Exp $
+
+EAPI=5
+
+inherit multibuild multilib qmake-utils
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="Qt library to start applications only once per user"
+HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtsingleapplication/index.html"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +qt4 qt5 X"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? ( 
+		dev-qt/qtcore:4
+		X? ( dev-qt/qtgui:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		X? (
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+	)
+	dev-qt/qtlockedfile[qt4?,qt5?]
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4 ; then
+		MULTIBUILD_VARIANTS+=( qt4 )
+	fi
+	if use qt5 ; then
+		MULTIBUILD_VARIANTS+=( qt5 )
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-unbundle-qtlockedfile.patch"
+	epatch "${FILESDIR}/${PV}-no-gui.patch"
+
+	echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+	use X || echo 'QTSA_NO_GUI = yes' >> config.pri
+
+	sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+	sed -i -e '/SUBDIRS+=examples/d' ${PN}.pro || die
+
+	# to ensure unbundling
+	rm -f src/qtlockedfile*
+
+	multibuild_copy_sources
+}
+
+src_configure() {
+	myconfigure() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			eqmake4
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+			eqmake5
+		fi
+	}
+
+	multibuild_foreach_variant run_in_build_dir myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install() {
+	dodoc README.TXT
+	use doc && dodoc -r doc/html
+
+	myinstall() {
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			insinto /usr/include/qt4/QtSolutions/
+			doins src/qtsinglecoreapplication.h
+			use X && doins src/{QtSingleApplication,${PN}.h}
+
+			insinto /usr/share/qt4/mkspecs/features/
+			doins "${FILESDIR}"/${PN}.prf
+			dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf
+		fi
+
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+			insinto /usr/include/qt5/QtSolutions/
+			doins src/qtsinglecoreapplication.h
+			use X && doins src/{QtSingleApplication,${PN}.h}
+
+			insinto /usr/$(get_libdir)/qt5/mkspecs/features/
+			newins "${FILESDIR}"/${PN}5.prf ${PN}.prf
+			dosym ${PN}.prf /usr/$(get_libdir)/qt5/mkspecs/features/qtsinglecoreapplication.prf
+		fi
+
+		dolib.so lib/*
+	}
+
+	multibuild_foreach_variant run_in_build_dir myinstall
+}