[gentoo-commits] gentoo-x86 commit in dev-util/qt-creator: metadata.xml qt-creator-2.4.0-r1.ebuild ChangeLog qt-creator-2.4.0.ebuild

[Davide Pesavento (pesa)]

pesa        12/01/03 22:17:42

  Modified:             metadata.xml ChangeLog
  Added:                qt-creator-2.4.0-r1.ebuild
  Removed:              qt-creator-2.4.0.ebuild
  Log:
  Revbump with major changes: remove USE=qml and always depend on qt-declarative
  and qt-script (they're required by some core plugins); remove pointless and/or
  obsolete USE flags; add madde and valgrind USE flags; move VCS packages to
  PDEPEND; stop adding a custom rpath, the build system already takes care of
  setting it; install a better icon; other misc cleanups. Also added myself as
  maintainer.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 dev-util/qt-creator/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/metadata.xml?r1=1.13&r2=1.14

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml	2 Jan 2012 17:50:12 -0000	1.13
+++ metadata.xml	3 Jan 2012 22:17:42 -0000	1.14
@@ -6,21 +6,24 @@
 	<email>hwoarang@g.o</email>
 	<name>Markos Chandras</name>
 </maintainer>
+<maintainer>
+	<email>pesa@g.o</email>
+	<name>Davide Pesavento</name>
+</maintainer>
 <use>
-	<flag name="bazaar">Add support for bazaar version control system</flag>
-	<flag name="bineditor">enable bineditor plugin</flag>
-	<flag name="bookmarks">enable bookmarks plugin</flag>
-	<flag name="botan-bundled">Use the bundled copy of dev-libs/botan</flag>
-	<flag name="cmake">enable cmake project manager plugin</flag>
-	<flag name="designer">enable designer plugin</flag>
-	<flag name="fakevim">enable vim-like key bindings plugin</flag>
-	<flag name="git">enable git plugin</flag>
-	<flag name="mercurial">enable mercurial plugin</flag>
-	<flag name="perforce">enable perforce software configuration manager plugin</flag>
-	<flag name="qml">Simple way of building UIs based on Qt Declarative module</flag>
-	<flag name="qtscript">enable qt script editor plugin</flag>
-	<flag name="subversion">enable subversion 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>
+	<flag name="botan-bundled">Use the bundled copy of <pkg>dev-libs/botan</pkg></flag>
+	<flag name="cmake">Enable cmake project manager plugin</flag>
+	<flag name="designer">Enable Qt Designer integration</flag>
+	<flag name="fakevim">Enable support for vim-like key bindings</flag>
+	<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="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>
 </use>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>



1.105                dev-util/qt-creator/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/ChangeLog?r1=1.104&r2=1.105

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog	2 Jan 2012 17:50:12 -0000	1.104
+++ ChangeLog	3 Jan 2012 22:17:42 -0000	1.105
@@ -1,6 +1,17 @@
 # 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.104 2012/01/02 17:50:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.105 2012/01/03 22:17:42 pesa Exp $
+
+*qt-creator-2.4.0-r1 (03 Jan 2012)
+
+  03 Jan 2012; Davide Pesavento <pesa@g.o> +qt-creator-2.4.0-r1.ebuild,
+  -qt-creator-2.4.0.ebuild, metadata.xml:
+  Revbump with major changes: remove USE=qml and always depend on qt-declarative
+  and qt-script (they're required by some core plugins); remove pointless and/or
+  obsolete USE flags; add madde and valgrind USE flags; move VCS packages to
+  PDEPEND; stop adding a custom rpath, the build system already takes care of
+  setting it; install a better icon; other misc cleanups. Also added myself as
+  maintainer.
 
   02 Jan 2012; Davide Pesavento <pesa@g.o> -files/docs_gen.patch,
   -files/qt-creator-1.3.1-qt47.patch, metadata.xml:



1.1                  dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qt-creator/qt-creator-2.4.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: qt-creator-2.4.0-r1.ebuild
===================================================================
# 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.4.0-r1.ebuild,v 1.1 2012/01/03 22:17:42 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=(bazaar cmake:cmakeprojectmanager cvs fakevim
	git madde mercurial perforce subversion valgrind)
IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"

QTVER="4.7.4:4"
CDEPEND="
	>=x11-libs/qt-core-${QTVER}[private-headers(+)]
	>=x11-libs/qt-declarative-${QTVER}[private-headers(+)]
	>=x11-libs/qt-gui-${QTVER}[private-headers(+)]
	>=x11-libs/qt-script-${QTVER}[private-headers(+)]
	>=x11-libs/qt-sql-${QTVER}
	>=x11-libs/qt-svg-${QTVER}
	debug? ( >=x11-libs/qt-test-${QTVER} )
	doc? ( >=x11-libs/qt-assistant-${QTVER}[doc] )
	!botan-bundled? ( =dev-libs/botan-1.8* )
"
DEPEND="${CDEPEND}
	!botan-bundled? ( dev-util/pkgconfig )
"
RDEPEND="${CDEPEND}
	sys-devel/gdb[python]
	examples? ( >=x11-libs/qt-demo-${QTVER} )
"
PDEPEND="
	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
		ewarn
		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"
		ewarn
	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="${D%/}${EPREFIX}/usr" install

	if use doc; then
		emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
	fi

	# Install icon & desktop file
	doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die
	make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die

	# Remove unneeded translations
	local lang
	for lang in ${LANGS}; do
		if ! has ${lang} ${LINGUAS}; then
			rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
				|| eqawarn "failed to remove ${lang} translation"
		fi
	done
}