Version bump, implement src_test().

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

3 files changed, 160 insertions, 15 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 32940ceaceec..58ed4de1bd95 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.141 2013/02/02 11:06:25 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.142 2013/02/17 01:48:21 pesa Exp $
+
+*qt-creator-2.7.0_beta (17 Feb 2013)
+
+  17 Feb 2013; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.7.0_beta.ebuild:
+  Version bump, implement src_test().
 
 *qt-creator-2.6.2 (02 Feb 2013)
 
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 9e967ce95b78..cd48e58a9338 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -4,25 +4,27 @@ Hash: SHA256
 DIST qt-creator-2.5.2-src.tar.gz 22523588 SHA256 04521c642953fcb7a2d4011a60fdf29dca4ac1fffa8c834a21589fa390db2d4a SHA512 db9cf844c78304e6dcd1eb05df109430281eb35294c7993088d1ebab8efe56e3e9ef5d630d520822a54a35e3e1b9bfcf5fd505cac1e23020e185b8d8b85ddaf6 WHIRLPOOL b8338d8bc3c0efa951b2d06921bfd8b4a6e840ee69e404684dc9c0061b6d451b9a228905021b6aa69459a101970e1839cbd094ebc892a0cd9ad02f33729eef00
 DIST qt-creator-2.6.1-src.tar.gz 21355916 SHA256 8031e81e5e81e398575dd90245defcd29eeaf60d5907861707d85f4325d3d215 SHA512 78063e12385167b583c20fdec9cd22dc3db4aed790c8c10db504b6a56d3b0f966e505ee999554868f344f245bcad38182f31bb72e4fd62ed8c265ae89ffe326d WHIRLPOOL 80b28ccee659b468dd8eace2371768b2771120244d16edb5686ef5ba9a970d58bc0a13e1e207e0e747ee4484eaec02588af27723d93604628c0c4688f9587ce5
 DIST qt-creator-2.6.2-src.tar.gz 21396937 SHA256 86165159841f2a3c41e6b80af3ed6fb6655a5194de7fe51cbf08b1539a352524 SHA512 62a8def36bd6c10c0fd44977428b518b7111229d1ca847e263d61a39bd6b51eb40c0699dbccdc96a8b8980c453d0cf9c57cd8c59054df0f24c5b5af62ea7091d WHIRLPOOL 81ba71194ca2ec13235a91214d3e22fa1440cfa5d9f9296106351f5bcbe704c324623fac0774826d0ca046299790bb9a74135baf5dc62ef55fb402b571ccb267
+DIST qt-creator-2.7.0-beta-src.tar.gz 21630612 SHA256 e7db17e14fd181b563b6779c23895e9d5b2ecdade785bc803bd6b8e7386e7768 SHA512 ea1b72a2d5bd1e68a05b693ca0dcae20154e7691d51b0e7299c071e42031db87966cc777cd151cd070ea3b10734a06ed6e0c8dcf311d44dfd08fc6333861a4c5 WHIRLPOOL 9b88e16872e6336f586966d8695238d9549567dd235a89fb802da3a77515c811bd2d8cab14fed2fe1b620a9735b18a7b5093101ecae492554337b0678b1378f3
 EBUILD qt-creator-2.5.2.ebuild 4377 SHA256 a16a2c5e05960313b402b4612451d1ca3c700946470b8bb3caf371ffe963782d SHA512 7dbe32cb4176c2ca397f73046465927f45a08063db4ea263fe41b39e38d79c9549b84e1899edf6f0e1e438914c857fddcc5a1a42c3f3dbd6b45fef0494b29a2f WHIRLPOOL 5ba10a0355531402e2aabc6c5f89fd29d8c32221d8d6bb0324ef450e4bd2584f05bf14f981970baf365208f444ebb86502e63c397566e4c16c54a3855ff03713
 EBUILD qt-creator-2.6.1.ebuild 3907 SHA256 d78336f30f882f51eb43894cc0ecb9c1a3ff5edc028ad0d638f744f9d6cad22e SHA512 a1f4f65e8043388f5a14b72ff4c348d285975e1c667bcb56ad472c8fe6b655d4bd0040f6a7a54fd130c251bbae4c358d8c558dd25fcad10f376e97630f19305d WHIRLPOOL 4f3f005a258490ee63a12db6d5b79573a0dc5b591dc9c8908c4186c9155c3c8c7069130202ea386a00e5c4dfbed0d935a451d59b05eb2da3b64454600f3ad7ab
 EBUILD qt-creator-2.6.2.ebuild 3907 SHA256 33c4001adf9093b1e15001aca890e202526c188d555dcb742dd78f8dd1ed21ea SHA512 204d423668af7b4fc7b3b544e50a6f59a12fa66d64d162c289a75e681258f7f51537f5797a51518bbf490a2f5d3a731cd67c99d85d8b8460acbfd6035575fc68 WHIRLPOOL 5d9b82117d8486a1cb99f83b5f7bfb7a08d94454019c96acbf0c785eaaad7000903141ca6df64c9da0c4ce22d66b3113e7949dc3ff61dbb25c16a232e6bca7b4
