Version bump.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 147 insertions, 2 deletions

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 598c9e3b47fc..83b12713fd17 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.110 2012/03/17 10:59:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.111 2012/03/17 14:40:35 pesa Exp $
+
+*qt-creator-2.5.0_beta (17 Mar 2012)
+
+  17 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qt-creator-2.5.0_beta.ebuild,
+  metadata.xml:
+  Version bump.
 
   17 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-creator-2.4.1.ebuild:
   Add missing 'docompress -x' call wrt bug 408129 by Jaak Ristioja
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 2084e7195e60..77288bcd8380 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -11,6 +11,7 @@
 	<name>Davide Pesavento</name>
 </maintainer>
 <use>
+	<flag name="autotools">Enable autotools project manager plugin</flag>
 	<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 	<flag name="bineditor">Enable bineditor plugin</flag>
 	<flag name="bookmarks">Enable bookmarks plugin</flag>
@@ -21,7 +22,7 @@
 	<flag name="git">Add support for <pkg>dev-vcs/git</pkg> version control system</flag>
 	<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
 	<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
-	<flag name="perforce">Enable perforce software configuration manager plugin</flag>
+	<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 	<flag name="qml">Build QML support and many other QML-related tools (recommended)</flag>
 	<flag name="qtscript">Enable QtScript editor plugin</flag>
 	<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
diff --git a/dev-util/qt-creator/qt-creator-2.5.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.5.0_beta.ebuild
new file mode 100644
index 000000000000..48d3b78b0b1f
--- /dev/null
+++ b/dev-util/qt-creator/qt-creator-2.5.0_beta.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2012 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.5.0_beta.ebuild,v 1.1 2012/03/17 14:40:35 pesa Exp $
+
+EAPI=4
+
+LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+
+inherit multilib eutils flag-o-matic qt4-r2
+
+MY_P=${PN}-${PV/_/-}-src
+
+DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+QTC_PLUGINS=(autotools:autotoolsprojectmanager bazaar cmake:cmakeprojectmanager
+	cvs fakevim git madde mercurial perforce subversion valgrind)
+IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
+
+QT_PV="4.7.4:4"
+
+CDEPEND="
+	>=x11-libs/qt-assistant-${QT_PV}[doc?]
+	>=x11-libs/qt-core-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-declarative-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-gui-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-script-${QT_PV}[private-headers(+)]
+	>=x11-libs/qt-sql-${QT_PV}
+	>=x11-libs/qt-svg-${QT_PV}
+	debug? ( >=x11-libs/qt-test-${QT_PV} )
+	!botan-bundled? ( =dev-libs/botan-1.8* )
+"
+DEPEND="${CDEPEND}
+	!botan-bundled? ( dev-util/pkgconfig )
+"
+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 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+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 -e "/^[[:space:]]\+plugin_${plugin#*:}/d" src/plugins/plugins.pro \
+				|| die "failed to disable ${plugin} plugin"
+		fi
+	done
+
+	if use perforce; then
+		echo
+		ewarn "You have enabled the perforce plugin."
+		ewarn "In order to use it, you need to manually download the perforce client from"
+		ewarn "  http://www.perforce.com/perforce/downloads/index.html"
+		echo
+	fi
+
+	# fix translations
+	sed -i -e "/^LANGUAGES/s:=.*:= ${LANGS}:" \
+		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=true
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	# 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 icon & desktop file
+	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png
+	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE'
+
+	# Remove unneeded translations
+	local lang
+	for lang in ${LANGS}; do
+		if ! has ${lang} ${LINGUAS}; then
+			rm "${ED}"usr/share/qtcreator/translations/qtcreator_${lang}.qm \
+				|| eqawarn "Failed to remove ${lang} translation"
+		fi
+	done
+}