Version bump.

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

3 files changed, 152 insertions, 15 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 9c26aafb7fa9..cb3c88216274 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.139 2012/11/09 03:57:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.140 2012/12/30 21:47:18 pesa Exp $
+
+*qt-creator-2.6.1 (30 Dec 2012)
+
+  30 Dec 2012; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.6.1.ebuild:
+  Version bump.
 
 *qt-creator-2.6.0 (09 Nov 2012)
 
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 4147e773824e..77e204dd001c 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 DIST qt-creator-2.5.2-src.tar.gz 22523588 SHA256 04521c642953fcb7a2d4011a60fdf29dca4ac1fffa8c834a21589fa390db2d4a SHA512 db9cf844c78304e6dcd1eb05df109430281eb35294c7993088d1ebab8efe56e3e9ef5d630d520822a54a35e3e1b9bfcf5fd505cac1e23020e185b8d8b85ddaf6 WHIRLPOOL b8338d8bc3c0efa951b2d06921bfd8b4a6e840ee69e404684dc9c0061b6d451b9a228905021b6aa69459a101970e1839cbd094ebc892a0cd9ad02f33729eef00
 DIST qt-creator-2.6.0-src.tar.gz 21189006 SHA256 80eee368b4dbd6fb8b647fa770f1105314272a2e096ceef365a7508329de33ed SHA512 537594737cc39cfc662789066f4539a5d90cf2ea80daf90bb018bbffe0b4ce8cc677ee60621ea475fd5589200d8dac864cfb72300af0876949b36a443827535b WHIRLPOOL 9580608ee674f539b3ed9639402b4b4b3d85ef14d1351a4d6accb2bfb8074a574241479a8a5e5d64e2507cd1b14ed55b1f5161d67d9f432420231c674de965ca
+DIST qt-creator-2.6.1-src.tar.gz 21355916 SHA256 8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215 SHA512 78063e12385167b583c20fdec9cd22dc3db4aed790c8c10db504b6a56d3b0f966e505ee999554868f344f245bcad38182f31bb72e4fd62ed8c265ae89ffe326d WHIRLPOOL 80b28ccee659b468dd8eace2371768b2771120244d16edb5686ef5ba9a970d58bc0a13e1e207e0e747ee4484eaec02588af27723d93604628c0c4688f9587ce5
 EBUILD qt-creator-2.5.2.ebuild 4377 SHA256 a16a2c5e05960313b402b4612451d1ca3c700946470b8bb3caf371ffe963782d SHA512 7dbe32cb4176c2ca397f73046465927f45a08063db4ea263fe41b39e38d79c9549b84e1899edf6f0e1e438914c857fddcc5a1a42c3f3dbd6b45fef0494b29a2f WHIRLPOOL 5ba10a0355531402e2aabc6c5f89fd29d8c32221d8d6bb0324ef450e4bd2584f05bf14f981970baf365208f444ebb86502e63c397566e4c16c54a3855ff03713
 EBUILD qt-creator-2.6.0.ebuild 3907 SHA256 684a6f7e5b6bdc5483f7ac24cbbeeece3244f4f6001f0e4c2a24aef4ff7e847a SHA512 14b09d8643554c5b4679e3b134d3fa74f8cdc778543835e7a98b8b3272198b8d783619ef3c967a89945104e2180e8cce77197628da931422719dd07f5b07d010 WHIRLPOOL 52921dfb09b5126f589175f02d10a215a4952867921a2b87ec1d8b921460953eecba23b942b05591b31ef477642882b9068e98d57c756dbd5cc36c4cb67c770d
