Version bump to 2.1.0

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

3 files changed, 161 insertions, 15 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 414d1424b527..78040c0805d0 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.67 2011/02/11 09:50:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.68 2011/03/01 20:41:00 hwoarang Exp $
+
+*qt-creator-2.1.0 (01 Mar 2011)
+
+  01 Mar 2011; Markos Chandras <hwoarang@gentoo.org> +qt-creator-2.1.0.ebuild:
+  Version bump to 2.1.0
 
 *qt-creator-2.1.0_rc1-r1 (11 Feb 2011)
 
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
index 073ce1a87e89..f8e201fc8f63 100644
--- a/dev-util/qt-creator/Manifest
+++ b/dev-util/qt-creator/Manifest
@@ -7,27 +7,29 @@ DIST qt-creator-1.2.1-src.zip 8631249 RMD160 6aea12a39bd5827422afa6e02cfcad2174d
 DIST qt-creator-1.3.1-src.tar.gz 10623442 RMD160 37bebc4566cfef85d5a7901c1efd8b917b3a0584 SHA1 49b61c3e8010d94d6d595fef38d3da737b26cd80 SHA256 b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
 DIST qt-creator-2.0.1-src.zip 21954080 RMD160 ac0f61a82d49fb5768331f548cdad44b48c4ca14 SHA1 367b5f148f46a31ab25342917f44992ee57a1558 SHA256 11952e2602ac1f433ad10948b6f19ebd49cdbb8115dfbd3cbe53923d6baa3f59
 DIST qt-creator-2.1.0-rc1-src.zip 26639387 RMD160 86889732ce9bf4b2c916587204c28915b5fb919d SHA1 366a0e8db3749a006ab0bc15a6b5c86a757eaff3 SHA256 77f1762c87bb70ec3146b9a5f739f7ba03f96a812f74c1f2811c0032218e38b8
+DIST qt-creator-2.1.0-src.zip 28181645 RMD160 16fdf6f03ab8ea6a567f4cd1cb58580772a9627b SHA1 f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f SHA256 a68d80f158b5e0a0faffd1a9fe7ef8afda545a970557572f5a192ecd9db0b85a
 EBUILD qt-creator-1.2.1.ebuild 2877 RMD160 416a97236be7bc7eb755e767ebf2303faf9830ec SHA1 01f6cb828301c5a805e1213a531b16f077a115c4 SHA256 77de0b2c402e7c12ee3b6309211af0a7c3d9984a3741a3646ebdebbccea92cfc
 EBUILD qt-creator-1.3.1-r1.ebuild 3512 RMD160 980433faeab74fe06ed1e09f6994f4b9611fa204 SHA1 790dcda8f70f83c652306bb4ae6f4aa882f382f9 SHA256 bd9986ca4aca5377813d040e38a1b153df2277feb33fa3038ebd83ba27cbfd29
 EBUILD qt-creator-2.0.1.ebuild 3709 RMD160 4722d7b2d381adaedb57569f03c547fa9526cbfd SHA1 3689a5f31667d8db7a7e727c865afe7252ab53ee SHA256 5e678f50361961559747f0695c8e5c067df5ad0a591108270f2df9dc99a8a50a
+EBUILD qt-creator-2.1.0.ebuild 4306 RMD160 a8f6d5eec5cc0376e1e297f3a76a823ac34f8652 SHA1 06e6d2f3bdf8c511ff34fdb430e75ba5bc1bc9c4 SHA256 601bb79945cb7dd281281fd5d22d375d555aaf04cf1013490d8441bb59326337
 EBUILD qt-creator-2.1.0_rc1-r1.ebuild 4302 RMD160 bad04c48d2d1abc91ce4dc9c10f7f60c9e7d561d SHA1 5980c347302304a0f92edaa7092acf445d657219 SHA256 7d4e75af7755b658457fb0f5fe2650f2eb551f2db78fa7e2d750056e196c92e1
 EBUILD qt-creator-2.1.0_rc1.ebuild 4249 RMD160 dfb7ad354e6ebee645ad51230f4c327cb20a400f SHA1 b64313cd07e43b89e74ddb1a243b23a8a2a851ed SHA256 08ef1eda3a8cfe1a4ee0bcc0d43143b8d4d6d362538d61cc656d073b6c9a8edb
