Version bump. Also enable the API for updating project files, required by qt-creator[qbs], thanks to Dennis Schridde in bug 537244.

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

3 files changed, 32 insertions, 23 deletions

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 679887e42147..afc849cfcce2 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2015/03/18 20:39:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.14 2015/04/28 16:08:28 pesa Exp $
+
+*qbs-1.4.0 (28 Apr 2015)
+
+  28 Apr 2015; Davide Pesavento <pesa@gentoo.org> +qbs-1.4.0.ebuild,
+  -qbs-1.3.4.ebuild:
+  Version bump. Also enable the API for updating project files, required by qt-
+  creator[qbs], thanks to Dennis Schridde in bug 537244.
 
 *qbs-1.3.4 (18 Mar 2015)
 
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 66b78bc2c47d..5ebeff00a5cd 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
+DIST qbs-1.4.0.src.tar.gz 785064 SHA256 d384d0368c3e32ab3bdd9d85c96bb037aa1f650e77326ab5cd400a38cfef33f3 SHA512 2271393670dd22eefb35099b84a51a7456321763e8414dc5ce96d9675b062ffa2cb7b4f89f52b74ef3e05c2ad62301e3406e3a0adc313f475d534a9a75cd577d WHIRLPOOL 06dbe42ad7244b7ca1576a444ed6f09cf64eb89455b36467a32058ce21cf207d635f7f71c6eed843b7afae0b6416e9f846ea719910c60fc45f90ecd4ec4fa654
+EBUILD qbs-1.4.0.ebuild 2045 SHA256 183b2112efed0246938f508fa340bd3cd752086342e456c7d55de3bf2a9fad84 SHA512 7bbd6d2bc7c7d2bda84fc9ba0bcc55a86be7ab5023f9814cb8cac0b847d4ff2fc71e73477e1ffdb6311cbd4a01c71427077f623b4783905c7852f87be8409eab WHIRLPOOL a14e946108d666cdda886bc448a45c4d168d257c57dd996db516a36caf15bf15135056948c77abc6dcbcbf31fa594102f7cba1cb058165c06a330a8598decc24
+MISC ChangeLog 2406 SHA256 3e1f5dc343889eac9ee4bf31763eaf62427f25647bde8efd0540f7436d0c3a66 SHA512 8ec8f5755781cbbd8d516aa555cfa0dbdbc2c7d3bd9d6fe2b85d3d8994272054894832c93656ec6b07757e94a329741cb4296d42c7bab315593222e1e84cfd35 WHIRLPOOL 1b7c03e565009121539157074e6fda23a25d14b3b46b24d5ef8e33f6ec66468c4d1f0f4d94e4244978c4832cd3e4bb43e2ad9dc0f915f9b715a3950e5db738c9
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCeKUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVP7CFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9WMYP/14vc673EdRCrKXz6CeET/tm
+nxZ7Gv9k7mUMJag/wGLenYGJCTDEsx/jTAE/gmxtwCXQ5ZBnPsw/S5eoLDXsqtuS
+3VChM4eab8mmCkjFE8SZ2pAJapm5tJOReHG0pR7YJ1DNvleWB/C0ewIoMJFHYHJX
+JsEDaGC/6hGpdO4NA2euBkSokZ8YGzMFToIf/3D46p2XHOR2LXBNNxG+97OGzAP1
+TIqW+qT8OJ38VLc3S/W+ltIkdAo+jOuk3OI482HlsTj6cqTT3uCudktxMMWDuzt8
+Y6TK7crucKWsDXthhDVR2/iW8JQ8OFU86a9doHIIQO8CB7l+/10o8sZNV2H+1Ny9
+pc5Mck03bQY1cN9UTgPuQ4D2iutgR45qf84zyWD9NK6CznQmHi4Nl/GqgcJ5fbk4
+W7U2ykR7YEwRNWTvlKpOUOSJWO3REgw3u9AHNC6ww5g5/+I84kLUYVkHs54ukw4A
+Gzper6rDZk2kbT8mA8JEUoX6Obi59enI3JpQWqj4NqxXcMkz8J2BsgZyvZK+i03J
+r057sXXcmFc1Qo7CwDj9Zy7+UvEhPNMbgA6smvHB4uTK4eMgDSqQSSFUGt4oWbz/
+ML0lIABO+AA1LbKa4ewrsG2iBRryXWjlbaDuMb8ibznMODYHBEp06TIGv0pYkULs
+nJoye/tTR9qKlXKkdbye
+=xceN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qbs/qbs-1.3.4.ebuild b/dev-util/qbs/qbs-1.4.0.ebuild
index fb238e746c50..a394a8fd0d37 100644
--- a/dev-util/qbs/qbs-1.3.4.ebuild
+++ b/dev-util/qbs/qbs-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2015/03/18 20:39:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.1 2015/04/28 16:08:28 pesa Exp $
 
 EAPI=5
 
@@ -42,9 +42,10 @@ src_prepare() {
 	sed -i -e 's/!haveNodeJs()/true/' \
 		tests/auto/blackbox/tst_blackbox.cpp || die
 
-	if ! use test; then
-		sed -i -e '/SUBDIRS = auto/d' \
-			tests/tests.pro || die
+	if use test; then
+		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+	else
+		sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
 	fi
 }
 
@@ -52,7 +53,8 @@ src_configure() {
 	local myqmakeargs=(
 		qbs.pro # bug 523218
 		-recursive
-		CONFIG+=disable_rpath
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
 		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
 		QBS_LIBRARY_DIRNAME="$(get_libdir)"
 	)