-MISC ChangeLog 21412 SHA256 c693f72c3484dc1b9a5ccfad499913d551d1b9451dd4269687eeb05bcd96aa69 SHA512 662da9351b07d49450548fc0ef9b866f3f9d176122d226753832ed1e4c7989a721011c33c157a3bd82699c2aee21237f5635c77f6e1187d733bfa3c48f9f7ac9 WHIRLPOOL 3e7d6a91124fb319ff6e0cd6bdd65d60124aa32f2d80fa68ab73d25dffed4786e2f6f08679fa1aafbb1d768977346171d8946ad379abdbd1638ae2523c30988c
+EBUILD qt-creator-2.6.1.ebuild 3907 SHA256 d78336f30f882f51eb43894cc0ecb9c1a3ff5edc028ad0d638f744f9d6cad22e SHA512 a1f4f65e8043388f5a14b72ff4c348d285975e1c667bcb56ad472c8fe6b655d4bd0040f6a7a54fd130c251bbae4c358d8c558dd25fcad10f376e97630f19305d WHIRLPOOL 4f3f005a258490ee63a12db6d5b79573a0dc5b591dc9c8908c4186c9155c3c8c7069130202ea386a00e5c4dfbed0d935a451d59b05eb2da3b64454600f3ad7ab
+MISC ChangeLog 21538 SHA256 4ebb6417c02b10a7f68b1dd98b8e1f42aa1cabf63342617008b578f58a9c5ed0 SHA512 c2d4703028b79c5060cee1b43e116ef6937ffda29461578c643062a0bf5578b495e4f590bcdaeb8586d6dafdfe6917829cd788c95725e4a214634de0c5675cdb WHIRLPOOL 2f97403a0150814db648a6cdd1e979074a7faa55a4de9a06f66c8efb7e6a650af570cacca73ac69e5bddbd95ccf66da33c9a3d3bc5afd00f7d4876fd92348342
 MISC metadata.xml 1495 SHA256 20db9782de0fb062604ce0dd1c99f7b0ddc4893e9c64068d404cb35754d0cec3 SHA512 bb9c1ea707a989999394c224e0f0bc99efbbaafd9d268a729f6567f5077575c98ace29a8d64576f7b40baee3c5d94d23f6f19315340fd78bd4550f9af4c0d264 WHIRLPOOL 43bb110004d664e28cd23d1f2044f16aa403948c09cc2e51a142e63a2e1ba65ce15231fa58222d8faa191b9c1fbece4a4280f4b3488e4e4c55533c0023449a16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQnH8uAAoJENXLsxwXqFxyJFEQALMC3tE3lDvE0yCtu5uHvb1I
