Version bump. Always use system botan.

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

3 files changed, 37 insertions, 56 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 0838b3a89a13..543606e6c777 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.3 2013/03/08 08:21:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.4 2013/03/08 09:24:01 pesa Exp $
+
+*qt-creator-2.7.0_rc (08 Mar 2013)
+
+  08 Mar 2013; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.7.0_rc.ebuild,
+  -qt-creator-2.7.0_beta.ebuild:
+  Version bump. Always use system botan.
 
   08 Mar 2013; Davide Pesavento <pesa@gentoo.org> -qt-creator-2.6.1.ebuild:
   Remove old.
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e9dbd31c9dfa..4681428a48db 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -3,26 +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.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
+DIST qt-creator-2.7.0-rc-src.tar.gz 22258938 SHA256 d67a0f9dd08c04f2b00c2a0a43a105ce64fdc1b24e45eb4d57e50b66bdd9fa69 SHA512 3775b6ad1c6f4ee10d75a91700c7c4d92745d6f264a56274f55faa062c6a1a56bb864d8049da4da3067a843986ff9b5957c39a584f259c06a6782d578a94ffa5 WHIRLPOOL eb7904aad64ea849dc0f1f1f9a2a01e193ad7b05ba27c0570f929b8a8568583ce60a05cbeda9276e34167747bdc4d233c31552c18c77e069eb18d8d92d061ac8
 EBUILD qt-creator-2.5.2.ebuild 4345 SHA256 3255eedfa9f293b5bc5ce205f75c527f8751a1750ec33e033fe7c7e29779ad9e SHA512 c3ad18cb06214dde938745f86ed6a4bb4d0ee0909746fb183bd46ffffd171cfb428d9985f78385a405dbd68caf0ff57f95c9a972228420554b2c6e5d40627983 WHIRLPOOL 1fe443ea4c2b7e37cb4b4a4ffab2144d99947ea489f5e28b9d99d7c5ee64b33512fdd1c0eb503b4b4c956110f7615a98c1b2c4a8ced0d1b79ee57be9a2a70d7e
 EBUILD qt-creator-2.6.2.ebuild 3871 SHA256 591f425d98492e200c5644178cfbc9a33b281cc643124707503fdf7399c89ed6 SHA512 1cf8ac48ce2ea82b78a147dc6a020b3055ab1f714d89016bce619abaeace1106d1816f7e2cb2cde660d4ad7ce9c2df8d502e54b941a7bebd097082e52c657a65 WHIRLPOOL 17b9b13597ebdbc65bdc1468101d535c2dbc25d9cf1677f530852382563aa079f2cfd7160e908f7ab97b2d99c67141f2642fe490152a3dcf46e466a13aaf8a4c
-EBUILD qt-creator-2.7.0_beta.ebuild 4070 SHA256 927e8ac4c4cb0890c26f77f237ffb815069ce638018b0cefa7469a7fe443f36f SHA512 d9006f22e65c68249f07784c70948aa3805954b3e9bae3cd7a16662974968781c8fb0df0a1695578fec0eceab74fa57d9d02c934d43bc9f2e37cae6c85d4d85f WHIRLPOOL 859016ad8a1b5a5e3a19b5aff45a3dd147514ea9ebdfc8cb780af3e939636b654a12a8ef7577a079fb7a41680af89dfd733e88489c956dc9e6452c483e435e45
-MISC ChangeLog 22058 SHA256 5bfe970081bb0167e6b93e517443243427fd0dea63e35f1d6558686606cd2b35 SHA512 e7403d47df4792cb66c00e6d77ab67163621c6f444dcd0c2fc10d53268dcd2a7d20894f3b3f866c8c64c9be6ddf9e9e8bfee6e2d1a40755eee038cb5fb75a74d WHIRLPOOL 2af2dec118a087e553f78283e8c48a1e724f0bd76a5c8bcf8a47266120a72c014a0294edadd66e66d86951a167054f54d62b5a7cc1c4c2dcf60f454ec5dd0c26
+EBUILD qt-creator-2.7.0_rc.ebuild 2912 SHA256 47c64d0058271c25aa90b24862ce3663450dba14c64e9cf2d2f6413bef42db82 SHA512 f7b3d1d7f4eedeb01ea71fd3184b266cfe13aab9033b1a279f63d929cad8c2681adf4297b613bd712b38184b90d8eace7b8c19f7a1b738f3f945b53cacb90219 WHIRLPOOL 6558f4138e4d86793c56d27196b7b55fa9ad7d0b3a9e403e65aa17ab32e8c8d8258a32ce577f37da4d62ac7adaee8e4710144cfc2647a669ecaa554033e2550e
+MISC ChangeLog 22248 SHA256 d69c67ce4c9492ef473cd4eb6b816f01cb683ad7cfcc8e75ee767af18f7f9245 SHA512 89bd994694571ae5acd6d9416dc5ca954b8753c9d958f3f26ecf9ab9159744665fbeff2aa90a7b3f3e6778417989760b66e610176148eb88abcba45481a3bee6 WHIRLPOOL a70b821c751881eed71750e52156c20fa0ff0e41a123208e9b0aac4683f141edd7a6de0f79e7e93a77560adf65d55c1dccadb6e902f97c70c48bb03ec0711f7b
 MISC metadata.xml 1495 SHA256 20db9782de0fb062604ce0dd1c99f7b0ddc4893e9c64068d404cb35754d0cec3 SHA512 bb9c1ea707a989999394c224e0f0bc99efbbaafd9d268a729f6567f5077575c98ace29a8d64576f7b40baee3c5d94d23f6f19315340fd78bd4550f9af4c0d264 WHIRLPOOL 43bb110004d664e28cd23d1f2044f16aa403948c09cc2e51a142e63a2e1ba65ce15231fa58222d8faa191b9c1fbece4a4280f4b3488e4e4c55533c0023449a16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJROZ+nAAoJENXLsxwXqFxyo8sP+QFvxSmUsqc7tT8ewYW8YWQm
