* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-02-03 23:06 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2012-02-03 23:06 UTC (permalink / raw
To: gentoo-commits
commit: faa097cb192fe4b68df01667ebd3171bc0c58c80
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 23:05:29 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 23:05:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=faa097cb
dev-util/qt-creator: Refactor ebuild so we can use it for future version bumps
---
dev-util/qt-creator/qt-creator-9999.ebuild | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 12466bf..6d38663 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -4,19 +4,31 @@
EAPI="4"
LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+MY_P=${PN}-${PV/_/-}-src
-inherit multilib eutils flag-o-matic qt4-edge git-2
+inherit multilib eutils flag-o-matic
-MY_P=${PN}-${PV/_/-}-src
+if [[ ${PV} = 9999 ]]; then
+ inherit git-2
+ QTCREATOR_SUFFIX="-edge"
+ EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
+ https://git.gitorious.org/${PN}/${PN}.git"
+else
+ QTCREATOR_SUFFIX="-r2"
+ SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+fi
+inherit qt4${QTCREATOR_SUFFIX}
DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
HOMEPAGE="http://qt.nokia.com/products/developer-tools"
-EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS=""
+if [[ ${PV} == 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
git madde mercurial perforce subversion valgrind)
@@ -52,7 +64,7 @@ PDEPEND="
"
src_prepare() {
- qt4-edge_src_prepare
+ qt4${QTCREATOR_SUFFIX}_src_prepare
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-02-04 9:20 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2012-02-04 9:20 UTC (permalink / raw
To: gentoo-commits
commit: e3b2eeff2c6f823e8d91e6e4b280447634304c23
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 09:19:30 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 09:19:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3b2eeff
devu-util/qt-creator: Make sure git-2 inherited last
---
dev-util/qt-creator/qt-creator-9999.ebuild | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 6d38663..47d69e8 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -8,16 +8,16 @@ MY_P=${PN}-${PV/_/-}-src
inherit multilib eutils flag-o-matic
-if [[ ${PV} = 9999 ]]; then
- inherit git-2
+if [[ ${PV} == 9999 ]]; then
QTCREATOR_SUFFIX="-edge"
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
https://git.gitorious.org/${PN}/${PN}.git"
+ inherit qt4${QTCREATOR_SUFFIX} git-2
else
QTCREATOR_SUFFIX="-r2"
SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+ inherit qt4${QTCREATOR_SUFFIX}
fi
-inherit qt4${QTCREATOR_SUFFIX}
DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
HOMEPAGE="http://qt.nokia.com/products/developer-tools"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-02-04 10:09 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2012-02-04 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 4806fec4770c6b9006b0e836bfcc8fde518ab6c7
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 10:08:42 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 10:08:42 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4806fec4
dev-util/qt-creator: Fix target for documentation
---
dev-util/qt-creator/qt-creator-9999.ebuild | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 47d69e8..8cd8c72 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -126,7 +126,8 @@ src_install() {
emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
if use doc; then
- emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_docs
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs
+ emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_dev_qch_docs
fi
# Install icon & desktop file
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-03-20 0:00 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-03-20 0:00 UTC (permalink / raw
To: gentoo-commits
commit: a9871cefb900ef8340cfdfe3c3267d9774b1afcd
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Mar 19 23:59:48 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 23:59:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a9871cef
qt-creator: sync with portage.
(Portage version: 2.2.0_alpha92/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/qt-creator/metadata.xml | 3 +-
dev-util/qt-creator/qt-creator-9999.ebuild | 71 ++++++++++++++--------------
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 44282bd..91bd2ae 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="botan-bundled">Use the bundled copy of <pkg>dev-libs/botan</pkg></flag>
<flag name="cmake">Enable cmake project manager plugin</flag>
@@ -18,7 +19,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="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
</use>
</pkgmetadata>
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 8cd8c72..a62dc0a 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -2,21 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
+
LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
-MY_P=${PN}-${PV/_/-}-src
inherit multilib eutils flag-o-matic
-if [[ ${PV} == 9999 ]]; then
+MY_P=${PN}-${PV/_/-}-src
+if [[ ${PV} == *9999* ]]; then
QTCREATOR_SUFFIX="-edge"
- EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
inherit qt4${QTCREATOR_SUFFIX} git-2
+ EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
+ https://git.gitorious.org/${PN}/${PN}.git"
else
QTCREATOR_SUFFIX="-r2"
- SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
inherit qt4${QTCREATOR_SUFFIX}
+ SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+ S=${WORKDIR}/${MY_P}
fi
DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
@@ -24,36 +26,34 @@ HOMEPAGE="http://qt.nokia.com/products/developer-tools"
LICENSE="LGPL-2.1"
SLOT="0"
-if [[ ${PV} == 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
+KEYWORDS=""
-QTC_PLUGINS=(bazaar cmake:cmakeprojectmanager cvs fakevim
- git madde mercurial perforce subversion valgrind)
+QTC_PLUGINS=(autotools:autotoolsprojectmanager bazaar cmake:cmakeprojectmanager
+ cvs fakevim git madde mercurial perforce subversion valgrind)
IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-QTVER="4.7.4:4"
+QT_PV="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} )
- >=x11-libs/qt-assistant-${QTVER}[doc?]
+ >=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[python]
- examples? ( >=x11-libs/qt-demo-${QTVER} )
+ >=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 )
@@ -76,11 +76,11 @@ src_prepare() {
done
if use perforce; then
- ewarn
+ 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"
- ewarn
+ echo
fi
# fix translations
@@ -89,8 +89,7 @@ src_prepare() {
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 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}"
@@ -123,23 +122,25 @@ src_compile() {
}
src_install() {
- emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install
+ emake INSTALL_ROOT="${ED}usr" install
+ # Install documentation
if use doc; then
- emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_qch_docs
- emake INSTALL_ROOT="${D%/}${EPREFIX}/usr" install_inst_dev_qch_docs
+ 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 || die
- make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE' || die
+ 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 "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \
- || eqawarn "failed to remove ${lang} translation"
+ rm "${ED}"usr/share/qtcreator/translations/qtcreator_${lang}.qm \
+ || eqawarn "Failed to remove ${lang} translation"
fi
done
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-05-03 7:24 Johannes Huber
0 siblings, 0 replies; 11+ messages in thread
From: Johannes Huber @ 2012-05-03 7:24 UTC (permalink / raw
To: gentoo-commits
commit: be26f95025be61fa5374b6518c68d363680815d9
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 07:16:40 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 3 07:16:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=be26f950
[dev-util/qt-creator] Migrate to virtual/pkgconfig.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
---
dev-util/qt-creator/qt-creator-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 6ac7a8b..c589285 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -43,7 +43,7 @@ CDEPEND="
!botan-bundled? ( =dev-libs/botan-1.8* )
"
DEPEND="${CDEPEND}
- !botan-bundled? ( dev-util/pkgconfig )
+ !botan-bundled? ( virtual/pkgconfig )
"
RDEPEND="${CDEPEND}
>=sys-devel/gdb-7.2[python]
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-05-03 14:32 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-05-03 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 10cca920e7a3679624df789a9d189350d6d3c2dd
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu May 3 14:31:41 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 3 14:31:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=10cca920
[dev-util/qt-creator] Fix invocation of qt4-r2_src_prepare().
---
dev-util/qt-creator/qt-creator-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index c589285..3c4d01a 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -61,7 +61,7 @@ PDEPEND="
"
src_prepare() {
- qt4${QTCREATOR_SUFFIX}_src_prepare
+ qt4-r2_src_prepare
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-05-12 10:30 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-05-12 10:30 UTC (permalink / raw
To: gentoo-commits
commit: dfd141e80dc67350fff533c3a965a770c174e10d
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat May 12 10:30:25 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 12 10:30:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dfd141e8
[dev-util/qt-creator] USE=ssl is required in qt-core.
(Portage version: 2.2.0_alpha103/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/qt-creator/qt-creator-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 3c4d01a..7d46675 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -33,7 +33,7 @@ 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-core-${QT_PV}[private-headers(+),ssl]
>=x11-libs/qt-declarative-${QT_PV}[private-headers(+)]
>=x11-libs/qt-gui-${QT_PV}[private-headers(+)]
>=x11-libs/qt-script-${QT_PV}[private-headers(+)]
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-08-13 4:48 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-08-13 4:48 UTC (permalink / raw
To: gentoo-commits
commit: e84484c4283afcc07167ea08d0f6fdb219a25267
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Aug 13 04:43:21 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 04:43:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e84484c4
[qt-creator] Sync with portage ebuild.
---
dev-util/qt-creator/qt-creator-9999.ebuild | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 7d46675..a970c8d 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -8,20 +8,20 @@ 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"
+LICENSE="LGPL-2.1"
+
if [[ ${PV} == *9999* ]]; then
inherit git-2
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
+ https://git.gitorious.org/${PN}/${PN}.git"
else
+ MY_P=${PN}-${PV/_/-}-src
SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
fi
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt.nokia.com/products/developer-tools"
-
-LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2012-09-12 1:45 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2012-09-12 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 0cfbbecd69f4d365f977c768c21c00a0d4602764
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Sep 12 01:45:10 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 01:45:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0cfbbecd
[dev-util/qt-creator] Updates for 2.6 beta.
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/qt-creator/metadata.xml | 3 ++
dev-util/qt-creator/qt-creator-9999.ebuild | 55 +++++++++++-----------------
2 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index 91bd2ae..76b9c24 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -11,15 +11,18 @@
<name>Davide Pesavento</name>
</maintainer>
<use>
+ <flag name="android">Build Android plugin</flag>
<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="botan-bundled">Use the bundled copy of <pkg>dev-libs/botan</pkg></flag>
+ <flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
<flag name="cmake">Enable cmake project manager plugin</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">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
+ <flag name="qnx">Build QNX/Blackberry plugin</flag>
<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
</use>
</pkgmetadata>
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index a970c8d..696949d 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -4,12 +4,12 @@
EAPI=4
-LANGS="cs de es fr hu it ja pl ru sl uk zh_CN"
+PLOCALES="cs de fr hu ja pl ru sl zh_CN"
-inherit multilib eutils flag-o-matic qt4-r2
+inherit eutils flag-o-matic l10n multilib qt4-r2
DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt.nokia.com/products/developer-tools"
+HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
LICENSE="LGPL-2.1"
if [[ ${PV} == *9999* ]]; then
@@ -17,30 +17,33 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
https://git.gitorious.org/${PN}/${PN}.git"
else
- MY_P=${PN}-${PV/_/-}-src
- SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz"
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-${MY_PV}-src
+ SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
fi
SLOT="0"
KEYWORDS=""
-QTC_PLUGINS=(autotools:autotoolsprojectmanager bazaar cmake:cmakeprojectmanager
- cvs fakevim git madde mercurial perforce subversion valgrind)
+QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
+ clearcase cmake:cmakeprojectmanager cvs fakevim git
+ madde mercurial perforce qnx subversion valgrind)
IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-QT_PV="4.7.4:4"
+# minimum Qt version required
+QT_PV="4.8.0:4"
CDEPEND="
>=x11-libs/qt-assistant-${QT_PV}[doc?]
- >=x11-libs/qt-core-${QT_PV}[private-headers(+),ssl]
- >=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-core-${QT_PV}[ssl]
+ >=x11-libs/qt-declarative-${QT_PV}
+ >=x11-libs/qt-gui-${QT_PV}
+ >=x11-libs/qt-script-${QT_PV}
>=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* )
+ !botan-bundled? ( >=dev-libs/botan-1.10.2 )
"
DEPEND="${CDEPEND}
!botan-bundled? ( virtual/pkgconfig )
@@ -72,16 +75,8 @@ src_prepare() {
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}:" \
+ sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
share/qtcreator/translations/translations.pro || die
if ! use botan-bundled; then
@@ -110,7 +105,7 @@ src_prepare() {
src_configure() {
eqmake4 qtcreator.pro \
IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=true
+ IDE_PACKAGE_MODE=yes
}
src_compile() {
@@ -121,6 +116,8 @@ src_compile() {
src_install() {
emake INSTALL_ROOT="${ED}usr" install
+ dodoc dist/{changes-2.*,known-issues}
+
# Install documentation
if use doc; then
insinto /usr/share/doc/${PF}
@@ -128,16 +125,6 @@ src_install() {
docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
fi
- # Install icon & desktop file
- doicon src/plugins/coreplugin/images/logo/128/qtcreator.png
+ # Install desktop file
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
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2013-02-16 11:46 Markos Chandras
0 siblings, 0 replies; 11+ messages in thread
From: Markos Chandras @ 2013-02-16 11:46 UTC (permalink / raw
To: gentoo-commits
commit: c3066e3d3e2796a65f1df148db6f8b44b161bce4
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 11:45:02 2013 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 11:45:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c3066e3d
dev-util/qt-creator: Bump to 2.7.0
---
dev-util/qt-creator/Manifest | 1 +
...or-9999.ebuild => qt-creator-2.7.0_beta.ebuild} | 3 ++-
dev-util/qt-creator/qt-creator-9999.ebuild | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
new file mode 100644
index 0000000..2e17585
--- /dev/null
+++ b/dev-util/qt-creator/Manifest
@@ -0,0 +1 @@
+DIST qt-creator-2.7.0-beta-src.tar.gz 21630612 SHA256 e7db17e14fd181b563b6779c23895e9d5b2ecdade785bc803bd6b8e7386e7768 SHA512 ea1b72a2d5bd1e68a05b693ca0dcae20154e7691d51b0e7299c071e42031db87966cc777cd151cd070ea3b10734a06ed6e0c8dcf311d44dfd08fc6333861a4c5 WHIRLPOOL 9b88e16872e6336f586966d8695238d9549567dd235a89fb802da3a77515c811bd2d8cab14fed2fe1b620a9735b18a7b5093101ecae492554337b0678b1378f3
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
similarity index 99%
copy from dev-util/qt-creator/qt-creator-9999.ebuild
copy to dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
index 38d864b..e97a856 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
@@ -16,15 +16,16 @@ if [[ ${PV} == *9999* ]]; then
inherit git-2
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
https://git.gitorious.org/${PN}/${PN}.git"
+ KEYWORDS=""
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}-src
SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
SLOT="0"
-KEYWORDS=""
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
clearcase cmake:cmakeprojectmanager cvs fakevim git
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index 38d864b..e97a856 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -16,15 +16,16 @@ if [[ ${PV} == *9999* ]]; then
inherit git-2
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
https://git.gitorious.org/${PN}/${PN}.git"
+ KEYWORDS=""
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}-src
SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
SLOT="0"
-KEYWORDS=""
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
clearcase cmake:cmakeprojectmanager cvs fakevim git
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/
@ 2013-02-17 22:11 Davide Pesavento
0 siblings, 0 replies; 11+ messages in thread
From: Davide Pesavento @ 2013-02-17 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 628f764439ad2f19ec1817d6996949ff9ea62a92
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Feb 17 22:10:37 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 22:10:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=628f7644
Revert "dev-util/qt-creator: Bump to 2.7.0"
This reverts commit c3066e3d3e2796a65f1df148db6f8b44b161bce4.
In tree and improved.
---
dev-util/qt-creator/Manifest | 1 -
dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild | 131 ----------------------
dev-util/qt-creator/qt-creator-9999.ebuild | 3 +-
3 files changed, 1 insertions(+), 134 deletions(-)
diff --git a/dev-util/qt-creator/Manifest b/dev-util/qt-creator/Manifest
deleted file mode 100644
index 2e17585..0000000
--- a/dev-util/qt-creator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-creator-2.7.0-beta-src.tar.gz 21630612 SHA256 e7db17e14fd181b563b6779c23895e9d5b2ecdade785bc803bd6b8e7386e7768 SHA512 ea1b72a2d5bd1e68a05b693ca0dcae20154e7691d51b0e7299c071e42031db87966cc777cd151cd070ea3b10734a06ed6e0c8dcf311d44dfd08fc6333861a4c5 WHIRLPOOL 9b88e16872e6336f586966d8695238d9549567dd235a89fb802da3a77515c811bd2d8cab14fed2fe1b620a9735b18a7b5093101ecae492554337b0678b1378f3
diff --git a/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild b/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
deleted file mode 100644
index e97a856..0000000
--- a/dev-util/qt-creator/qt-creator-2.7.0_beta.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PLOCALES="cs de fr hu ja pl ru sl zh_CN"
-
-inherit eutils flag-o-matic l10n multilib qt4-r2
-
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
-HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
-LICENSE="LGPL-2.1"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-2
- EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
- KEYWORDS=""
-else
- MY_PV=${PV/_/-}
- MY_P=${PN}-${MY_PV}-src
- SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
- clearcase cmake:cmakeprojectmanager cvs fakevim git
- madde mercurial perforce qnx subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.0:4"
-
-CDEPEND="
- >=x11-libs/qt-assistant-${QT_PV}[doc?]
- >=x11-libs/qt-core-${QT_PV}[ssl]
- >=x11-libs/qt-declarative-${QT_PV}
- >=x11-libs/qt-gui-${QT_PV}
- >=x11-libs/qt-script-${QT_PV}
- >=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.10.2 )
-"
-DEPEND="${CDEPEND}
- !botan-bundled? ( virtual/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 )
-"
-
-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
-
- # fix translations
- sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
- 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=yes
-}
-
-src_compile() {
- emake
- use doc && emake docs
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}usr" install
-
- dodoc dist/{changes-2.*,known-issues}
-
- # 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 desktop file
- make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE'
-}
diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-creator/qt-creator-9999.ebuild
index e97a856..38d864b 100644
--- a/dev-util/qt-creator/qt-creator-9999.ebuild
+++ b/dev-util/qt-creator/qt-creator-9999.ebuild
@@ -16,16 +16,15 @@ if [[ ${PV} == *9999* ]]; then
inherit git-2
EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
https://git.gitorious.org/${PN}/${PN}.git"
- KEYWORDS=""
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}-src
SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
SLOT="0"
+KEYWORDS=""
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
clearcase cmake:cmakeprojectmanager cvs fakevim git
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-02-17 22:11 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-04 10:09 [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2013-02-17 22:11 Davide Pesavento
2013-02-16 11:46 Markos Chandras
2012-09-12 1:45 Davide Pesavento
2012-08-13 4:48 Davide Pesavento
2012-05-12 10:30 Davide Pesavento
2012-05-03 14:32 Davide Pesavento
2012-05-03 7:24 Johannes Huber
2012-03-20 0:00 Davide Pesavento
2012-02-04 9:20 Markos Chandras
2012-02-03 23:06 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox