Version bump. Drop USE=gui wrt bug 514204. Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

5 files changed, 39 insertions, 136 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/Manifest b/dev-util/qbs/Manifest
index 58bb675f2451..6ddf555ad60e 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qbs-1.1.1.src.tar.gz 583367 SHA256 469e6c9c9fbe6475dd7f26c43e24fe08ce6715effa69680cbc2c7c06c2e1fe4e SHA512 4837d9344d37e87421d0664297f6816365fb61487f55b1fbf0bbb88a6e4248049ccc48c21563f23970c2a70da1a7038cdbb91b3a92550e5ee23c09af8a36ccb0 WHIRLPOOL 2e813b3ce77b2cb2b312cef53d733cba050276c959f2eeab5478d7ea1902659519078c0a36d0eac46236afc7dea81429ca0cfd995fffaa384aa724cafb6fd1f7
-DIST qbs-1.2.1.src.tar.gz 659613 SHA256 3fb0a7203328e153285f9b134da1e73f9ce8017337efd11ede5598e4b82800b4 SHA512 5e3ef647af4c5008b83b0fb1b6f5e2040cf01c8cd696275756ec5e00b49b91eae8d16093b96258ee26a8bc10886dd3c3059689c3e96117f948e229c77910f3aa WHIRLPOOL a354a8494b2c47828e1f1afe97408e1baa4811ddf6175ba72995ad92c7812b6e1183651fd388a4083ef3e8b9cf0005d09acc775b3a9108144fe65dfc2fd292c8
-EBUILD qbs-1.1.1.ebuild 2011 SHA256 50e587d72a763156030602b8f1c6b85cae4b4c30586db52860584071e3007638 SHA512 25cb2ba72177b4ccee0f935f5c69a95501f8d8fc2ca90aab0b0f4a3fdbeb91fda7e5b1429ad974420b36bf0646bca85a3db10e1c01e133d7cb41137afdcbdf84 WHIRLPOOL 523d8a4009d378b7b91f3d914942b827be6002e0e19796cb14487f10a1214e7e3e140a6a995e2674c0580321aa7efab22c83028e963a884637f49bcd0addd793
-EBUILD qbs-1.2.1.ebuild 1853 SHA256 10135d7986ea53332791003efca50d35d455c8c344201769e2a91a6b2b405f0b SHA512 164b0eb276592e0eb72dae2a0c9082352026c8ba68164d6a06ccdcbac2a9eda3f5d16addcddd712a8d1ad7e71d73d517e9fcc6838bff2bba4b1b74c6818f9545 WHIRLPOOL 366b3b7ec1f065ad80911eb708bb8d094ac137c6938db1c625dde757511965274ec0eecf2656b5ffff4431bdf929582cb352581f05f44373994014ab0577a535
-MISC ChangeLog 473 SHA256 8d63799f590de22e6b6ee52267405713a35f6964a015b85abeeba94a81f4f8da SHA512 39eae73f206865192a970fb55e4838ecb4516197000fd12835052dd90a76ed80525c4f5f91dfa2da29582fd23ea6ac064f634ea4d65919d0d4e820171d0fd6c3 WHIRLPOOL e7293e5701ea9ef959b0d9509e511400a4d683af6164923fd7d110bc5c7c81e6f1fcef409524a9975b48bc1037aeca104ca6753b575bcc2377e4acc0a2a86738
-MISC metadata.xml 232 SHA256 c04b80148079991f251c443c4df8614eca28da6517707c411d01caec9a997480 SHA512 855d6c235609952ec1bf003de70e6fea7becc0a840286448a4aab9a638727a52b57063d005754aa2f90000ff499a609a74a80c703f2773982c30c1f4cacd97cb WHIRLPOOL 4a7dbc30e5dde6e4fc691c4d0298796c18fe3b93e13dacf9f85447b43af3eb733df6f414c1ce8af90eb51f7fb425afe80a7d92b728dc93ad25a79b66efd37695
+DIST qbs-1.2.2.src.tar.gz 661270 SHA256 26d46cf6bf580397810b50ee4eea94880148b8a64deab06ea3a4c868db18d162 SHA512 ee61c2ca68d20eee96fbbbc76b56ba72373c3b504e735defb551302c1e4ad9ed8fe95f541377a62433c1c566e0f30f01b93971ce689a41569fb06ad07ce9c844 WHIRLPOOL 27087f1b9d8238160e21cf4859f255538d4e10c72795f11ddc87045a651726c1f3d655b2a3a9e00cd86ad9322b64cb285ce35818eec5484b592926ab0f3c9f65
+EBUILD qbs-1.2.2.ebuild 1915 SHA256 d38edd34816c732dcd84bef624adfcb4b3d79213466a1cb5cf9c6230514d358a SHA512 d29855ab76c27445126c719054c6e592dcc9bb56f5c644a7ca0cef34e9139bd702415e65f463eaf88a904b0ef2717a1f5433583dd38ffd9427b94e2359edf08a WHIRLPOOL d6c25ea9fb679f5113f77f16348f7054275e3b58e9f484680282bb8b1bdc2ab51ffb3466c6db2ced58e252ceb30e329728b1fbdf2a901557b02f6d7df3d06947
+MISC ChangeLog 680 SHA256 852e5f7a1890b1ff6fa4b11ef4cced484fd8922a4d128a86ba3e928e1fc6f4f7 SHA512 3f902680c8e26a07d45df9f9cd4ecd6d18a9650147d323d3ace70531575b3efa04a7a7e722f757445d44f3546a54e7d27dfffce0982c9c6d75ff1207eeeafdc2 WHIRLPOOL 1dcef6459b449be0f7a9396f30db140420ce290aadaea87d4df76410f9ae6372a53c4a63380da6583591cc5b74b6259a8ccd4d84064a027f284479d2ce3fa472
+MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJToJ9dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT2tL+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9CZUQAJwLTFBzzEzRuUWBcbUxVhZk
-qonuWoCT4uYqxayg5WDi6+xwxNDp4wFVrXqU2qiD5Ov9mCHEO67Uron071fbAGIu
-atVMoAE3f39zEzFgFS1bmr/PuRa6aLpnMgrSQ1z6aFcmJziXefS79LAegSn+X9un
-rGChWjb9dfNjS27X5tvXV+cviNtgcREmlk10oPCknAgF846G5NVqFUlDYGFGI+H7
-+jdMrNXX5mZWqII+FDLszLyWIfUO/mf8WtjXGRRikqrQXuGXHkFtazUt/V/XS8pW
-cRKGr8fE6ZBFxvl64/VPsirq30zUom96NDUcd9ZytuKOcV7F3DfrZvuaZngNUH8X
-d6o9gmESwNH4EDi3MZfWV/nctH5RXcRm0s1lkGF1ZldfydL+N5BNXk/mIZ2J2eR1
-vO9AFkMenO7uKXM5IVVqOSKYtgZ1DkG/cvTv6pnAubnToM11tK1BaGy6M13eZzwR
-HqF4eGg5K1bcHrLqVTI2MHNdakQAxg6qFVbE9noe4PmdsGTbRHnedU6/z+yCwIRL
-cVoEC/i5FolO2/yj2PkuujsTPsUhRarXGg/MTPwglT7jM1D5EBGjyHd5WMOFTxzV
-e/+XThJS53L0JZQ6g/QNoNVwefgleEiPUUO2a5q43oqRXMIH44hU4+49Ad/EpR3x
-vYVBvvxdAK6fFW76+EjX
-=ddTw
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bscQALUoy6LfmDW7qCRflheAMuLp
+loS8Wa83RTFyjY2yfCXY3+0/s+o7jT6alf2b8FNu5dXb2V1coklUNV/y8AtRz0wA
+MlXEnLt/c8NcLdM0bGqWfnDPhQqa+Z3P2Vwt44pTbnfyG59dp56G45ReS+IZypzE
+eBCHsT4G9tV3OpuWzW6OZhid1BVjldmx/Av49AdD52VW1wZf4R7L1ltZND48dA9P
+6c4e55KVxj6xZqTnDpXJl6KC7/JH33Hwi7hjbFVUCLwYtZoBr/Um5NahX44s5MIB
+JbO4Da2eB+6ctAwpH9avRmcTnYMzu0CAXC1rYeyi499jG9N8C73x6kFoSaAR+VmA
+YqfdbtpElJnLBUV2Ju9ei/lRGJi3plFNFCiqLBU02nNpyjJdBUI5Opth5FE0uRw3
+oYALkmx3TrMJyj6xxSILu/sh6uvO7sDD8BOqmt80uOHRizFdz21viaiUZdhqBcZp
+m6RG7YVgfcjIrseckqrjyfFIo/Rx3/q2T19U/fFu/GpcDmP7zhmQRdAgXfeg9tjE
+Mcf2jC2M7OsrDZvyF2yst1RO2etksgkFnKt/9zIm0Byo/SXu+eJ7MTB9QE4W8tZW
+ctUNnZS+ynS9Il/lst7OYhmpfPQBkZVgAJ0KEnNNtX30sXdvlMiwLH3s8AkffNbG
+kNFXUUvAwi1CiQW21AzK
+=8tqe
 -----END PGP SIGNATURE-----
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
 }