Version bump (bug 528436).

Build against Qt5 as now required by upstream, thanks to Paweł Stankowski in bug 479638 for the initial patch.
Add support for qbs and winrt plugins (bug 476256).

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

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index f17ae3329ddd1a58c2944823054775a6300be5d3..f82b77a0391d0aa514246c8afb13bfa9505319e6 100644 (file)
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,14 @@
 # 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.36 2015/01/08 22:32:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.37 2015/01/18 04:56:40 pesa Exp $
+
+*qt-creator-3.3.0 (18 Jan 2015)
+
+  18 Jan 2015; Davide Pesavento <pesa@gentoo.org> +qt-creator-3.3.0.ebuild,
+  metadata.xml, qt-creator-2.8.1.ebuild, qt-creator-3.2.2.ebuild:
+  Version bump (bug 528436). Build against Qt5 as now required by upstream,
+  thanks to Paweł Stankowski in bug 479638 for the initial patch. Add support
+  for qbs and winrt plugins (bug 476256).
 
   08 Jan 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Update upstream bugtracker URL.

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 72dc16bd453c57af61fabe23a9f5728e5a822ea1..83248063e2a07ae651df9d15712bfe276a03c7ce 100644 (file)
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
-EBUILD qt-creator-2.8.1.ebuild 3190 SHA256 b5f31c203bd17e6262908726e198e63b3087efaf7d50723ec49494f3b442ce90 SHA512 00733b024078bae3b7451b42d3b8ebbf7e02408b91a6666441cdb1b5450879b7e387e6417dba24964e21a134af3496a63f3d02b50d3d89c8f16911fb0b76a5ea WHIRLPOOL cfebba542120973f18e466065aa94380c1edd9ec405a423e7ca563aaa304cfa69797b7c3ed41ee783ca731171f11ef825f9493d9abc983c45bb259f2874a14e8
-EBUILD qt-creator-3.2.2.ebuild 3404 SHA256 1eee8b1690d6bab46b73a14cc2ff6c86582c6d844145200eae3adabb1caacd25 SHA512 3d68cc3aec269e2fba7c503d06ff92ebabd8d8ba4834ce128d18033a23ed04e77d7cd914eff917acd11f76469360043e73270b403d4f2ab665fbb1eec4c21d4d WHIRLPOOL a5236d9b52205668903f494d890eed2d858d3467c9280a44a86271ec6aa0aae35e1a7c4ccb348a8f32200698ea270d537cc7876b24319613b8d1210c53e52d9f
-MISC ChangeLog 26915 SHA256 d6118a8cf8732b94182def514b719cd3dbd102a1dd1a3cb381c1fb90d153f05b SHA512 5ec6e0088ee20cbec8ba34eefb14d913a18b9b96195270a38a64344e7456d1d6523a5e3af9aa468e6ffc2be2954624c867912e9c3bde7815f9e97bf3a02daa14 WHIRLPOOL 4beddd94d8a21046ed367c4e6689e0726ca272d762bdd90d5f1cfe74e3ee1906281b9ea0644c470937715404bffea23d785513f2dcc98a08381c3a6f0c749f3f
-MISC metadata.xml 1623 SHA256 d26ddc95f3c6fbfc87c5586f38ef434ef8b5ce7aeae7802f0ed470ee266e952a SHA512 249abbdf4b5b18499bddc2e20689850e7fefbd3b9ceae367c54734170fdb17e92aea9520e5c1403674783eb0da941487e901195b00428ad0622f218b3726a8b9 WHIRLPOOL 643e0b5eef008a3fc3474f4040325fb759ada6879e5a5352c9f3103b646cc335271c3017fb4a174c5d9db406b3d272bd5d3363509b31d6345a20a2c0c8029399
+DIST qt-creator-opensource-src-3.3.0.tar.gz 22950004 SHA256 27a5c8815fab95f959134047f8315686de4de6f99b0bedfd46b5dedae390525a SHA512 ec198c74fcfba06a4c8deaf3ff6d6d43617ee0a21118c189ac67bf99b46f78b19f5f09649e8376bad35695dd2ae66e2c47e1476381b2b3ea658fa9d433fc0ec6 WHIRLPOOL cb85fd5d1a235b885b4168db7da238175e1446d4b82e88ceabf107772ea32278475e3a50d61c5ce734080b0d5f00274317de6ac94d6700928f06725b143dc13f
+EBUILD qt-creator-2.8.1.ebuild 3181 SHA256 78cc78fe877d48e2bea5d3f262fd2fa1b7edb23c6914075d70efff99e398fdcb SHA512 f4cd8d08f25978d7a5aadd14742c63fb2e9091e2586dcc74fb5f373d7ba60d5c0e5c8ec98574c9ebf7476d0297c81fb3524dbe3749edcfe97714f44ec959d72b WHIRLPOOL 211a543227e30a1c18230b22941a68182e619f2284b2be51487cdbe0545be4b82bffa473c1e048d80d75b05185ba99e78f3ae526f529da7239d480432e2335cd
+EBUILD qt-creator-3.2.2.ebuild 3395 SHA256 c694aac11a3008017ebde2ab6c39cd725fb45bf172092a475e4387c1eaeef22c SHA512 12d73a29d2da5eb36634b4ad28471792d56ed0855dc828e84059290aebb68a3e92c3d361a18a1f995a2a1f2bfc3c0fc4ff03e1f77ebe184b22f0101f8694ea40 WHIRLPOOL af74a0be0af1325461b4563ee7cdd9e3ef9bb654841287d93fec88734a914ea1f129d0da5c18bf75caf5f1a42e0020c53ed3ba9c9017d570462e16f7bed61a05
+EBUILD qt-creator-3.3.0.ebuild 3817 SHA256 b89c8780ab4fbb7dd32dce1e6b19196a0cbbdef8bf9d122d1846ee691409ad35 SHA512 d6e5d6cd8ddc83a93f5cb504588dcfd46b17f98a8a1ed62be481c4ef78aa392d31cdbcff4f9fa63a04f3016ceb5a93676571993b7850d81865c347193974a646 WHIRLPOOL 214410b8532bb4a80afd9451b25c4ed24712eaa65c233db9262699634b7e29354b3df0a877a643b658a3c9b265c7b2e3e134fe88540c514dc7995292f7c3b06c
+MISC ChangeLog 27288 SHA256 85fb3fa9b915d179dc931066f2791f748749501bec3d9419b7eda46ec66d9787 SHA512 c181a45211efb7faad5bca8bc6646fac43205a051f0dcb851fbe92fbc14b53fca707215560637a3ff8b6787da780158da44f82d6abc63f624312e1bcb331087a WHIRLPOOL eaec7fc1c82f0d33122e29bcf59a19cfe6a144b1f3c7c829e39075e38fa4b6ffcaaa937b4ac3a9d04208dbd25f5d201462db55c5579a53c391f231100282fb62
+MISC metadata.xml 1740 SHA256 27a5ef83ec012f02ad59acad3b950125fdcbf8a78ad82451f9d2b5dbf15a1f49 SHA512 6a8240c28f73c0a4138b82145ad38364962b2f0fce9563dc24ba2126c98ee03ea45677fc99d89bbfd71333e9c95440aae701a39089596f773e9a36b79d6063df WHIRLPOOL 3d4299284425bf2fc593293f0c70dd949b58e68ef83b480974bf0e2ba36a790486ec138d006b98fb455761d2be7313f8b7230739526fe5f9a4ad63486cbf2df1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUrwVsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUuz0RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bmoP/0ax0josYvXJB+/7MVY1xmXC
-z5irGg1iSxADZ7HPldmsRi4gy3+FyXYZVZCVHQTVy5mNTdWtFcszq7AVwN5COeSw
-TTyFBwENgUODxLW2LPnOavE+XMeJdaiUd9rMC1zclpDx7MK+M/hJkBMvXJuT2KCz
-fMrIwZqqXzcqK7HaxM5nLuplOWc/Tyi57IlYRQihhO3a8wwDDILlZtGv4buwIvmW
-77aEYk6F73Iz3eu8eci3WL+5j67SH+EcBoP6d8FdtXA9H98QVzCWjttYfukeYe5B
-R2EuvELaNVG/Dm0PBN0VJZy+eAFHKBuRn9uaNJ4y+DEsvb2ngoRkuqVPy6dMXV+m
-E9AsOY/0TjHj/nVuEfVth5JUc1qlABnbGukzYx3lFIn/SVB4UFbiqkkqfRXZrP8Q
-7TZ/G70nIAt0ZcdxLy52Be/1TQ7tUDKKoedUzoElJGswB9IGHaBmkZP3bhIGeiBY
-X8L0B8Pdg+6TD30Juj2K9Zy1Nad7bpxcoIa2IWW3wDAIdfGNyKmPYIxnLdG6h0Ok
-0t7Nj7J9Yes1m33wU3ZU5E8FL/yrUXUvUo1LBFFV+SF3AJu3yUzCAbOMDvBWG9ie
-XfK8aWvtVy9MdNUnrJanO12Zlgep1RrVBU0iEptjKk7KNW38ZgXdkkpofoCFiR3v
-rmpMxPdIk4KtsVXjunTO
-=AB1D
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9KIMQAK4Yji3y29uhmJi6OHiXmBLq
+f/CtNeRAQrpQcR7+adT6Vci3tv1T4TnBccrX+lsHFu2cYmmivsGFjjHd8wYsJjpq
+CvHMUUboHss4LM8n2O17A7XdNaA+eIkXBX2/GTQIVzDQ/PsEQg5BPbMEL1oGzLT3
+rzoRGW3gbmp5XEi4zG0bWze/Wposq2xMM16fGg/WLqjUisQgXS5sdeGzkrAskVaR
+VHXHRrB2FBFeuPOwbvVEYC7zE6tNphTrZR0q/g/JAnXSc40zfZesgFj0eS8KgW2J
+3w+IvXq8FBY+ek0r6fX2eF1v2+4iEtzHNaJodECNfAEKt/gg60mCJ9Iz8WQexDz+
+tHAaeyNO+w4UUxu/xWhIPT9l6XLADhijSgELzXor7jRo0irCcDTRaitLi21LP9Vn
+w/A4cW6Tzrh3hhODvB8s5Y1DntFelOOtf8yXVOygTJbHGL+weoBHOfGl0cJDewvO
+yZUVV8FGRX266t+v3MTq7lfImv8teIKzCrP9wdMht42kMsyPdT8687XviU9aFWAq
+5q/zu73HiJEq4Y8SfXkk6HzgiCej2DDiH0ECIaojb0hvDaDUaJ6hvEwVMd6OxXiO
+d930BxdQktEZi9Xt3NeGb7Ksjcglo1lSYerCnOhMK+smo+v8htEeD4wO9yqowzaX
+K+JokGEeULt19kbApAJL
+=rZ+4
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5f4b6845bfaa17c5504f0ef88271ef71fc8a98db..38ebd7e7bd768af27c27a1bb6961c7643ee21fd2 100644 (file)
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,8 +20,10 @@
        <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
        <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
        <flag name="python">Enable Python source code editor</flag>
