diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-05-04 19:50:23 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-04 19:50:23 +0000 |
| commit | cdae671eac96822c794107b1abdcac253f104d61 (patch) | |
| tree | ae8bbd399d6762b5cf8dcd95aa171a1133b610d8 /dev-qt | |
| parent | Make USE_PHP a REQUIRED variable for the php-ext-source-r2 eclass (diff) | |
| download | historical-cdae671eac96822c794107b1abdcac253f104d61.tar.gz historical-cdae671eac96822c794107b1abdcac253f104d61.tar.bz2 historical-cdae671eac96822c794107b1abdcac253f104d61.zip | |
More fixes for building the qbs plugin (bug 548086).
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qt-creator/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-qt/qt-creator/Manifest | 32 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.4.0.ebuild | 6 |
3 files changed, 24 insertions, 19 deletions
diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog index 5e4cb6436346..f6236f718ef2 100644 --- a/dev-qt/qt-creator/ChangeLog +++ b/dev-qt/qt-creator/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qt-creator # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.50 2015/05/04 00:09:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.51 2015/05/04 19:50:14 pesa Exp $ + + 04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.4.0.ebuild: + More fixes for building the qbs plugin (bug 548086). 04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.2.ebuild, qt-creator-3.4.0.ebuild: diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 829bd9d5598e..3302903d1e83 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -6,25 +6,25 @@ DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb7 DIST qt-creator-opensource-src-3.4.0.tar.gz 23199469 SHA256 b80baf5be9b0421b3d951a8a0eb411a65cf008f4c753f5a80d205e90fa4fe112 SHA512 26d527a914b073f16dffe92314635af975c5878221dfbb8b7d0d0279d38e7934b062a4087f352fe619da2db1f66a090dc3f93ac2c1596438bd3d3f08d67e3d82 WHIRLPOOL 92e695b4f02634cf54d4126c2b81e50879040a6fbd4adb564068af086d80197a683035428c1409400c53644df0a875d0921032243cabdf1ced03875c4b25ae8c EBUILD qt-creator-2.8.1.ebuild 3150 SHA256 034e4af5d417417ca6e9b833a87f826eea5d812b518913f6c504cd3a88db9e32 SHA512 41be818bee40a55d4313a7126ec99bc90a502e2182cbb53def233ae0f9e465145fe8379087910554ecb39f44a05a7e69b0e18ab519cce7b66b2d8f35cdeb983b WHIRLPOOL 9adcf26642e8bd341a44b61f5fd859375658a2835eec8e090d3f68f70be5efad68e9b030e53a6f76f1deaac870f053843b3b1ba9159cc5f2edc1a5bc418ac251 EBUILD qt-creator-3.2.2.ebuild 3829 SHA256 0aeb60b14e881f8b1a496e26de6cd1fe13dba462d4a9fd67e674458d32a506f8 SHA512 c21d1fdecbf0572f00c2c8afd1a17f823c6329cadebb70931a8067f3197c6add2b5f2e7e1ac07afd812d2a7ec77b488dd7e62048c1cbfe2814bbeed382b2c1ea WHIRLPOOL 2d220d054109014299d2fe574946d06e39c88f7fab6e5e9e6122a21e80fe24749d68ee7567e2d40c42c49c9dab8028c3cfc2c03c965811f8a3104c0769e176a9 -EBUILD qt-creator-3.4.0.ebuild 4398 SHA256 4a9bc5a7b3326d878fb508f69383fdbfca2319b2c84b96300fc6f0458306696a SHA512 1ceef3cc6875a7b7e5103cf3e37e82ba1dcd94dfeb761c95676da9023caf01f447585bc737a4427ab8a65f8ff68192815622284717111ee4e928bf656ce085a7 WHIRLPOOL 62dd3e77303ec1a52343d384c61ee8f0db9511de2fe77ff02c12da181e1fc78115acdeccd9eb3262b03e08b24ceb9f31ffd60817c4afe11125b8b44f568769d4 -MISC ChangeLog 29351 SHA256 f6af48f1cfc7ba6cf5e568986db1ba03f85652cfee4806d883a4c02976236bfa SHA512 1a7081e9b260999a247332805180d3baf3ca2c4665d76b78b48eeaa188874db79cfc675753fc5c4879bc9f8ebc575e878e4c943df5e278272579798b1b06cfce WHIRLPOOL a87ea2e1e65df809ea360f46ff310e4fd06cbdf179191f767165539dbf70e03b1e49fd529cccbb0a9da97ecc998c4699e8a10e4a3c9dfa3e47c6a331dce45e6a +EBUILD qt-creator-3.4.0.ebuild 4475 SHA256 5000693582e515e73d1a95f5143c7ce024782b1c27e55de47e3ce722c4314157 SHA512 51f2847a5575898e129705a2beccabd50be7253a3b730961233bdf744dbc0689fc9984884f3da40fdb801859d9b5f5d91e389b10b7cf180318b769ad65936cce WHIRLPOOL cf53c6f3314eb726dffafb38187544557f482cf2edff3069c24e6f8f62385291f58638d3688ab55b33ca7cc13a5c38ed9ff810ae63acf38b2a8086a54b25c8b9 +MISC ChangeLog 29482 SHA256 e77a41a389c986ba7f3b084df45b156588a28c568d7ec33db4304533e057d159 SHA512 3bd3811e6e806d916bb1d6d2c5f67bfb9c2471a3f44f0224b1536787982ed8c46f81f646e1534d4c040442503194207906a59a9d6c07957a0a2346a30a829f7c WHIRLPOOL 0b5d8251943e4be40d4fcdc9bd33c7786227cd90391b4d6b1e55c6806bb87602952c446826063d0d9224458566cc3bcb9ab62ce823b808ef67dfcb5e3f9b6e39 MISC metadata.xml 1820 SHA256 e438e4152bace75a28ff1ca22324d0e1ade63d2bbafa81b4b5a33a456ae130e4 SHA512 351e7f71c578552fa8e167307372a300ecba64a59aa089184dcd7d20ebe3763c4ee294bdfd0262b95b0995e238412f02ef90d18f43db87bb8360ab0cc8b3f7ea WHIRLPOOL 2eeb30fc5eea23140d462169f2f1fee019f518f44cfbfe07cc841f3a8117b20c1c5b8af9692ab1a4774359c9822312deaef431395f17c1b80dca0cb99d82c466 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVRrjEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVR81+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9YjYQAK81awEOTdcqG2+F/R1Mt/Jq -2zpPQwkJ1iYLUnBaeTzk7NddTvamVCAFhBIPwWpOp1zTr3PTOQ3kjoWkvkx65aVa -h1IjpGCc+71LfHE1lw9EYi0gkFTYsVl/fxc2G+poChfHy/xsEdnvaRp5xmKz9bQ9 -WBtjspJ4TGkMkELHYEgv2eIe3feqrt0WiHB8rbWgjQC8k8AEh74KAmHIvXdomngg -TAvbs/oB/xOWkUZ0aN6HLc76twZTRviBfzynl6bGUKH2JFZwuo2C1i41wppeBIJM -XBjqLotbGWFBQY45vuXvqcyxgyS3waDzbCyaatDkDlZVYZcIXNBRULSfyubD/2yb -9WpSA2TOKT1FqQsonrLnTq1vSIe6RGQUhMoaLguHd003hRD+Z3do4xveeHz4D1dC -TW6LyLevzFB7yjkpKy4YVRDx9Eg4Dlg4IdAzpVMJtyFPvlwb933lNf9EncTdBOvp -ELfQb6B3kvfP4Stg6zbwphjy+hw4K7QZc2XCbTXnsrWS/LmHq+rbR7cUipJ7kQZn -rIVCSR6jXldNSlA8AbuouWXq2b6p+/83sGRgP+WwwEEFxKL7y40Iid1a/WSU6hik -/0S2XZ5sdH+vR8ZdKYkZdJh8lQ0RbQF9YVfuVgqRfgPDi8swDoHUzzPHyGOb0SMB -jOXSGc8TPYxiauwNCP3s -=UCTG +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9o6IP/0DiTz9Hu7L7/QqNKnSk+zDq +UmFLdxMDKuwhuysajrqLfdn7QrVASUuZEiyqO2wr95l9pPog/p/n42vm/NJF0PZG +ya3mHE3leL26uByZCjv2FUOLUqffsm8R0w1C3G0pwHwfDeUkic2PYjHKf9eILXEW +lC93H20s5Fv8I1S+srj0EqX1iZ/zRKwogGEIFNO6Qb8qmvEZx44HKjJCflTZgNCv +u8PFCsuas2MOS8tc2kc/8UPr79uw0O9ZvygGdrPXcHSEeeVeH0VTlTneGIl3KVEs +MDBKS/tCsY4V1MypoO915YQ0yTUjwC47MJ33tZLqNSAx3nxCzp/IMjrpUs8/e38s +qvPnjTgg9uQClFn8iJMQEdHG9bL7GyB36tMsUfaTpqBrht8Q2YYkjfTRbVRJ2Nqb +O4vuJjxo1h6whvn5VlAtMzUk+4ni63BO5CTWawvGwc73/2b9OApANTRKNBK5BVaN +Tjz98h9Htnmjsj5BfVBKx2Qa84I1OpQiCkBfvz4co9DgYNcv2cZIciyCcLZ5nCqy +Rt2Ar/qzwCVxtVpVsybuc8lbVXdZqUlN+8KAbgqOfZAjLkoU0m2Nojdox4F1bTuI +KiJiaWmIBaWA0kAlwPqYRjsSBSfZXHhl63NpUK1gWo/hq5keqneRdTnp/L0lb5V2 +YTKvKdTeakvuTyZWG4ru +=rVbc -----END PGP SIGNATURE----- diff --git a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild index e0c5eba70216..378d31896467 100644 --- a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-3.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-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.3 2015/05/04 00:09:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.4 2015/05/04 19:50:14 pesa Exp $ EAPI=5 @@ -57,7 +57,7 @@ RDEPEND=" >=dev-qt/qtxml-${QT_PV} >=sys-devel/gdb-7.5[client,python] clang? ( >=sys-devel/clang-3.2:= ) - qbs? ( >=dev-util/qbs-1.4.0 ) + qbs? ( >=dev-util/qbs-1.4.0-r1 ) systemd? ( sys-apps/systemd:= ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " @@ -119,6 +119,8 @@ src_configure() { IDE_PACKAGE_MODE=1 \ LLVM_INSTALL_DIR="${EPREFIX}/usr" \ QBS_INSTALL_DIR="${EPREFIX}/usr" \ + CONFIG+=qbs_disable_rpath \ + CONFIG+=qbs_enable_project_file_updates \ $(use systemd && echo CONFIG+=journald) \ $(use test && echo BUILD_TESTS=1) \ USE_SYSTEM_BOTAN=1 |