-MISC ChangeLog 21704 SHA256 d899f9ddf90d7f20649e5313d2b1b7b39e988ea5803718d02ce9efb29d56dc29 SHA512 3852d767946a5e13686c08695a4210a79751e8365c6bb237ef8873e8ae18fbad3367a79b0778d9e2740bdd904418c3aee0f13e75b3793c5c4acf40ce162797cf WHIRLPOOL ffb5aa707564434483184c32f9306f3684e5ab7865c6d678cacf73d0b3be20e2c013915b0396717ef8a4b4b7c1bcce5999f1d99629667cdac6e12c624c8e9a01
+EBUILD qt-creator-2.7.0_beta.ebuild 4102 SHA256 c5c45c2f48f35403a0e93607b0735b409a609d0deb4a8ef3ffb31ca657ce6fdf SHA512 13f805281bece62d18d8cc368381e524b13d0136b2c3feaa58cd491a51c8a3cb33ccf8a4ed6c47e190ac4a44c5a0e086fce55ae63401ff835192eb10176c4079 WHIRLPOOL 0a21610f2470ae905a87eb024e8b6c3101667586d14acace2d42a4259b20e8ac24ef348fd3fee9c98226663ccea095eca7eae4cf45f2d795e29c79ce9e63436b
+MISC ChangeLog 21862 SHA256 a39db8d235f44694466e90c9a82e19172b38ac70f4a0a547c88bbeb7899d59ba SHA512 499dda0c986b0a3668ff69b9c99c74a5786f7dbb2227aa5307ee53be7f0f1261220b551311670a5c53f4329e4893b110fcfbe34f96f46f31b8a182fdf267b4c8 WHIRLPOOL b9ffbbacb9bfed50b29040cf12be17b92f5955a4b286a6029d6b1a5aec4124e7b58ddc44a2c58f56d5d034a82ec49595d20e7de65f12206ad364dd686b1e8146
 MISC metadata.xml 1495 SHA256 20db9782de0fb062604ce0dd1c99f7b0ddc4893e9c64068d404cb35754d0cec3 SHA512 bb9c1ea707a989999394c224e0f0bc99efbbaafd9d268a729f6567f5077575c98ace29a8d64576f7b40baee3c5d94d23f6f19315340fd78bd4550f9af4c0d264 WHIRLPOOL 43bb110004d664e28cd23d1f2044f16aa403948c09cc2e51a142e63a2e1ba65ce15231fa58222d8faa191b9c1fbece4a4280f4b3488e4e4c55533c0023449a16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRDPNGAAoJENXLsxwXqFxyJmoP/i4xfayVxkORVzPXmcEgwVfh