-DMFUYTSNC0YJGhFfgZa/AQnHgi6U9U6WcaBD6fVvXBST6qiaCPJmhm/ehj13AwIz
-wW5w52C5SWD/SMtb83fp60/kJhzdZi1/Z99siwVzGEMUWy9Dz11JPa392NeYY51A
-bzjl0ZKJTCulGX7qsfiLM0Fj82g4QiPY9vc5FLklujTz5Jvs/b4/iN5SXdxC0n3N
-+TbfeIaUiEwmo6MfqfprLdv8N769RQTSwXfmI8dflSBowhObeGv53LpR1jbE4LxB
-fJgbrFbjkeQarb9s+CqCbu4VRhI0Gv3c/ORESpSADiMIGYyg55Ocltv+fR56wVYb
-nTq03htav7BmIDPpMN0va5NBnjbUkx68m5Ur8VJHR5h00lZMq2IfNydQfUxwt4rx
-Vui2mGYFrjSVPfYq3AG70CFzUkLLq1u6jP3mzRiUul2HJ1gwo4iTfuZCk8mybqzm
-ZwJDd/VIHRLeqnZm5gQhCEyFFcU3ib1T9C7hn9Vkb0nhmNBaFHdzqsRuZoGMehf0
-bIvOQ+JIclIlAFvqmyvy92oT63vLS1iunveFWn3ubhF/hGA3g7DcxxzqfNHVaNJS
-qStUQzS39Nv4dSk15sXgqxwCKXAw6TrOcEW2vbISZUJroI4gV1xlrFi6U5yaTgzW
-JBlCvN7hMNICLLigY/yA
-=yv9w
+iQIcBAEBCAAGBQJQ4LZ3AAoJENXLsxwXqFxyrfQQAIn92BJ0+CJmLY57k46tGX1B
+QCaotO0OP/oMhbExOimrmqFE70PmxVOn5X+aZ0Tfk7/J8fPMn9qxvL8wr0+gwezg
+S6n70igjf49wvvWw1VoAsLSnJjX6wZ2S5Dp627zVMt1jCIKxfBLWvhf1Si/T44i2
+4T87ThqOSeqNPyKBaiUnpNmt+PVkt7UhuUpvlL0B8EIkWOebk0goaTvekvd7aMuR
+MT5t4Z0UWlO95JikExZAvMZV5ltY9NIhRqzo2aYNGdcOkHKTDy0JHCFBcX/B/slK
+7kvU5K47UJVKUvZpPddxiBVJcfi0ZHAe4QmOY80YNmgJG3SwVDP7D+2I6XxazmYo
+SZQH27yFmWcSI0tHHP4FcrsaAJ3wnmqUYvACacZXZKtUVotqjhF8iGTExkN+rbph
+lbYoaTynM5A4OVvat+MOI7xhAe6hk2xbse9iWiqN0Z4gGV58Q6fq+pvfLKa6jYP9
+Gra2u02neyH8NrbiyKQY4lhjfPU3t31OW+A1rjHnrR3cC9fudvwJwkwWWwYkkGqt
+ryBwcdBiEDn8uAs8WT495JxetVZ2dK2XaeGVxILwUym+iBzdGpawk36QCU6v8jen
+l68FeRAVQL/oJqWvQ3gDKqDKU1fl8rUXTpjuDxf5GNwSkM9LsuAINzGD3ZVYUgJC
+EivfszDhLNxpGAlTYh7F
+=++X1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.6.1.ebuild b/dev-util/qt-creator/qt-creator-2.6.1.ebuild
new file mode 100644
index 000000000000..05402f5d78d3
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.6.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.6.1.ebuild,v 1.1 2012/12/30 21:47:18 pesa Exp $
+
+EAPI=4
+
+PLOCALES="cs de fr hu ja pl ru sl zh_CN"
+
+inherit eutils flag-o-matic l10n multilib qt4-r2
+
+DESCRIPTION="Lightweight IDE for C++ 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
+	SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
+	clearcase cmake:cmakeprojectmanager cvs fakevim git
+	madde mercurial perforce qnx subversion valgrind)
+IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="4.8.0:4"
+
+CDEPEND="
+	>=x11-libs/qt-assistant-${QT_PV}[doc?]
+	>=x11-libs/qt-core-${QT_PV}[ssl]
+	>=x11-libs/qt-declarative-${QT_PV}
+	>=x11-libs/qt-gui-${QT_PV}
+	>=x11-libs/qt-script-${QT_PV}
+	>=x11-libs/qt-sql-${QT_PV}
+	>=x11-libs/qt-svg-${QT_PV}
+	debug? ( >=x11-libs/qt-test-${QT_PV} )
+	!botan-bundled? ( >=dev-libs/botan-1.10.2 )
+"
+DEPEND="${CDEPEND}
+	!botan-bundled? ( virtual/pkgconfig )
+"
+RDEPEND="${CDEPEND}
+	>=sys-devel/gdb-7.2[python]
+	examples? ( >=x11-libs/qt-demo-${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
+
+	if ! use botan-bundled; then
+		# identify system botan and pkg-config file
+		local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
+		local lib_botan=$(pkg-config --libs botan-${botan_version})
+		einfo "Major version of system's botan library to be used: ${botan_version}"
+
+		# drop bundled libBotan. Bug #383033
+		rm -rf "${S}"/src/libs/3rdparty/botan || die
+		# remove references to bundled botan
+		sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die
+		for x in testrunner parsertests modeldemo; do
+			sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die
+		done
+		sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
+		sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
+		# link to system botan
+		sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
+		sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
+		# append botan refs to compiler flags
+		append-flags $(pkg-config --cflags --libs botan-${botan_version})
+	fi
+}
+
+src_configure() {
+	eqmake4 qtcreator.pro \
+		IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=yes
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-2.*,known-issues}
+
+	# Install documentation
+	if use doc; then
+		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'
+}