Version bump, also fixing bug 449992.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 144 insertions, 20 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index b9e49fc31c92..aa9269cd8f22 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.8 2013/04/24 08:25:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.9 2013/06/03 08:01:44 pesa Exp $
+
+*qt-creator-2.7.1 (03 Jun 2013)
+
+  03 Jun 2013; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.7.1.ebuild,
+  qt-creator-2.7.0.ebuild:
+  Version bump, also fixing bug 449992.
 
   24 Apr 2013; Agostino Sarubbo <ago@gentoo.org> qt-creator-2.7.0.ebuild:
   Add ~ppc, wrt bug #460762
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8c61149a71ea..ee54a90885aa 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST qt-creator-2.5.2-src.tar.gz 22523588 SHA256 04521c642953fcb7a2d4011a60fdf29dca4ac1fffa8c834a21589fa390db2d4a SHA512 db9cf844c78304e6dcd1eb05df109430281eb35294c7993088d1ebab8efe56e3e9ef5d630d520822a54a35e3e1b9bfcf5fd505cac1e23020e185b8d8b85ddaf6 WHIRLPOOL b8338d8bc3c0efa951b2d06921bfd8b4a6e840ee69e404684dc9c0061b6d451b9a228905021b6aa69459a101970e1839cbd094ebc892a0cd9ad02f33729eef00
 DIST qt-creator-2.6.2-src.tar.gz 21396937 SHA256 86165159841f2a3c41e6b80af3ed6fb6655a5194de7fe51cbf08b1539a352524 SHA512 62a8def36bd6c10c0fd44977428b518b7111229d1ca847e263d61a39bd6b51eb40c0699dbccdc96a8b8980c453d0cf9c57cd8c59054df0f24c5b5af62ea7091d WHIRLPOOL 81ba71194ca2ec13235a91214d3e22fa1440cfa5d9f9296106351f5bcbe704c324623fac0774826d0ca046299790bb9a74135baf5dc62ef55fb402b571ccb267
 DIST qt-creator-2.7.0-src.tar.gz 22503776 SHA256 c8d05b65661639809df7815837e8c7d42980028dff1e21dc518049d837b3d6fa SHA512 bb4b941c8acb3572450c3eb8a70807480cbe1f23b1eb7150fcbac5b766c5a109567822a3f2644164f894f736a2d8fcc972d013a9f475ae72f97609afc98b89fc WHIRLPOOL ff660ac5283ae788843e0b812e68ca950b62bfd1507c1952d9bee0a3397ef300625dc3bf4207a773d81c1e2483533213365d2d0715b0a31f20ec3ca11fb56285
+DIST qt-creator-2.7.1-src.tar.gz 22572001 SHA256 5b428b49579ab62ab0575010848b4d50b05d4ff1abebaa73883bcdd9863f7613 SHA512 d76fe27e8d03bebe9aa732114b93fbd78b1561c6465e86160725b3a4cb45aabd91f2d5aa91f4d0cb24fa6e5583927cd68ccd70ffe1f672a489c41d6657ea629d WHIRLPOOL fd3cb6324a6d933b791beffaae9a226fb6356a3282ccd1ec6188ac4743e9f7c6c90d46dc5ab33a9cce4f89f83f8654ad8cbd6608e3e69e60e1a766cf534efb3c
 EBUILD qt-creator-2.5.2.ebuild 4345 SHA256 3255eedfa9f293b5bc5ce205f75c527f8751a1750ec33e033fe7c7e29779ad9e SHA512 c3ad18cb06214dde938745f86ed6a4bb4d0ee0909746fb183bd46ffffd171cfb428d9985f78385a405dbd68caf0ff57f95c9a972228420554b2c6e5d40627983 WHIRLPOOL 1fe443ea4c2b7e37cb4b4a4ffab2144d99947ea489f5e28b9d99d7c5ee64b33512fdd1c0eb503b4b4c956110f7615a98c1b2c4a8ced0d1b79ee57be9a2a70d7e
 EBUILD qt-creator-2.6.2.ebuild 3870 SHA256 1517f56546ef15c6a4d070a9792686cdd22a1e4f859a4bf898a636c03d79efd2 SHA512 7ca454170f71e33fb25534bb5a10fecc0b0b91bc64e0fdb38e1f5b9f45fb42663f86cfd672d846b6e23bc7d3dcc8c5a19f38eeb87c42b707d983d03bde6070e3 WHIRLPOOL e4a67c839631fa143da9a4818eaa0d529d628674c87b8ca27e6819bc6430fecb69f0fd3ac64551fe18632d2d3cdb4bb3136b6363fa92bd48bc7922a5701cb340