-MISC ChangeLog 10371 RMD160 aa133c4d7a9c953c5ca7e68a686c4772a44b7ce2 SHA1 86a177608b53e06e7443f0c735fc89b424dc4621 SHA256 95649535fee58493aec3acbc288bf22ad96ca70e1b26605a69d8168772ffdae4
+MISC ChangeLog 10508 RMD160 af2257f9869e2eaca00231b9643a99ea71f60e5b SHA1 34ed7dc247c9e3cb7857e49ba1b039e9d617f75d SHA256 e1e1474ecb31c6f52e8ea642e358048e89c87539b95b6a67566353d9782cde6e
 MISC metadata.xml 1034 RMD160 ff0e30c74188440729f8a7eb6ac4edb78a58261e SHA1 96e28085ccb41904e21e54ef0a3e160bf13d0acc SHA256 9fad95b6ee7de9a1136b6e780084f2185d3fe5ce111f5d605cea5e0292da7878
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNVQZNAAoJEPqDWhW0r/LCpDoQAKUpa/HD2gc+qIJ5xOVmu+50
-bbOx7CRfedR1PXNWbj2bkICctsqDdMeHmq67hwtjZvizuJVOBwrLT5FO3A9exJg0
-jocxrNnA+z1txXMSItyy/g93pmnBRoQzsNsA/mZFbuzBcFzbkssz2gg6qW6L3fpP
-ZdS/0LkYjIY/euCnviB+Nz9/MXe0902SZQL7GN7aou9v4X7j17vk3btRBXZXLnSn
-GQKcs3QHpFXs21Yhj68lVmiv3IxXh9x7zfTsvZgh3hT8f8koPgsriXNFT4l1Xg+1
-K1+1S823hkW2p/gxiyKPPo7MhKzLPzMPPQIicN8nLVBhP0VEu7ETfV/uEQzACRWa
-VcMHGLRqfrNO4RHaCcIIoHxtNqlGqLauLvDEtgNQsuNs5pgFFU2s6fNouqn4ftfX
-grkOJ0FBoVLtMlfeIICJk/Sfv0FQonvKBhOk1/2z+JiPriW8LpIljW96eORif27K
-yQdNn0JLXbSo5aL/XVhuUswbzzNQelHkhFDknS4I/WeyJmmHjLHBITnShHj4k3rY
-K1Svdlf7hWj+Jny5yN55swxoW38ArrIT2ka/SDLNxsbiGYTpyM5mXSAHv74Hpz2v
-3y6sNvMvEkM7ovcpGAslG54V6ugu9Pv/bU4Y/zedCeQ/WYNDW/TagfBonwyxJx8B
-vhHIEaR1BSP5Y59L3aIN
-=F3gm
+iQIcBAEBCgAGBQJNbVm5AAoJEPqDWhW0r/LCLesP/0WEXJJbiF9lx+W0jp85hav+
+vn7KNIS1yqBxURCOuJR3flG4rOOAi2iZgDd6ehOgpUBQ1GKL6kVEfLlmBtibh6ei
+HtyMbfgsOZCzOPT3+omTvFm2kxUSB/jWt4t2zaIAyUQXt/5BWpDFKRjELJXg7Qwv
+lqcnTKzlVGW3S//LRe4cWo2LjGwVG82zD9vcdTG9K9MJ2+BfIY0g2upk/kUV5jtS
+rOJZJ6z7+XpuxoloxWf/IvQEfUEgo+9G3hX2ASKRH5YdtcdJr11B7cFNEWVFdFii
+eucn8nbWmP0JJEn7R0IuQ7XL7abk8a1+7UQkYQ7wIFTZZHiBSfsssNvuCRTD/sty
+/gPtcegrX3gFcKQj+/d4P0jQ9spgeSE65PN03dvvLxq/kUBqpkJL5luG7J7eXTgD
+FVwfSfB5HVXPSDWVdoUPTGUvZTguJuycZrTzBuYd1V0d8Y4KPf9QGFMP50zvs9fH
+dxGEZxgwFYPPN2lGoUCSmiqd05QiGDWD+MiLsNJiluwkdIsWxOM5qQwOAABs8NS/
+DuX2iZfukpJah+J53wh2sj3kUhde3Sdxko0ai8yxRUoVbRzz9zr3/3VETeuLC0Yk
+qWHDZ4+MYFEmYno1aWzMnUk6DOSxK9O0tfJ3K76n8cZSR+tMRnQJflvlzfu/ZQzZ
+x+aqelByX90RdO4/R5sv
+=Jogm
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qt-creator/qt-creator-2.1.0.ebuild b/dev-util/qt-creator/qt-creator-2.1.0.ebuild
new file mode 100644
index 000000000000..97164cdd5d39
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.1.0.ebuild
@@ -0,0 +1,139 @@
+# 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.1.0.ebuild,v 1.1 2011/03/01 20:41:00 hwoarang Exp $
+
+EAPI="2"
+LANGS="de es fr it ja pl ru sl"
+
+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.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bineditor bookmarks +cmake cvs debug +designer 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}
+	!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}
+	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 designer 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"
+			# Make sure that qt4project manager does NOT depend
+			# on designer
+			elif [[ ${plugin} == "designer" ]];then
+				plugin="designer"
+				sed -i -e "/designer/d" \
+					src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri \
+					|| die "failed to disable qml plugin"
+			fi
+			# Now disable the plugins
+			sed -i "/plugin_${plugin}/s:^:#:" src/plugins/plugins.pro \
+				|| die "Failed to disable ${plugin} plugin"
+			# qml needs special treatment
+			if [[ ${plugin} == "qml" ]]; then
+				# remove qml support from debugger and qt4project manager
+				sed -i -e "/^include(qml\/qml.pri)/d" \
+						src/plugins/debugger/debugger.pro \
+					-e "/qmljseditor/d" \
+						src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+					# drop all the qml plugins
+					for x in qmlprojectmanager qmljsinspector qmljseditor qmldesigner; do
+						sed -i "/plugin_${x}/s:^:#:" src/plugins/plugins.pro \
+							|| die "Failed to disable ${x} plugin"
+					done
+			fi
+		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 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} || die "Failed to install launcher"
+	emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die
+	if use doc;then
+		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_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
+}