pesa        15/01/18 04:56:40

  Modified:             metadata.xml qt-creator-3.2.2.ebuild
                        qt-creator-2.8.1.ebuild ChangeLog
  Added:                qt-creator-3.3.0.ebuild
  Log:
  Version bump (bug 528436).
  Build against Qt5 as now required by upstream, thanks to Paweł Stankowski in 
bug 479638 for the initial patch.
  Add support for qbs and winrt plugins (bug 476256).
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.11                 dev-qt/qt-creator/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml        8 Jan 2015 22:32:11 -0000       1.10
+++ metadata.xml        18 Jan 2015 04:56:40 -0000      1.11
@@ -20,8 +20,10 @@
        <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> 
version control system</flag>
        <flag name="perforce">Add support for Perforce version control system 
(requires manual installation of Perforce client)</flag>
        <flag name="python">Enable Python source code editor</flag>
+       <flag name="qbs">Enable QBS project manager plugin</flag>
        <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
        <flag name="valgrind">Add support for memory debugging using 
<pkg>dev-util/valgrind</pkg></flag>
+       <flag name="winrt">Build plugin for WinRT devices</flag>
 </use>
 <upstream>
        <bugs-to>https://bugreports.qt.io/</bugs-to>



1.3                  dev-qt/qt-creator/qt-creator-3.2.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild?r1=1.2&r2=1.3

Index: qt-creator-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-creator-3.2.2.ebuild     7 Nov 2014 01:59:17 -0000       1.2
+++ qt-creator-3.2.2.ebuild     18 Jan 2015 04:56:40 -0000      1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 
1.2 2014/11/07 01:59:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 
1.3 2015/01/18 04:56:40 pesa Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@
        MY_PV=${PV/_/-}
        MY_P=${PN}-opensource-src-${MY_PV}
        [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-       
SRC_URI="http://download.qt-project.org/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz";
+       
SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz";
        S=${WORKDIR}/${MY_P}
 fi
 



1.6                  dev-qt/qt-creator/qt-creator-2.8.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild?r1=1.5&r2=1.6

Index: qt-creator-2.8.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-creator-2.8.1.ebuild     7 Nov 2014 01:59:17 -0000       1.5
+++ qt-creator-2.8.1.ebuild     18 Jan 2015 04:56:40 -0000      1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild,v 
1.5 2014/11/07 01:59:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.1.ebuild,v 
1.6 2015/01/18 04:56:40 pesa Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@
        MY_PV=${PV/_/-}
        MY_P=${PN}-${MY_PV}-src
        [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-       
SRC_URI="http://download.qt-project.org/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz";
+       
SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz";
        S=${WORKDIR}/${MY_P}
 fi
 



1.37                 dev-qt/qt-creator/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog   8 Jan 2015 22:32:11 -0000       1.36
+++ ChangeLog   18 Jan 2015 04:56:40 -0000      1.37
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.36 
2015/01/08 22:32:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.37 
2015/01/18 04:56:40 pesa Exp $
+
+*qt-creator-3.3.0 (18 Jan 2015)
+
+  18 Jan 2015; Davide Pesavento <p...@gentoo.org> +qt-creator-3.3.0.ebuild,
+  metadata.xml, qt-creator-2.8.1.ebuild, qt-creator-3.2.2.ebuild:
+  Version bump (bug 528436). Build against Qt5 as now required by upstream,
+  thanks to Paweł Stankowski in bug 479638 for the initial patch. Add support
+  for qbs and winrt plugins (bug 476256).
 
   08 Jan 2015; Davide Pesavento <p...@gentoo.org> metadata.xml:
   Update upstream bugtracker URL.



1.1                  dev-qt/qt-creator/qt-creator-3.3.0.ebuild

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

Index: qt-creator-3.3.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 
1.1 2015/01/18 04:56:40 pesa Exp $

EAPI=5

PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"

inherit eutils l10n multilib qmake-utils

DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator";
LICENSE="|| ( LGPL-2.1 LGPL-3 )"

if [[ ${PV} == *9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI=(
                "git://gitorious.org/${PN}/${PN}.git"
                "https://git.gitorious.org/${PN}/${PN}.git";
        )
else
        MY_PV=${PV/_/-}
        MY_P=${PN}-opensource-src-${MY_PV}
        [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
        
SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz";
        S=${WORKDIR}/${MY_P}
fi

SLOT="0"
KEYWORDS="~amd64 ~x86"

QTC_PLUGINS=('android:android|qmakeandroidsupport' 
autotools:autotoolsprojectmanager baremetal
        bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git 
ios mercurial
        perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion 
valgrind winrt)
IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"

# minimum Qt version required
QT_PV="5.3.2:5"

CDEPEND="
        =dev-libs/botan-1.10*[threads]
        >=dev-qt/designer-${QT_PV}
        >=dev-qt/qtconcurrent-${QT_PV}
        >=dev-qt/qtcore-${QT_PV}
        >=dev-qt/qtdeclarative-${QT_PV}
        >=dev-qt/qtgui-${QT_PV}
        >=dev-qt/qthelp-${QT_PV}
        >=dev-qt/qtnetwork-${QT_PV}[ssl]
        >=dev-qt/qtprintsupport-${QT_PV}
        >=dev-qt/qtquick1-${QT_PV}
        >=dev-qt/qtquickcontrols-${QT_PV}
        >=dev-qt/qtscript-${QT_PV}
        >=dev-qt/qtsql-${QT_PV}
        >=dev-qt/qtsvg-${QT_PV}
        >=dev-qt/qtwidgets-${QT_PV}
        >=dev-qt/qtx11extras-${QT_PV}
        >=dev-qt/qtxml-${QT_PV}
        clang? ( >=sys-devel/clang-3.2:= )
        qbs? ( >=dev-util/qbs-1.3.3[qt5] )
"
DEPEND="${CDEPEND}
        >=dev-qt/linguist-tools-${QT_PV}
        virtual/pkgconfig
        doc? ( >=dev-qt/qdoc-${QT_PV} )
        test? ( >=dev-qt/qttest-${QT_PV} )
"
RDEPEND="${CDEPEND}
        >=sys-devel/gdb-7.2[client(+),python]
"
for x in ${PLOCALES}; do
        # qt translations must be installed for qt-creator translations to work
        RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
done
unset x

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 )
"

src_prepare() {
        # disable unwanted plugins
        for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
                if ! use ${plugin%:*}; then
                        einfo "Disabling ${plugin%:*} plugin"
                        sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" 
\
                                src/plugins/plugins.pro \
                                || die "failed to disable ${plugin%:*} plugin"
                fi
        done

        # fix translations
        sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
                share/qtcreator/translations/translations.pro || die

        # remove bundled qbs
        rm -rf src/shared/qbs || die
}

src_configure() {
        eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
                IDE_PACKAGE_MODE=1 \
                LLVM_INSTALL_DIR="${EPREFIX}/usr" \
                QBS_INSTALL_DIR="${EPREFIX}/usr" \
                TEST=$(use test && echo 1 || echo 0) \
                USE_SYSTEM_BOTAN=1
}

src_test() {
        echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
        cd tests/auto || die

        eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)"

        default
}

src_install() {
        emake INSTALL_ROOT="${ED}usr" install

        dodoc dist/{changes-*,known-issues}

        # install documentation
        if use doc; then
                emake docs
                # don't use ${PF} or the doc will not be found
                insinto /usr/share/doc/qtcreator
                doins share/doc/qtcreator/qtcreator{,-dev}.qch
                docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
        fi

        # install desktop file
        make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 
'Qt;Development;IDE'
}




Reply via email to