-xYgQhlMawVRaxssxcBn/7qd1Em7E7n0CKBtSUZ6GyXREmhIKRjfd1R1NorfbzjZn
-xOqbKnJYwDaZurYuQhgCrqiVGIuxea6N5XZcyF3aANvbQxfUXvdTBn85IhGvGHbD
-w8a+Cb12+ml2K2RE5vY50adkGi311cz33jKVpFpvk2kxZMieO5K6it1V0njWMULn
-oJ6QScMvZ5vmT99ulD4aw0Ac1uJ+oAjY8COqYYDbmYMV1Cm8ZJefY6Nhcz4uceNw
-jZgU9vWIp6f4aX8lWRnZPiFdhknncBlRkHz1AqN6SXiaUEpudr+ITWOGH+qZqd5Q
-hI5+JgB9MFd3GRddTkt+ibM9yviOsmozwb0bLCySKTdHx1Qe7DvUAvakRZQQz2K6
-dOvVOJVvRRmAbF04VvMTtfycK7deZmNMmOWT1Rd9W+7z88KfCBVLha3fW0xteI2I
-M3y20j+1xUuxa6CU4PNObYlvw7eD4ucYZo/JhIgfTvDp92T2LHdZlxRLFUDoAEH3
-nwePsAgdIN4f6JMEYNsGIH1g5RnahDvRXdXX2I8vFQY3E5BlUTpT/fHYMMnRa488
-Mga8dPJ4heKsfV6ZkdmWGzkZ4u0k8V4eZxysViqtaUb81jQXR4E811RcwqrLm25E
-3WqaApx2+P9YbMhOTLDi
-=WDnT
+iQIcBAEBCAAGBQJRIDbnAAoJENXLsxwXqFxyeekP/3VUrAvAvC4hf36X+hfI/KQd
+8rZQO/S7tlB2prWfMs3asFpGqaC4SbZmYMmHui6cmtIMnbEohrigLynx7MJ9f/wj
+cpO9QpdaiIJidZcGLOj9Fh6qib7A/yyfPuJlgyYvN+uzbqW/h4v2pcB80G1ovjKx
+DjeJ4Zyjs/2dP58bwq467rxI2ePL86PVSKBQLRBZBVYR0ugvlc2RE+SIHulL9SQw
+qEmk3UKCTxL4Wz1LdaWu9oxpYuqCz9axOd7Tux7JCDsKvdaTGdfbv8MQeoLMbWBx
+SBM6n13jlTpshZkh9mOoJjeO7dbesM4jEbnNvjLZrGEK5+PJKizyhmwHbKVskXGQ
+r7emFBQMuUfcszM3K2JRjH0gcXnMrtH/JDSLwRkHEuLz8IQHQNHu7MSn7h4mJpPP
+S4KGBLySfkg8hK2VAETRCMUPm7nOHos5lY38u1xAjcxxM3E8Kok4j4wKWp2cdwwu
+JUTE5pT1rbnSOpZ5wa9e92thftdgwnT39Qfp8M5LHIS6K0bQJX1/oM52oYVQwPQt
+2xgOVQwPAA08RA1gDWa+f4uh2l+Yc7OWpCk9qPS/4RJrDUt3vIZ1g0LXBqjCVdnz
+IsqOvhEJZKYSZbM7gRi87x+0pFr6nk/JaiJBichxdEqE1fyBse9c8k2QnSSL7Ghf
+5MCJyyiVFVswtvbaoMyl
+=S7AO
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
new file mode 100644
index 000000000000..4262495b2512
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 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.7.0_beta.ebuild,v 1.1 2013/02/17 01:48:21 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 test ${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}
+	!botan-bundled? ( >=dev-libs/botan-1.10.2 )
+"
+DEPEND="${CDEPEND}
+	!botan-bundled? ( virtual/pkgconfig )
+	test? ( >=x11-libs/qt-test-${QT_PV} )
+"
+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=1 \
+		TEST=$(use test && echo 1 || echo 0)
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+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-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'
+}