Version bump

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

3 files changed, 190 insertions, 6 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 619cab472cb4..a336febaa118 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.92 2011/09/29 00:11:00 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.93 2011/10/01 14:36:20 hwoarang Exp $
+
+*qt-creator-2.3.1 (01 Oct 2011)
+
+  01 Oct 2011; Markos Chandras <hwoarang@gentoo.org> +qt-creator-2.3.1.ebuild:
+  Version bump
 
 *qt-creator-2.3.0-r2 (29 Sep 2011)
 
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 45d019251599..08cc8cbf802c 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX docs_gen.patch 603 RMD160 9711ddb1c59e8ddd1ad17ba34f89c8e4c89b4504 SHA1 83cd745baabd1545a1079c59edef6279b254074a SHA256 7428155e6f09201d60f308c3934153aa5fa5b25296a96d86dad80354dc8e3b93
 AUX qt-creator-1.3.1-qt47.patch 415 RMD160 c1006214dd399baf8c996e4d51801c8a8c544ccb SHA1 3434e72a399808c77e34722ad5c69e2cbc9f6a62 SHA256 9dc1ec786ed9d329d81228f031e94b867165947b8af9ed16082e1c69a830343f
@@ -9,6 +9,7 @@ DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772
 DIST qt-creator-2.2.0-src.zip 29849268 RMD160 d71a15f88b5dfd489189ba235b89e3d0ab916b30 SHA1 d6ee517ce6b045ad3172b50c39b58b43f131c66b SHA256 a5f9b204fe9005c8abb84955f01cfbb3603f032fdda87bbbb3c78041aba4849b
 DIST qt-creator-2.2.1-src.zip 29975538 RMD160 dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100 SHA1 6a369dffa7ee52ae068d9ebb3616e29d185a5009 SHA256 7fa583e8363c88334847fe5487341c4e8e22172902f4e627254b22d15cd12eb7
 DIST qt-creator-2.3.0-src.tar.gz 26613891 RMD160 22b606ad15629a8e540a7a4ead1dcd62ab3dc72f SHA1 8fc14416b3f0f1fbb0e604d22142100bd475773f SHA256 45f195c2439d7146709295ca9f8117b1b917a1af3ba19219ed22d242c048433d
+DIST qt-creator-2.3.1-src.tar.gz 26820259 RMD160 06cdd661954a72125a5a6a7c75a293338c2df6c4 SHA1 620fe944994fffe0812a1474deff78e07b34025b SHA256 e9d25f5d8d489b44300a68f446ad30d2f9259f1d27c7e8e1ac7bb145772d481a
 EBUILD qt-creator-1.3.1-r1.ebuild 3510 RMD160 15f79ad9b3d95aa13391886552b41d36371a3a3c SHA1 46e954722ae1ef344750bede58070dae01ae8da2 SHA256 e56fb33e79a44ad557e18a5843b67ffe93ac1d45d5c9f9bb71fb5d16b24afddb
 EBUILD qt-creator-1.3.1-r2.ebuild 3594 RMD160 c1813c51ae773ea77fc39b6e0fc4edac9ab7a467 SHA1 807387b02e547a29587378b79f8c027959a533cf SHA256 66183247bb735614578ca42a83cdc603561b600dad7eba8a8db95842932abd7c
 EBUILD qt-creator-2.1.0.ebuild 4358 RMD160 92eb6b55c89cf4fb90c01b7b6059c5b672aab8a9 SHA1 7a3eea0e523ddd28033649b04b181bd5ca822c38 SHA256 2c54c3eda44c41a5c51e7eb11d5bad5e269d474fe71c7670d849435231158b0b
@@ -16,12 +17,23 @@ EBUILD qt-creator-2.2.0-r1.ebuild 3924 RMD160 72bab0d56e26ab107ddcf2da996aca9a5a
 EBUILD qt-creator-2.2.1.ebuild 3921 RMD160 6defad916e217b880ba6c0e02fc933737c13f82f SHA1 672aa8b5a94411389dcdbb0f12209c65c949706b SHA256 005d09049b744bda5247f650bc36639c659e87b6f97f1412f0828ac0a3e8a8f7
 EBUILD qt-creator-2.3.0-r2.ebuild 5411 RMD160 e56a81a92e0753a99fc49adfd6983ba0ac42a9a7 SHA1 9457b2145800968dbb1fd50b273fd299b84c4363 SHA256 585c13b658f33b39263df940f3ab5aa7c1e9527bc58149b00ab1b66df584b2ea
 EBUILD qt-creator-2.3.0.ebuild 4169 RMD160 a144421f85e1aa0fa51094da69fbbc6db9975d53 SHA1 746ca8b8a5972dc6d676b9dd6d093c951056a3ae SHA256 13469831ac43199d9703bd09e6b5b6cd38b949e28d6140763b1ba322c5438f9a
