Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/qbs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/qbs')
-rw-r--r--dev-util/qbs/ChangeLog8
-rw-r--r--dev-util/qbs/metadata.xml3
-rw-r--r--dev-util/qbs/qbs-1.1.1.ebuild100
-rw-r--r--dev-util/qbs/qbs-1.2.2.ebuild (renamed from dev-util/qbs/qbs-1.2.1.ebuild)26
4 files changed, 21 insertions, 116 deletions
diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index bf9d6aae441c..bfd597b89a4d 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/qbs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.2 2014/06/17 20:04:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.3 2014/07/31 23:36:22 pesa Exp $
+
+*qbs-1.2.2 (31 Jul 2014)
+
+ 31 Jul 2014; Davide Pesavento <pesa@gentoo.org> +qbs-1.2.2.ebuild,
+ -qbs-1.1.1.ebuild, -qbs-1.2.1.ebuild, metadata.xml:
+ Version bump. Drop USE=gui wrt bug 514204. Remove old.
*qbs-1.2.1 (17 Jun 2014)
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 9efe89cedbc6..dc439f7e84f5 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>qt</herd>
-<use>
- <flag name="gui">Build QBS graphical configuration tool</flag>
-</use>
</pkgmetadata>
diff --git a/dev-util/qbs/qbs-1.1.1.ebuild b/dev-util/qbs/qbs-1.1.1.ebuild
deleted file mode 100644
index 21316740091d..000000000000
--- a/dev-util/qbs/qbs-1.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.1.1.ebuild,v 1.1 2013/12/29 19:49:45 pesa Exp $
-
-EAPI=5
-
-inherit multilib qmake-utils
-
-DESCRIPTION="Qt Build Suite"
-HOMEPAGE="http://qt-project.org/wiki/qbs"
-SRC_URI="http://download.qt-project.org/official_releases/${PN}/${PV}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gui +qt4 qt5 test"
-
-RDEPEND="
- qt4? (
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtscript-4.8:4
- gui? ( >=dev-qt/qtgui-4.8:4 )
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
- gui? ( dev-qt/qtwidgets:5 )
- )
-"
-DEPEND="${RDEPEND}
- doc? (
- qt4? ( >=dev-qt/qthelp-4.8:4 )
- qt5? ( dev-qt/qthelp:5 )
- )
- test? (
- qt4? ( >=dev-qt/qttest-4.8:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-S=${WORKDIR}/${P}.src
-
-src_prepare() {
- # fix hardcoded libdir
- sed -i -e "s:/lib/qbs:/$(get_libdir)/qbs:" \
- src/lib/tools/preferences.cpp || die
- sed -i -e "/target\.path/ s:lib/:$(get_libdir)/:" \
- src/plugins/plugins.pri || die
-
- if ! use gui; then
- sed -i -e '/SUBDIRS += config-ui/d' \
- src/app/app.pro || die
- fi
-
- if ! use test; then
- sed -i -e '/SUBDIRS = auto/d' \
- tests/tests.pro || die
- fi
-}
-
-src_configure() {
- local myqmakeargs=(
- -recursive
- CONFIG+=disable_rpath
- QBS_INSTALL_PREFIX="${EPREFIX}/usr"
- QBS_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
-
- if use qt4; then
- eqmake4 "${myqmakeargs[@]}"
- elif use qt5; then
- eqmake5 "${myqmakeargs[@]}"
- fi
-}
-
-src_test() {
- export HOME=${T}
- export LD_LIBRARY_PATH=${S}/lib
-
- einfo "Setting up test environment in ${T}"
- "${S}"/bin/qbs detect-toolchains || die
- "${S}"/bin/qbs setup-qt "${EROOT}"usr/bin/qmake qbs_autotests || die
-
- default
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- # install documentation
- if use doc; then
- emake docs
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- dohtml -r doc/html/*
- fi
-}
diff --git a/dev-util/qbs/qbs-1.2.1.ebuild b/dev-util/qbs/qbs-1.2.2.ebuild
index 72b258314e9c..9aa641f77bfe 100644
--- a/dev-util/qbs/qbs-1.2.1.ebuild
+++ b/dev-util/qbs/qbs-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.2.1.ebuild,v 1.1 2014/06/17 20:04:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.2.2.ebuild,v 1.1 2014/07/31 23:36:22 pesa Exp $
EAPI=5
@@ -13,19 +13,20 @@ SRC_URI="http://download.qt-project.org/official_releases/${PN}/${PV}/${P}.src.t
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc gui +qt4 qt5 test"
+IUSE="doc +qt4 qt5 test"
RDEPEND="
qt4? (
>=dev-qt/qtcore-4.8:4
+ >=dev-qt/qtgui-4.8:4
>=dev-qt/qtscript-4.8:4
- gui? ( >=dev-qt/qtgui-4.8:4 )
)
qt5? (
dev-qt/qtcore:5
+ dev-qt/qtgui:5
dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
dev-qt/qtxml:5
- gui? ( dev-qt/qtwidgets:5 )
)
"
DEPEND="${RDEPEND}
@@ -42,10 +43,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="^^ ( qt4 qt5 )"
src_prepare() {
- if ! use gui; then
- sed -i -e '/SUBDIRS += config-ui/d' \
- src/app/app.pro || die
- fi
+ sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
+ src/plugins/plugins.pri || die
if ! use test; then
sed -i -e '/SUBDIRS = auto/d' \
@@ -59,7 +58,6 @@ src_configure() {
CONFIG+=disable_rpath
QBS_INSTALL_PREFIX="${EPREFIX}/usr"
QBS_LIBRARY_DIRNAME="$(get_libdir)"
- QBS_QBS_LIBRARY_DIRNAME="$(get_libdir)" # typo in src/library_dirname.pri
)
if use qt4; then
@@ -71,11 +69,15 @@ src_configure() {
src_test() {
export HOME=${T}
- export LD_LIBRARY_PATH=${S}/lib
+ export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+ local qmakepath=${EROOT}usr/$(get_libdir)/$(usev qt4 || usev qt5)/bin/qmake
+ [[ -x ${qmakepath} ]] || qmakepath=${EROOT}usr/bin/qmake
einfo "Setting up test environment in ${T}"
- "${S}"/bin/qbs detect-toolchains || die
- "${S}"/bin/qbs setup-qt "${EROOT}"usr/bin/qmake qbs_autotests || die
+
+ "${S}"/bin/qbs-setup-toolchains --detect || die
+ "${S}"/bin/qbs-setup-qt "${qmakepath}" qbs_autotests || die
default
}