Version bump. Upstream dropped support for building with Qt4.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 41 insertions, 46 deletions

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 927bf0129eac..679887e42147 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/qbs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.12 2015/02/03 07:28:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.13 2015/03/18 20:39:40 pesa Exp $
+
+*qbs-1.3.4 (18 Mar 2015)
+
+  18 Mar 2015; Davide Pesavento <pesa@gentoo.org> +qbs-1.3.4.ebuild,
+  -qbs-1.3.3.ebuild:
+  Version bump. Upstream dropped support for building with Qt4.
 
   03 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> qbs-1.3.3.ebuild:
   Add ~arm keyword
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index c0b0ff23594c..66b78bc2c47d 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qbs-1.3.3.src.tar.gz 718418 SHA256 6d3372d088f2328cb2f51f77321f98d20068e91a0334b4c176d85d000a78036a SHA512 15aa1c781030ba81236ec6520ecfd596b943aa674256ce02d1e439e84548766080c4bf1579998fd5a154200c0ca729178b83f2354c996b92eda7d3252f1d7a49 WHIRLPOOL 96579110bdde6c3d4b390e08cc6700e6cc5fa6e2da4175d3a69c683b2cd2f1f0313c25020c0886ea026297ce5d7ba0950f0d925b6786430a256eed0eaafdd7ad
-EBUILD qbs-1.3.3.ebuild 2320 SHA256 659e9b0dad2fb80235c3a434ce289071959e1f542fd414c3d926c53dd1fc8a76 SHA512 023adb58a200560046470fb5841422441e22aa43ca1c6e59d3f8c1e76abc40fd79d9c0e68fe63064c50f7364190ed15a8fffe494458d602199bfae6e9ae9ed1f WHIRLPOOL 997e46b7c1730ed5408b1f1b7536b007e05d08065583a71b9cc8219bda4366c36e57be6425382f13a770e81ba0879ad8db6f41909420fee58dae36607bb909ac
-MISC ChangeLog 1974 SHA256 1f33e09e7b5f75839f5dc36d1bac4023760f1cda05ff0f1d5d254d95163beb93 SHA512 629a256ff8fca52daae087ea31355db7826285bc8f45117b31246c62fda03347e8cc04340e3c0d5c90056170365b20aa22fc8649fa9b92b0c866b6e2fb7d4ff1 WHIRLPOOL 34bbd16367b01322cb76954e7b5a1891e0238190606d7224de580659f263019af8525814d310fc5412aa1ce60635ee9bedbc47937afd9831a976478caf818cb6
+DIST qbs-1.3.4.src.tar.gz 723205 SHA256 89f924aa6d2c38540ce3504f6f3e89332055fb3c7322aaef99989a4f5d69905c SHA512 22167a4e4e375562540f68366213b70886c59a9f91c971a7e448262b133ecb20e8a07b64e9d8d4f102f53875115e32e493f2936b71c1198c407e043500868348 WHIRLPOOL c1e93d63276796340d3a7cdb2bb7923d15a9fa3ae01d62e12e299e58a112ac0d6bd7b895bb8e6621a2877c957922217a62c1869750dc3874369bdf621cc0ce1d
+EBUILD qbs-1.3.4.ebuild 1941 SHA256 5376e5bae6150043aed536864208cb2ef9f6bc8c9e0b72bef5dc3f827869ebbf SHA512 bc99a9ba90aa8e9c591839d8fffbcfdf14415e495b84f677688325f99c4e4ef6394aa6c61fba3b7dfa5115c45a77c4dbbb611d789cf1075c67851f4dffaa64e1 WHIRLPOOL 156579478bede4391690d292afd29aad02106961659974353777f04a61d916d4e5886e3a1d5cdbaf7d896669ade23345359ac86122701edecd0d51ac187f97e5
+MISC ChangeLog 2152 SHA256 3e9e522f3e3715df6f60ccf0a461ac48cd52e0544d96739d163180dabbfc237c SHA512 9fb13c2b2a63d8c189d11abbdf0125bf5d77254ef975d166db659fe3af24e81f88ef3e43c761d91548f9ec28fa9643a3a0490fad1800eb7d384ed80a9277d157 WHIRLPOOL bfe8edc67dee700825bf4f540cf4f6ba0700180cf0b1a5a8de76133d24db64a18c8ae04135957ebb0e65392c7b910f566a7df5e8dc135086473bbb641be93c22
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlTQeCAACgkQG9wOWsQutdbhHAP/a4qRBolFVilAkC/Lxe85UVLJ
-Xw6DGa6yjtJXQkvqvxMzAzdz+kSz2Ewshdogf8niw+NgEWvcTZCeFKWY0ylBTnoW
-+Wjym6aQPbQZzXbVA8AWXJpohuCMYS22sV7a+fXGaaZxQvisG4RH4zJhtzZkzNFn
-mBn4vtROfhd+aQOJe7c=
-=DkY1
+iQJ8BAEBCABmBQJVCeKUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RxYQAIGSa9frvrxJ4rKLywwjLDN2
+u3IIHlsVFXNvRFei9nI/onVfEw9ztbnk9aYafPQ7iC82owogees87kbEqA0fXwtx
+2dPSO2I6DNA2Tb2GUu/F4ZDxcu6CWJ8ESRsPpG7KVxmjUsQowldU13OScAGtUWqW
+OYtah/SDomg6w+9Hwu3dwF8jZUriU3Ebn7i5mTpfbJIpXGICkGSXnSMGPrIY2fNp
+VfsW+nTGP4sPMbdEIatr3vfPisHu7IHl11xWTICK76yKH4qPfcc+fFtt6Rc1bVSB
+p3weZBwGpOWhv8YNaQZwRpL6sFG3rMFSZaXcb4YzJU5/YOOwYdbfKZvIMV5Pnmjl
+CYU41wUZse04i6Y0pzQGy6PDrFNTJQ5UbfrTxFKyDoaSSSaWpKUtDUkCeOfli0pB
+AHL+ubULZ31sTpN+D9Z6ZOGCMrqvm6YLdEIXv78UarOaOUDT8xy+5ILVG8qSvjvm
+d9JhJhWIuKwzeQMPPwZZuj8W40kZ73IeqnF9gumx2WZI51aylhof/0gwpOPXMjK7
+XhOnORvzOcULTrI/KrKzJUl5EStZ/b1SMmG77WCUyDW9qfBpQALErm72dnKOM5vg
+6Gx/+XiFpOqCtidIhfNy35EObv31jvByco5vja1xE46hf3JEIIiXYMH20pL0O7re
+qFlC4Pytl7+LIIPTxZml
+=HUky
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qbs/qbs-1.3.3.ebuild b/dev-util/qbs/qbs-1.3.4.ebuild
index 53fe1236ce6d..fb238e746c50 100644
--- a/dev-util/qbs/qbs-1.3.3.ebuild
+++ b/dev-util/qbs/qbs-1.3.4.ebuild
@@ -1,48 +1,35 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.3.ebuild,v 1.2 2015/02/03 07:28:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.4.ebuild,v 1.1 2015/03/18 20:39:40 pesa Exp $
 
 EAPI=5
 
 inherit multilib pax-utils qmake-utils
 
 DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://qt-project.org/wiki/qbs"