-MISC ChangeLog 14411 RMD160 94deb682a36f618643b1ea22a76f6607f3b4b287 SHA1 17ffdf1c1f1438d76917408cb073975ba134cffb SHA256 6eb3fd3399a97646e467744b0b8dab4c32dc42dee05d894b073af04319495656
+EBUILD qt-creator-2.3.1.ebuild 5408 RMD160 be4a987b637c352bdf6bc25406417fd3674054e9 SHA1 407070f8a21bb9ded9625d65aae4aa4b5fdb32b3 SHA256 01bfac27a612ae433b949bb9aaee38c4e5e8b43c78b9ffb3dbdb3a5436ea5568
+MISC ChangeLog 14539 RMD160 0b1823f3c7f69c268e9e5613ba8cf103abd11df4 SHA1 9fd3e3f65cf075ba8dd38a486a6f925392babdc4 SHA256 2d4f9bf0d338f2a1b036546dbabdffb61492a7015fa858c52b913c490e8f6c19
 MISC metadata.xml 1182 RMD160 a3d34a17f3bc9f9e78828e001b5039ce0b513914 SHA1 d5e53ca653574a332a644abe72021372ef10cf0a SHA256 151feaa82fdd12a111412f4223cc29312d76fa35f8a039df46d764f090b7b2ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6Dt5oACgkQsiLx3HvNzgfRxwCdHmFkrBaVTVhehDovoLU7lTOQ
