diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-09-08 14:29:41 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-09-08 14:29:41 +0000 |
| commit | 5b9b90b40d82341f357ff65254ead9d3427ad78d (patch) | |
| tree | e9efda54ed02a0160baa3695fda84969b5d3df00 /dev-util | |
| parent | Update dependency on app-misc/editor-wrapper. (diff) | |
| download | gentoo-2-5b9b90b40d82341f357ff65254ead9d3427ad78d.tar.gz gentoo-2-5b9b90b40d82341f357ff65254ead9d3427ad78d.tar.bz2 gentoo-2-5b9b90b40d82341f357ff65254ead9d3427ad78d.zip | |
Version bump. Remove old
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/qt-creator/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.3.0.ebuild (renamed from dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild) | 25 |
2 files changed, 24 insertions, 9 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index 10cd418a63ea..8a189b12bd60 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.88 2011/08/21 03:30:13 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.89 2011/09/08 14:29:41 hwoarang Exp $ + +*qt-creator-2.3.0 (08 Sep 2011) + + 08 Sep 2011; Markos Chandras <hwoarang@gentoo.org> + -qt-creator-2.3.0_beta.ebuild, +qt-creator-2.3.0.ebuild: + Version bump. Remove old 21 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> qt-creator-2.2.1.ebuild: x86 stable wrt bug #378753 diff --git a/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.3.0.ebuild index 30465a54c667..94d5b7473d88 100644 --- a/dev-util/qt-creator/qt-creator-2.3.0_beta.ebuild +++ b/dev-util/qt-creator/qt-creator-2.3.0.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.3.0.ebuild,v 1.1 2011/09/08 14:29:41 hwoarang Exp $ EAPI="4" LANGS="cs de es fr hu it ja pl ru sl uk zh_CN" @@ -19,7 +19,7 @@ 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" +QTVER="4.7.4:4" DEPEND=">=x11-libs/qt-assistant-${QTVER}[doc?] >=x11-libs/qt-sql-${QTVER} >=x11-libs/qt-svg-${QTVER} @@ -55,6 +55,11 @@ PATCHES=( 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 @@ -105,16 +110,20 @@ src_configure() { src_install() { #install wrapper - dobin bin/${MY_PN} bin/qtpromaker || die "dobin failed" + dobin bin/${MY_PN} bin/qtpromaker if use qml; then # qmlpuppet component. Bug #367383 - dobin bin/qmlpuppet || die "Failed to install qmlpuppet component" + dobin bin/qmlpuppet fi - emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets || die + emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_subtargets if use doc;then - emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs || die + emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs fi - make_desktop_entry ${MY_PN} QtCreator qtcreator_logo_48 \ + + # 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 @@ -124,7 +133,7 @@ src_install() { 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 + doins ${MY_PN}_${x}.qm fi done done |