+HOMEPAGE="http://wiki.qt.io/Qbs"
 SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${P}.src.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc qt5 test"
+IUSE="doc test"
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtscript:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtscript:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 "
 DEPEND="${RDEPEND}
 	doc? (
-		!qt5? ( dev-qt/qthelp:4 )
-		qt5? ( dev-qt/qdoc:5 dev-qt/qthelp:5 )
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
 	)
 	test? (
-		!qt5? (
-			dev-qt/qtdeclarative:4
-			dev-qt/qttest:4
-		)
-		qt5? (
-			dev-qt/qtdeclarative:5
-			dev-qt/qttest:5
-		)
+		dev-qt/qtdeclarative:5
+		dev-qt/qttest:5
 	)
 "
 
@@ -69,12 +56,7 @@ src_configure() {
 		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
 		QBS_LIBRARY_DIRNAME="$(get_libdir)"
 	)
-
-	if use qt5; then
-		eqmake5 "${myqmakeargs[@]}"
-	else
-		eqmake4 "${myqmakeargs[@]}"
-	fi
+	eqmake5 "${myqmakeargs[@]}"
 }
 
 src_compile() {
@@ -93,11 +75,8 @@ src_test() {
 	export HOME=${T}
 	export LD_LIBRARY_PATH=${S}/$(get_libdir)
 
-	local qmakepath=${EROOT}usr/$(get_libdir)/$(usev qt5 || echo qt4)/bin/qmake
-	[[ -x ${qmakepath} ]] || qmakepath=${EROOT}usr/bin/qmake
-
 	"${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
-	"${S}"/bin/qbs-setup-qt "${qmakepath}" qbs_autotests || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
 
 	einfo "Running autotests"
 	default