-SD4An2+stDjHzNfI6iBIfBxZWIbRnnNV
-=zFtK
+iQIcBAEBCgAGBQJOhyVhAAoJEPqDWhW0r/LCVfYP/iSAAuy90tO4BvR/mhruw4h4
+JHvAInDSkTr6yH08LCLmBHtITOlKLLxFCfeL5EnJHKX5GGD68+Xnkh+CT1PiOgDt
+2Hlea9UUuYhUnDbjNInpuZWg76vHv3BoHXKGZZnbgRPqlmBooDiW9xZJnPXXdyf6
+5lfr0KCNK64Kc6u+0LqDWA1En+51iNiIsa8TIxr3z9yv0SrdfIKwIDxJ3Bq5y0Ed
+d42wM0nakhsatlcHa08ICPQy7tjpQI76L5lztVMHTVdo6D7VVo24cPMEqj84YpvN
+xSk7p9wOPOgcLfRWN1Y6IzxeUJdzsJi+ij2rMb4/VZfk4NeNmm43xkyjfFnvasAA
+PnWXwbQH48RxigNdif4/SrKQLzGcD64G9YqZEq0wPXl7HqJB6hTjZl0wrJWP7MIQ
+gqJgAgFau2GVvfcOifqqveYt60C33UJr9T6gPu3d7Ro5X4Uc+Ef7uNZs6t64m4Hl
+GyqWEImpxQ02WKdHPRp8yZfxbm8mw5vl+4B56DFJ317/9P617RFzUiRWS9voSfnT
+eiKHBYIBiwpKys/rAVK7nqZ3H0xOlIto8ien7FWGobQgy5ZZx0FUBLDFGNbDrvhV
+fA9Pfnho7vXE5EiiMfJ2ljZdrq2raY8caGliKbJ0kDJPWXbEa14AMeA0v1zC6XPl
+H8pxRugWEW+HFqZCbHPO
+=sOu+
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.3.1.ebuild b/dev-util/qt-creator/qt-creator-2.3.1.ebuild
new file mode 100644
index 000000000000..d5653eafc847
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.3.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2011 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.3.1.ebuild,v 1.1 2011/10/01 14:36:20 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit qt4-r2 multilib flag-o-matic versionator
+MY_PN="${PN/-/}"
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+SRC_URI="http://get.qt.nokia.com/${MY_PN}/${MY_P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bazaar bineditor bookmarks +botan-bundled +cmake cvs debug doc examples fakevim git
+	mercurial perforce +qml qtscript rss subversion"
+QTVER="4.7.4:4"
+CDEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?]
+	>=x11-libs/qt-sql-${QTVER}
+	>=x11-libs/qt-svg-${QTVER}
+	debug? ( >=x11-libs/qt-test-${QTVER} )
+	!qml? ( >=x11-libs/qt-gui-${QTVER} )
+	qml? (
+		>=x11-libs/qt-declarative-${QTVER}[private-headers]
+		>=x11-libs/qt-core-${QTVER}[private-headers]
+		>=x11-libs/qt-gui-${QTVER}[private-headers]
+		>=x11-libs/qt-script-${QTVER}[private-headers]
+	)
+	qtscript? ( >=x11-libs/qt-script-${QTVER} )
+	!botan-bundled? ( =dev-libs/botan-1.8* )"
+
+DEPEND="${CDEPEND}
+	!botan-bundled? ( dev-util/pkgconfig )"
+
+RDEPEND="${CDEPEND}
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	sys-devel/gdb
+	examples? ( >=x11-libs/qt-demo-${QTVER} )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )"
+
+PLUGINS="bookmarks bineditor cmake cvs fakevim git mercurial
+perforce qml qtscript subversion"
+
+S="${WORKDIR}"/"${MY_P}"-src
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0_rc1-qml-plugin.patch
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# fix library path for styleplugin
+	sed -i -e "/target.path/s:lib:$(get_libdir):" \
+		"${S}"/src/libs/qtcomponents/styleitem/styleitem.pro \
+		|| die "Failed to fix multilib dir for styleplugin"
+
+	# bug 263087
+	for plugin in ${PLUGINS}; do
+		if ! use ${plugin}; then
+			einfo "Disabling ${plugin} support"
+			if [[ ${plugin} == "cmake" ]]; then
+				plugin="cmakeprojectmanager"
+			elif [[ ${plugin} == "qtscript" ]]; then
+				plugin="qtscripteditor"
+			elif [[ ${plugin} ==  "qml" ]]; then
+				for x in qmlprojectmanager qmljsinspector qmljseditor qmljstools qmldesigner; do
+					einfo "Disabling ${x} support"
+					sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
+						|| die "Failed to disable ${x} plugin"
+					done
+			fi
+			# Now disable the plugins
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro
+		fi
+	done
+
+	if use perforce; then
+		ewarn
+		ewarn "You have enabled perforce plugin."
+		ewarn "In order to use it, you need to manually"
+		ewarn "download the perforce client from http://www.perforce.com/perforce/downloads/index.html"
+		ewarn
+	fi
+	# disable rss news on startup ( bug #302978 )
+	if ! use rss; then
+		einfo "Disabling RSS welcome news"
+		sed -i "/m_rssFetcher->fetch/s:^:\/\/:" \
+			src/plugins/welcome/communitywelcomepagewidget.cpp || die
+	fi
+
+	# add rpath to make qtcreator actual find its *own* plugins
+	sed -i "/^LIBS/s:+=:& -Wl,-rpath,/usr/$(get_libdir)/${MY_PN} :" qtcreator.pri || 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}"/${MY_PN}.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() {
+	#the path must NOT be empty
+	local qtheaders="False"
+	use qml && qtheaders="/usr/include/qt4/"
+	eqmake4 \
+		${MY_PN}.pro \
+		IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		QT_PRIVATE_HEADERS=${qtheaders}
+}
+
+src_install() {
+	#install wrapper
+	dobin bin/${MY_PN} bin/qtpromaker
+	if use qml; then
+		# qmlpuppet component. Bug #367383
+		dobin bin/qmlpuppet
+	fi
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs
+	fi
+
+	# Install missing icon
+	doicon "${S}"/share/qtcreator/templates/wizards/qtcreatorplugin/${MY_PN}_logo_24.png \
+		|| die "failed to install icon"
+	make_desktop_entry ${MY_PN} "Qt Creator" ${MY_PN}_logo_24 \
+		'Qt;Development;IDE' || die
+
+	# install additional translations
+	insinto /usr/share/${MY_PN}/translations/
+	for x in ${LINGUAS}; do
+		for lang in ${LANGS}; do
+			if [[ ${x} == ${lang} ]]; then
+				cd "${S}"/share/${MY_PN}/translations
+				lrelease ${MY_PN}_${x}.ts -qm ${MY_PN}_${x}.qm || die
+				doins ${MY_PN}_${x}.qm
+			fi
+		done
+	done
+}