+       <flag name="qbs">Enable QBS project manager plugin</flag>
        <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
        <flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+       <flag name="winrt">Build plugin for WinRT devices</flag>
 </use>
 <upstream>
        <bugs-to>https://bugreports.qt.io/</bugs-to>

diff --git a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild b/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
index fdcb73934d3c3fb4d54b889508eefd65c26d40ab..71e6d3dfcc88767e7c4df4e699046e5265d9d7f8 100644 (file)
--- a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-2.8.1.ebuild,v 1.5 2014/11/07 01:59:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild,v 1.6 2015/01/18 04:56:40 pesa Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ else
        MY_PV=${PV/_/-}
        MY_P=${PN}-${MY_PV}-src
        [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-       SRC_URI="http://download.qt-project.org/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+       SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
        S=${WORKDIR}/${MY_P}
 fi
 

diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
index 89b00e16b34da3bb54aa47dc7a943fef1ada92d2..e51ec1269224e40bf0d98c952b540b62c1675f31 100644 (file)
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.2.ebuild,v 1.2 2014/11/07 01:59:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.3 2015/01/18 04:56:40 pesa Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
        MY_PV=${PV/_/-}
        MY_P=${PN}-opensource-src-${MY_PV}
        [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-       SRC_URI="http://download.qt-project.org/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+       SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
        S=${WORKDIR}/${MY_P}
 fi
 

diff --git a/dev-qt/qt-creator/qt-creator-3.3.0.ebuild b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
new file mode 100644 (file)
index 0000000..40044ff
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.3.0.ebuild
@@ -0,0 +1,140 @@
+# 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.3.0.ebuild,v 1.1 2015/01/18 04:56:40 pesa Exp $
+
+EAPI=5
+
+PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
+
+inherit eutils l10n multilib qmake-utils
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI=(
+               "git://gitorious.org/${PN}/${PN}.git"
+               "https://git.gitorious.org/${PN}/${PN}.git"
+       )
+else
+       MY_PV=${PV/_/-}
+       MY_P=${PN}-opensource-src-${MY_PV}
+       [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+       SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+       S=${WORKDIR}/${MY_P}
+fi
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+       bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+       perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+CDEPEND="
+       =dev-libs/botan-1.10*[threads]
+       >=dev-qt/designer-${QT_PV}
+       >=dev-qt/qtconcurrent-${QT_PV}
+       >=dev-qt/qtcore-${QT_PV}
+       >=dev-qt/qtdeclarative-${QT_PV}
+       >=dev-qt/qtgui-${QT_PV}
+       >=dev-qt/qthelp-${QT_PV}
+       >=dev-qt/qtnetwork-${QT_PV}[ssl]
+       >=dev-qt/qtprintsupport-${QT_PV}
+       >=dev-qt/qtquick1-${QT_PV}
+       >=dev-qt/qtquickcontrols-${QT_PV}
+       >=dev-qt/qtscript-${QT_PV}
+       >=dev-qt/qtsql-${QT_PV}
+       >=dev-qt/qtsvg-${QT_PV}
+       >=dev-qt/qtwidgets-${QT_PV}
+       >=dev-qt/qtx11extras-${QT_PV}
+       >=dev-qt/qtxml-${QT_PV}
+       clang? ( >=sys-devel/clang-3.2:= )
+       qbs? ( >=dev-util/qbs-1.3.3[qt5] )
+"
+DEPEND="${CDEPEND}
+       >=dev-qt/linguist-tools-${QT_PV}
+       virtual/pkgconfig
+       doc? ( >=dev-qt/qdoc-${QT_PV} )
+       test? ( >=dev-qt/qttest-${QT_PV} )
+"
+RDEPEND="${CDEPEND}
+       >=sys-devel/gdb-7.2[client(+),python]
+"
+for x in ${PLOCALES}; do
+       # qt translations must be installed for qt-creator translations to work
+       RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+       autotools? ( sys-devel/autoconf )
+       bazaar? ( dev-vcs/bzr )
+       cmake? ( dev-util/cmake )
+       cvs? ( dev-vcs/cvs )
+       git? ( dev-vcs/git )
+       mercurial? ( dev-vcs/mercurial )
+       subversion? ( dev-vcs/subversion )
+       valgrind? ( dev-util/valgrind )
+"
+
+src_prepare() {
+       # disable unwanted plugins
+       for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+               if ! use ${plugin%:*}; then
+                       einfo "Disabling ${plugin%:*} plugin"
+                       sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+                               src/plugins/plugins.pro \
+                               || die "failed to disable ${plugin%:*} plugin"
+               fi
+       done
+
+       # fix translations
+       sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+               share/qtcreator/translations/translations.pro || die
+
+       # remove bundled qbs
+       rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+       eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+               IDE_PACKAGE_MODE=1 \
+               LLVM_INSTALL_DIR="${EPREFIX}/usr" \
+               QBS_INSTALL_DIR="${EPREFIX}/usr" \
+               TEST=$(use test && echo 1 || echo 0) \
+               USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+       echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
+       cd tests/auto || die
+
+       eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)"
+
+       default
+}
+
+src_install() {
+       emake INSTALL_ROOT="${ED}usr" install
+
+       dodoc dist/{changes-*,known-issues}
+
+       # install documentation
+       if use doc; then
+               emake docs
+               # don't use ${PF} or the doc will not be found
+               insinto /usr/share/doc/qtcreator
+               doins share/doc/qtcreator/qtcreator{,-dev}.qch
+               docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+       fi
+
+       # install desktop file
+       make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}