-EBUILD qt-creator-2.7.0.ebuild 2918 SHA256 754cff07e0a75c36f7d76a9c86d399bd8a0e3c03a33cfc38d41a95ce48ad6396 SHA512 353001d0fc0b353ebf755a8124ce045d6fce7b67bb462213d6b5b4b65231f3352e62d3895e8bd04b23e63866d64608fe902dee854261629d00d36948092538fa WHIRLPOOL 3d5e6aa943a74fa9308a24bf4d2cd66092d06e2d7f72e313fdd6212a58495c1c0c019f213d7967410dca4c6468fc79470c7d679eb466a9dd33621698ea2773c1
-MISC ChangeLog 22728 SHA256 1d063de71bdaaf1e99c3be1d8260b59bd602d5f17d417fafee52ccd78bb68872 SHA512 40fab915e56c197ae8e66d5bc0bd516cbbfac303eb56ce7bf65c4c0117559abb9c26d46d62da8be9a789f7a9a06ee288b49932fda5d4d4d0d7680311b9c3b155 WHIRLPOOL d0a72638e658e36df969c245182ac8b35348235b2418be2e78926925df2e5ce3b67b4589075f00fbb8355feead34b85d491090ac44a7d1b16f95de170d9181ff
+EBUILD qt-creator-2.7.0.ebuild 3011 SHA256 9636be8a8934cbdc72b1e21e1b33983b6ead2a2a4e5331ee5cab7dd006719a50 SHA512 deca91da2f103048bc767dd59e13301561ee69716cd31708466b02b1fe7d0cd433484727e50dd006df1a7050efa69b58b0f993d809d2fa3097c2939ba274fd0c WHIRLPOOL fcd631aa830648b657b4cfdee197afae39f9ec9e9fff75cd378f24faf6322f955e13096bf952041830598218b11157f188e894b233927841155403a691b7902e
+EBUILD qt-creator-2.7.1.ebuild 3058 SHA256 a4697596adffa0bdc4b2f73846513bfb4e7dc1fcbacbc15de52c6f66c34a910c SHA512 2af47d411ea84196a74c3d7f9fae1c3100d8ed274e7a9006e4383f5bc155384f5084e2181547f4a4298408f9a5cc7426e5b9dfa9bb1e612d9dd0db9e8eff810a WHIRLPOOL ded01d4d4589326f1e7881dc5bb7e26b33544ee844e293681851ab07fd56a248b114f1437af984857ad404057939121cfe871730c9b591fa07232b213163ab98
+MISC ChangeLog 22906 SHA256 e6dcecebddab0b49ef34e6adc39ea23e8745af4126e3ca553208d629faea6aa5 SHA512 d3c1e900f1ed4b01af0445ba61f8d9d7ce95fd984c1c67c155ad1e4d2cc19650bbbe9bb5ecd25400817ae2a8a5b8aee87dc896fa389229d4717e769348399165 WHIRLPOOL 5d5784c94273d6792d612518d82f0cb64a27e4d658aa5d36edf0faf7585d2a57b66624ef8d19af863be4acb272f4b7cc03b7f08958ad9310fb80abcdc42c58ea
 MISC metadata.xml 1495 SHA256 20db9782de0fb062604ce0dd1c99f7b0ddc4893e9c64068d404cb35754d0cec3 SHA512 bb9c1ea707a989999394c224e0f0bc99efbbaafd9d268a729f6567f5077575c98ace29a8d64576f7b40baee3c5d94d23f6f19315340fd78bd4550f9af4c0d264 WHIRLPOOL 43bb110004d664e28cd23d1f2044f16aa403948c09cc2e51a142e63a2e1ba65ce15231fa58222d8faa191b9c1fbece4a4280f4b3488e4e4c55533c0023449a16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRd5ZTAAoJELp701BxlEWfOjkP/1lSiIhVh+1hDrVIE/2HjREj
