Bump to 2.3.0 beta

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

3 files changed, 155 insertions, 8 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index d77646101d4a..0814e3f58d2f 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2011/07/13 14:51:51 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.85 2011/07/18 11:22:02 hwoarang Exp $
+
+*qt-creator-2.3.0_beta (18 Jul 2011)
+
+  18 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+  +qt-creator-2.3.0_beta.ebuild:
+  Bump to 2.3.0 beta
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> qt-creator-2.1.0.ebuild:
   ppc64 stable wrt #354033
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index bdee01f25487..7b8c4ab116b3 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
@@ -8,19 +8,29 @@ DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b9
 DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772a9627b SHA1 f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f SHA256 a68d80f158b5e0a0faffd1a9fe7ef8afda545a970557572f5a192ecd9db0b85a
 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-beta-src.tar.gz 26154490 RMD160 76dda4c448ef49a9d880a3ec483da7ea9d8786fa SHA1 3169a844e74c9a6bd4fa1dd1681777ab427adc5f SHA256 b35145e5165052c10c97319e8019eb1179da7d2783f6998792735594893ccc48
 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 4344 RMD160 e47a1d2100cf0cdff94d0b395c6534c8d593e663 SHA1 de6fee84b140f50f1d562d309e5e6fd5c45c3dfe SHA256 f04c62b238807dea2ba42772486c9ed8d387e8b38d858a5526aac9832a94002f
 EBUILD qt-creator-2.2.0-r1.ebuild 3908 RMD160 88645e2957ba9b7a7395696217a5be1ade69fe35 SHA1 2f89b2bb756c2525584f1ddd4266793a57cbd02c SHA256 78390a51c18f3097b92e7f65067fca3a306dfdf2aff6df7cd3d1f57f048a889f
 EBUILD qt-creator-2.2.1.ebuild 3905 RMD160 82baa842c4c7ffb3479ba154c241bb10f7f4576f SHA1 295eac2e018da7fce1e7ae1a99de52e76eea2748 SHA256 87ac7a21b888fc97f135b527447fac38ed4a04fa3d2733c2ab6a9dab2159b9a7
-MISC ChangeLog 13070 RMD160 9b12005302d81fab94244f0dc7e7cfcd2eb2625e SHA1 2f7da540f5398e89d381284841db96009f92f0fd SHA256 33ea8c583b2cbbc2498d51035e80137ceab40a1e7952039d70d45e5b93f2565e
+EBUILD qt-creator-2.3.0_beta.ebuild 3918 RMD160 f5ca80672cf8e179faec819e5f6097f2d830f39f SHA1 6882427229bd141a827430e9c24001ddb5290ca6 SHA256 a71f3c06ec466baf66360d5b79a7ff07ed848120133e9fff5e3565de3124a704
+MISC ChangeLog 13214 RMD160 2fb9c2b3663f97d917e677a233c69d451f02f6eb SHA1 13070d5c3692fa7a349298b40ef8182f73c6e8aa SHA256 6ab50a7bb89317d0d60b6a0efa78624c4ff37168a78bcf6fd704133db52c19e7
 MISC metadata.xml 1055 RMD160 2558de2f781c71d62f3bab0b834061b387c53268 SHA1 910e7b7e9dd15d58466ed8b03df9a3517ebd29fe SHA256 3f5113d61793395503ae99bc78f22da14f012471bda3f99ac9c3d56c33a6800b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4dsQ0ACgkQIiMqcbOVdxS1OAP/QQM9tVqvL0An3HR/eZWo6BFV
-ht5RhlxPzfFiUa2ffzPmt7rvht9qCCBokWWhDI4I9+5zVKIk449F6cW6Lw0uEgH/
-nX28NSH6Q01IEKgNNqLz0uol8bwTtjGMBwTGK+3gk9/fbwkqESj6DI8u9vBoPaKE
-anAmmuAU2c/IIqnH3c0=
-=9Xaa
+iQIcBAEBCgAGBQJOJBdaAAoJEPqDWhW0r/LC0BoP/iLkso99ViBIFCcLxNb20gxp
++dkCOUNbFJ7zdaN0Oo/e7BwDW14YyTkCueTxJl0K/BqdSqyVi0lzbkuEIFVcTwzA
+C01Wy1C2DOyOFp9JDBkKLITa6DIrZfymxwlf0RJhfoej2GChKoTgpIMV5HPQVr3X
+gpu5P//8el76NtYSN6o0cvF2QNOJeIubpigXVj7KTPmxh+pk/qy4mwcjkjp8XwV4
+kQSZ6POqPnmgFHRvsKfb9AQ+iy5RUgXkTpkQlWvbGMWL7r2B54CayfRCefnzMRtH
+6VxbeZ9h8kUA6rM3bj/KEmNWYKKRlKESjAJGY4biw7icydZWg8jhobqHXsrFsT7y
+fI29ClXcB4sRsqVL6pvu2j7uZWbCb0FuTzMEXwPPaHPGlWo0J/M478k2pEffsmMY
+YH+iJHdCMGM3EFovMIe6a1FTFqg8Tg4Ahw0+4hakySqK5qeYMoND1neg7qA3Dmfw
+3+m9dOrtup+RVlPo8AX3ruVltOgroWkXuXf20a80qxVt1WdZOxI9oyIumNH8Ny9e
+yNj/QlqM4Q0vDW/EPWMCL6oaJ+NI7J4mRzLw8CvjbZjYSUuhbBDHUoukEG0lHMeS
+N27mF6b1ej9eaZLSMjcvkEpuSWos13NEbXfFZOCiPllfuFwUO99lowy3YZcoXe1s
+/I5/6D5ti7TqB5G9KZle
+=c1yg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild
new file mode 100644
index 000000000000..30465a54c667
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild
@@ -0,0 +1,131 @@
+# 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.0_beta.ebuild,v 1.1 2011/07/18 11:22:02 hwoarang Exp $
+
+EAPI="4"
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit qt4-r2 multilib
+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 +cmake cvs debug doc examples fakevim git
+	mercurial perforce +qml qtscript rss subversion"
+QTVER="4.7.1:4"
+DEPEND=">=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} )"
+
+RDEPEND="${DEPEND}
+	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
+
+	# 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
+}
+
+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 || die "dobin failed"
+	if use qml; then
+		# qmlpuppet component. Bug #367383
+		dobin bin/qmlpuppet || die "Failed to install qmlpuppet component"
+	fi
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs || die
+	fi
+	make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \
+		'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 || die
+			fi
+		done
+	done
+}