Mention upstream patch in comment, thanks to Jake Petroules <jake.petroules@petroules...

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

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index afc849cfcce2b0cc1d2659a3c43a5423a4fbf6db..292b0bcd480ed7259eeb858f21a033360326e22b 100644 (file)
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2015/04/28 16:08:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.15 2015/05/02 16:59:49 pesa Exp $
+
+  02 May 2015; Davide Pesavento <pesa@gentoo.org> qbs-1.4.0.ebuild:
+  Mention upstream patch in comment, thanks to Jake Petroules
+  <jake.petroules@petroules.com> for the heads up.
 
 *qbs-1.4.0 (28 Apr 2015)
 

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 5ebeff00a5cdd3182cc2269da0931a4afd64a5ce..db10710d6b2b03cfc732d2b74efc1db78f180df4 100644 (file)
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 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
+EBUILD qbs-1.4.0.ebuild 2116 SHA256 a714db84ae3565a774dd09aa25cac4daf4815cb2663972915b17e0598fcb5ecd SHA512 4fae65688d9e29702bb0e8e5eeef9959ad80a48ee9d8dafb189a3a12e4eab5bfd8a17dd1ae7d5a30509aaf0c752fbd8b646251587929b2c7f7aed14c74dc6fd0 WHIRLPOOL 5cedcd2c949420ad265e0475f1a99eba16e9ecd5d8f8471885175c2673a4007149c6d1d79953e38b30892c52e3c593f7bb550a0c9c5573e77a4b9ffd7e79bef3
+MISC ChangeLog 2588 SHA256 b4fcd081bac5cb78bdb483c97ca37b795ffa6e043e1b3bdb9c1d57d4367a1b3f SHA512 38bb15c8980bc8b8b51fa02ee765ee544f42c93140ca144aa9c2c7a1dfbd4a7839dedb1fa6b77bbfc617c55d49781b946406c565fca4583a171eb0c9927039dd WHIRLPOOL da65e41b25199d6036900ac605f4a1a80440947aee742a25c44f40c16741a2a79131b08c10a89816004cf70b8fc39ba3398d23c425251d26609bf1251c131f11
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVP7CFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVRQKNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-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
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9nDAP/3ZyS96B+bBHvFJY7yZEcKqm
+VPiKePg9C1gVUZwbiw53Ded/Xs3SGS/QQe7RSsQLy+Dj5S6BhqwlPSUqMMWXPWgq
+BUsrZEGESBL+kPYi606j7wI1uOjGUiq9YQeudW9N2k7dE9Or77cHIxlNuxTbzbHn
+PKKZb+6npgdXsKmG3DLxF5rhqPK3gPnMnHlIBBOxn8UodQULJX/l97NJQY9MT+Zd
+npgKwO6Y7jIBwvud5SC9p0syNYchr78/4bFFpM8uDC7vDUYgFFGQ1qjaFWKGEiM8
+r4pKV4j3JZsOP56Qb13ag8yXixU7xZLbec5m2wuZeAfFE4/EIjUpblFVM1gw6WkG
+5eW5lPsGE/xa6JstH0+tpr81HTrpMB8Dcikad/tJ7jo6EBcdZsnuRl+Dj19ZqMb1
+xsnC1IZLkB856R2RDg2o0i5JjRQEuqEAOcVMeanMRt1ZwatbHHOVD2u+QB6d11ZM
+/8K6TMREcujz+YfSHGh6D2fR9WYO1fVIn0u7o1NAgbGIlGjV328/0w1cvPrHBROd
+oZT2VAbHYOXd8+7684wZ5BC3ukmg2yMyR9AwLrHlEusVdq0pE8ZbcgrDg9IFuqPO
+VLi+uRzi6t2vK9a+OtJaOgwir+hvg7lvxMVJPolpX14vsujqbKvVmbe1KMEYTcPj
+ichc/PL7X47WZ3Wg3ppk
+=rsPA
 -----END PGP SIGNATURE-----

diff --git a/dev-util/qbs/qbs-1.4.0.ebuild b/dev-util/qbs/qbs-1.4.0.ebuild
index a394a8fd0d371e6df25487db3afd973198cb3717..4686c0cda1b11306cd87cd5fea2653ce9b302b1f 100644 (file)
--- a/dev-util/qbs/qbs-1.4.0.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.4.0.ebuild,v 1.1 2015/04/28 16:08:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.2 2015/05/02 16:59:49 pesa Exp $
 
 EAPI=5
 
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        # fix plugins libdir
+       # v1.4.1 will contain a fix: https://codereview.qt-project.org/111532
        sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
                src/plugins/plugins.pri || die