-8h7CEgUOLza8oiNGe7oxzPtTGSZelydy/qtwHijIWcnKV+05B7xOAV3gZPRTq8iC
-PzQQmXI58YboaqmzFt52Xn2KZ+L/QwMJDhi1HnmT1i6f6AioXh6cpTpv61TLs4D+
-tKtpEq0NQ3DoGOlhdTLViBBSg/jNecRomnRQVbgVOCygLJ1raENkjBllC3XEXuIg
-qULF6ovIFFq2OiR8WkUuhP9ReoQMvLzdAS4kkBfmdKq74SYEa0RZsgnKvyL1yT8u
-mLBmDh91LHorq570/eMq2kRkZ/NHi8pqKJbv1RnncwmBBXqgoJApro9W69hTChw2
-IGiaGGP3172k1Oxwb8b7VnQBkIUqRbEHy56rlbDOFaNtdiJFLg3UoF/P+O7rBRvJ
-SQUEmqfEONrgSmD/bj/PldVXnbUubOm8mUKwosmvOtiv0bzPAZFJCSP4yWsXroLw
-eRoUBVr0p44UkU0ynv3zWaBASUtlzgWt2fIk/DxMYDLMNy9EC/N4us5tfQgyICkA
-Tr1mBGlJgGmgI/5HblAn44tZuuc7qdxCB9a2XpRc3W5moIjreGERNCyjZG0QUnyi
-T+MeL0beGR5Ry5xN4o5J0iqnbjcdhTcIBBTSdycHRvzxrTIAD298l/bVNLH+bd6M
-89oxm1lCkvgvgVGlB3il
-=plcD
+iQIcBAEBCAAGBQJRrE2PAAoJENXLsxwXqFxyQNAP/i8RVrsiIwWQ7oi4JEfl7AuX
+wBSe75HkzxoECPDCBt3m4NP2fUNAJ3sR9Ir2uYAI8sWkPV4FAbL6xB9XlGmJG0Fb
+GUILyORvBMBeQgITf86/TEyl03IlNmVdroPFOd03PtrAPK1AGSqkp+qSGnqS9MqN
+rKvtw1eVh2+81FWmCrs7PCu5Grmqn9KO65jDIkxY5nIwV7GVHA6SuHykuc1J68yR
+LAjWcEgAq9niJkpXgcvfspkLL/01DpYeRxmK3Wf9nmQlilB66/abyDiMPjK7PSmA
+9vXbtQwxwz6kwghh+JqACDqBK3J3GBgo0QQLtcLFCxx3aGEnp+DKa9cyyT6hAC6a
+fM67Gl4qjqvbn7cR6LdX+nd+zG5pHO1j+TLFB10tAJMDDNeElY4dbX8PkT9qo186
+Us5D2MU3DWbW9yHOa2JcgofwM83h80MaoIhC74CvbpOjcHLkwBPiypt985QPk2wI
+0z/qNHuWy3xsFgwF6NF7+M3qiWjZS0/j0MTyqPKbBK7ld/uHKgWCzTPTlfTG6SUy
+DRJBRT8o0dCAI/MIkBnWnyme3BoNcp+LhBFG8vOJKZ9b2Xagj2HlOHuYwAYuUoX/
+anuBp1Ry7TLFJZH5UdJC1sTwBaEvIDKAUKzyfJUpKv1G89pXNhXu5CWhgDGTcftd
+fJxLmr6Wi0eY4nm2jvs8
+=5GxC
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-2.7.0.ebuild b/dev-qt/qt-creator/qt-creator-2.7.0.ebuild
index dd854305aa67..8b3465de1b1d 100644
--- a/dev-qt/qt-creator/qt-creator-2.7.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.7.0.ebuild,v 1.3 2013/04/24 08:25:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.0.ebuild,v 1.4 2013/06/03 08:01:44 pesa Exp $
 
 EAPI=5
 
@@ -19,7 +19,8 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}-src
-	SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+	[[ ${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"
 	S=${WORKDIR}/${MY_P}
 fi
 
diff --git a/dev-qt/qt-creator/qt-creator-2.7.1.ebuild b/dev-qt/qt-creator/qt-creator-2.7.1.ebuild
new file mode 100644
index 000000000000..10774068bb46
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-2.7.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 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.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
+
+EAPI=5
+
+PLOCALES="cs de es fr hu it ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n multilib qt4-r2
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
+LICENSE="LGPL-2.1"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
+		https://git.gitorious.org/${PN}/${PN}.git"
+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"
+	S=${WORKDIR}/${MY_P}
+fi
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
+	clearcase cmake:cmakeprojectmanager cvs fakevim git
+	madde mercurial perforce qnx subversion valgrind)
+IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="4.8.0:4"
+
+CDEPEND="
+	=dev-libs/botan-1.10*
+	>=dev-qt/qtcore-${QT_PV}[ssl]
+	>=dev-qt/qtdeclarative-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}[doc?]
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}
+	>=dev-qt/qtsvg-${QT_PV}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+RDEPEND="${CDEPEND}
+	>=sys-devel/gdb-7.2[python]
+	examples? ( >=dev-qt/qtdemo-${QT_PV} )
+"
+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() {
+	qt4-r2_src_prepare
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^|SUBDIRS\s+\+=)\s+plugin_${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
+}
+
+src_configure() {
+	EQMAKE4_EXCLUDE="share/qtcreator/templates/*" \
+	eqmake4 qtcreator.pro \
+		IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		TEST=$(use test && echo 1 || echo 0) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
+	cd tests/auto || die
+	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
+	emake check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		insinto /usr/share/doc/${PF}
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}