-IHB3brMhd0gh2zsevJdc7JklV3u0qh75EMSCP4pR6SGOjpN3A6f2eCfDG/gD8uPN
-wFgVEoFuZ/ewu0BX02h/D4MXCml3MylGqBPA2gfHaiZ78Wu8xCaEzMuPhZrfOaU9
-VpPRRJ4iJlJQstFWJj1oL1J5fAsWBz8lvOwJ3IHRQXa44dAtWQBp7WkCixzKISS6
-O0vlGZzh7oZez2EYZpMz/J07zLG17Xu7vBNM+ahO6d3DyFYkrwo4iUb8XVskBY/r
-d6p6XzzznoyxkJJP5YfW7Zgthdf0TGjdVvfKh/fOg6hH4YX0QLD9I+WFPQRDDWns
-NeWJ+ZLe0lPOcHqXu7XaEp68QQE+GT92b5gPrNGOZ9Ru7nbBvXZoekcaF4Jf3TtU
-Qk3slEm2bbK5tUD8Yos77rIWQCkBhx/q3nCFY7HYU3Udk5YPgDb2TgbtiBkxKWhr
-R6s1df0hG2ZvyPHTi52hle5eEcNzc9pNWXamXR2seWo5Eh+ygziwOGEB+u6ms4kY
-TaDPXPfHRALwQaZiDGwkPBJmc5AJF3UaN5aJXR1RASIjM51ci9Ku2MYjE7pBiExK
-rzJACmzwKgLOuppoeHi0XWfA2A2gchjJgejScHmmWedG8eSzp2epfwFxNFEwXWnd
-0khamMWwPYUYcTkpsioo
-=SGph
+iQIcBAEBCAAGBQJROa41AAoJENXLsxwXqFxyn/wQALjA1qBTHasTvqigaqF+l3ke
+IH2ULliCxxNqs9xiV3zlARWAYJ20xb+3Yu0G1NiOYhMrgIThIVIuAPK9MEn1T0re
+UORZciV/cBantE1pzK8bWDjIxARAArFGohZhzA+LTKwVQ0lCx4wInmXv+A81s+Ii
+zDEMwUdvsOpVQaPVrSfN8Z/z+65Bc1h6iAQ78IyXj5eY5e4CtogzkUWcK4r/45Rs
+jiqWmhx3eNc/Rzia1PAmmP3nASG7joGXvFlp98XqHnWa94W5LvlQK+Um3KYLQHk8
+ZZmlTzzJlz0Aq2LqvXR1WH7x7HXzyTFwJlVWsdAI+lB3CAN6oZ/ILbbzwW4bLPE5
+8WbpCgvsfxbaxOO5nGBNrhM3IATx1r1jFfOOXf0o20RHYx2+1H7gEJqhYKnoZ27D
+EFAG2EaWrfrfCDBQAzxhm1JmYp0PXKvKsSlres47fF98+2IxGsFOBxBqDlC1Th4j
+wJKfUzXmnbmH4iFttMIZxoCsLfarEC+VMqKG484rnhU/j9fRSgUmKhNQD6YhJVeq
+S7zDIj3cCguOBnIPoOabduZezkD71F+CJs992DZlsFGYqVGcKtYLv4xaKU1tB1lI
+rsZXmQ/2mOh+pNZs9aXDNEfmjC1QpVn6bh7U9PhpO+rQH/SbLzLAhY1WUoui1tCb
+ezGUJBqZVuKHY+ndPfs4
+=9roD
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-2.7.0_beta.ebuild b/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild
index aeb4e8dc079a..d5bac6f7244f 100644
--- a/dev-qt/qt-creator/qt-creator-2.7.0_beta.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild
@@ -1,14 +1,14 @@
 # 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_beta.ebuild,v 1.1 2013/03/02 15:24:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild,v 1.1 2013/03/08 09:24:01 pesa Exp $
 
-EAPI=4
+EAPI=5
 
-PLOCALES="cs de fr hu ja pl ru sl zh_CN"
+PLOCALES="cs de es fr hu it ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils flag-o-matic l10n multilib qt4-r2
+inherit eutils l10n multilib qt4-r2
 
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
 LICENSE="LGPL-2.1"
 
@@ -29,23 +29,23 @@ 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[@]%:*}"
+IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="4.8.0:4"
 
 CDEPEND="
-	>=dev-qt/qthelp-${QT_PV}[doc?]
+	=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}
-	!botan-bundled? ( >=dev-libs/botan-1.10.2 )
 "
 DEPEND="${CDEPEND}
-	!botan-bundled? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
 RDEPEND="${CDEPEND}
@@ -78,40 +78,14 @@ src_prepare() {
 	# 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
+		TEST=$(use test && echo 1 || echo 0) \
+		USE_SYSTEM_BOTAN=1
 }
 
 src_test() {
@@ -126,13 +100,14 @@ src_install() {
 
 	dodoc dist/{changes-2.*,known-issues}
 
-	# Install documentation
+	# 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
+	# install desktop file
 	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
 }