diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-08-12 00:12:40 +0300 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-08-12 00:12:40 +0300 |
| commit | 3ec50ac2b480302e3cb0c777743d0aba477bbc9c (patch) | |
| tree | 0990860ba48131e7956723f1675c5043b76f8a03 /dev-util | |
| parent | dev-util/qt-creator: Add missing patch (diff) | |
| download | qt-3ec50ac2b480302e3cb0c777743d0aba477bbc9c.tar.gz qt-3ec50ac2b480302e3cb0c777743d0aba477bbc9c.tar.bz2 qt-3ec50ac2b480302e3cb0c777743d0aba477bbc9c.zip | |
dev-util/qt-creator: sync live ebuild with 2.3.0_rc. Multilib fix
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/qt-creator/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.3.0_rc.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-9999.ebuild | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest index 5b21ec77..afdc4a73 100644 --- a/dev-util/qt-creator/Manifest +++ b/dev-util/qt-creator/Manifest @@ -1,7 +1,7 @@ AUX qt-creator-2.0.0-disable_qml_plugins.patch 1151 RMD160 bd91bb75fec901fd2f3e9b89c2db24c80562ae5b SHA1 0b6ae0f0e52dcb59fc7e1df851eea2fe313f4995 SHA256 1316130a6bc399cf845447629cfba2d0d57f5ac191ae5545149b03393fe2b37a AUX qt-creator-2.1.0_rc1-qml-plugin.patch 724 RMD160 f9eff709b1585ad0264b5855b477f2a703c3e232 SHA1 2f84e0f3d32e4efb4328fdef484bc0a7af552ed3 SHA256 78c9f628b6f167cc80317d328a327c106e2dbcc2b3141c7beace9ffc4b30d0af DIST qt-creator-2.3.0-rc-src.tar.gz 26456896 RMD160 da495dafcf907228e4a59c8959f96b324e52aaa7 SHA1 8be7231fbfe2b5c1bb0352fcce7644c0835ccfc3 SHA256 722c6ae968f9d19c18d45820086e4f1f111929731f432daa18996883bcc7ea17 -EBUILD qt-creator-2.3.0_rc.ebuild 3918 RMD160 fb5157600043b90ebac52cfce5b735fb0ffdefe9 SHA1 9e13f318f8b21d898163e242f72c3cbcf3b404fc SHA256 53d4c60fa7652ce79c2d2b9f472966e17e7ddadb8c9bdccca0b943e83f5a7e0a +EBUILD qt-creator-2.3.0_rc.ebuild 4115 RMD160 bbb42ff0563ec7e2bc93a3b0bf8c1ec674af6dbf SHA1 63631e2d5492b33e5bd8f8826697b70ed1531912 SHA256 2d80e96955cbbbf7737b3d754f8b13fa86d27899832e215e7cb2507bc628eaa4 EBUILD qt-creator-2.9999.ebuild 4275 RMD160 bb2838779f0a8db75d6d03a435f0a1ad62d88e0d SHA1 1365e62475a5bcf4bfad9a1fa7e5842dd7ecc0ca SHA256 7470e14a149f80ed302f6daae2b1f95eb9f4a14a60d65d10be1f5e03852779ea -EBUILD qt-creator-9999.ebuild 4257 RMD160 a7bbb50ec69d5ff7b21007f4fbaeaf07185db131 SHA1 a161395a5fe245c25eab8f24d60ccfbf7db95cfd SHA256 831290983200c31e5d7853b94bc946f1ad8b6a4ef8994a8e8b76053c623f65a7 +EBUILD qt-creator-9999.ebuild 4454 RMD160 e6dbe6074fc64ccd2c84092f082e70d18fee216a SHA1 0f7aa979a4d10a0e9f0cbb1d907116b83438d36e SHA256 2a3f6b58cdafa0efc33de28dff2f13ca36fae30abaaf711a27466c58755797ee MISC metadata.xml 1108 RMD160 a9e9f00da1b9504a0fdf3605b6a05ddf1befa66d SHA1 d4541a5cc3c29ee2b8dd35b5b94d387b34765c35 SHA256 8fb6608ad281a48a7e1e606c891effbf484bdc5f97330aea46d271ae083103f2 diff --git a/dev-util/qt-creator/qt-creator-2.3.0_rc.ebuild b/dev-util/qt-creator/qt-creator-2.3.0_rc.ebuild index 81b624d6..2f1afab0 100644 --- a/dev-util/qt-creator/qt-creator-2.3.0_rc.ebuild +++ b/dev-util/qt-creator/qt-creator-2.3.0_rc.ebuild @@ -55,6 +55,11 @@ PATCHES=( src_prepare() { qt4-r2_src_prepare + # fix library path for styleplugin + sed -i -e "/target.path/s:lib:$(get_libdir):" \ + "${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \ + || die "Failed to fix multilib dir for styleplugin" + # bug 263087 for plugin in ${PLUGINS}; do if ! use ${plugin}; then diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild index 913b6697..1a08ec7f 100644 --- a/dev-util/qt-creator/qt-creator-9999.ebuild +++ b/dev-util/qt-creator/qt-creator-9999.ebuild @@ -18,7 +18,7 @@ KEYWORDS="" IUSE="bazaar bineditor bookmarks +cmake cvs debug doc examples fakevim git inspector mercurial perforce +qml qtscript rss subversion" -QTVER="4.7.1:4" +QTVER="4.7.4:4" DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?] >=x11-libs/qt-sql-${QTVER} >=x11-libs/qt-svg-${QTVER} @@ -66,6 +66,11 @@ pkg_setup() { src_prepare() { qt4-edge_src_prepare git_src_prepare + # fix library path for styleplugin + sed -i -e "/target.path/s:lib:$(get_libdir):" \ + "${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \ + || die "Failed to fix multilib dir for styleplugin" + # bug 263087 for plugin in ${PLUGINS}; do if ! use ${plugin}; then |