Version bump.

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

3 files changed, 119 insertions, 17 deletions

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 11a5c2259fc6..bf9d6aae441c 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/qbs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.1 2013/12/29 19:49:45 pesa Exp $
+# 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 $
+
+*qbs-1.2.1 (17 Jun 2014)
+
+  17 Jun 2014; Davide Pesavento <pesa@gentoo.org> +qbs-1.2.1.ebuild:
+  Version bump.
 
 *qbs-1.1.1 (29 Dec 2013)
 
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index e0e57beea1af..58bb675f2451 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -2,23 +2,27 @@
 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
-MISC ChangeLog 361 SHA256 88595d2f2ca2f894f71c2485f2a6b0cd5ab575e5c92f74eb856cb2e32160f944 SHA512 f8519f23feebce13cb943ddbdcc2054a9eb617dc918e2b25ad04c9d55e5bbbc9c51c36ac58274e8cf49b601f3bb13c0fe2e00fb41e0454e61d1cd522bb6a4e5e WHIRLPOOL 596e457b5a6d28aac6e20c5b4360a4d97249f3cac36846aad9619b2f7dd83c5d85f8462975ff0534b0f2dcfd1fba649b378d7c0dbde5578e26f2b080901027f0
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJSwHzlAAoJENXLsxwXqFxyQBQP/j4RwPtvUZYAmLe66iNjIF1L
-15tKvcmSNjNKt+7Lrrjc3z35HwsR82O8W4OPuok/o/2LGzkiYz86jpvbTVxMCk26
-DGjU+vfpnQtAUMELACbG+Oawmwfo1jgBZ96m3ujbJcTOGQyivej0iZ88LHKnWQfG
-3ogrAgFWXUqGKF+uvduh65EHc571VGrP6L9N21zSWflPsBtytuRnG2H5ZGz5dZhp
-ofWBZOK/G4LIrbF9qUdnm6dXlW9fT0PkcyiqkrZtQH67ij+NMHC27XOT1ACM8h/O
-NFew7iv+XxHH2J9a7BArrYNQkxC+E/hw169QEv+J+2nLVtFHfoVzIwlZOwU/bDF2
-gMNGpEqNA+c0SPa0IX0mh579+Q8IPtTS/r1OQ9+CFkTZAwr1lKYBmPn7WJGHA8kC
-GJRQCc9HHJ9ulFiG4CnUiRdW5clGDc7OJ3DvoCaJR2TnXBgNkuSxvOV6prc/zZAO
-KauhmqkA9liqUwHJ6RFkDfWqcDpnJ32qR0lJ2CBXBTKlGOmr32Xcl8EuF0sztc5D
-3Kc8eD9VzAuUnccFuWY0mwXr/43ly3u7wOge50V0uMYnkCDT0EP7O69uyyPaMYCQ
-8g4J03uJKBfdNAL1M4IQ6tzsAITpRmL5zQLAojxYBZVxeUV9+mAuojGG7qBGjjVg
-f3XRuQf5YHBG0nQFjcGJ
-=B/Ui
+iQJ8BAEBCABmBQJToJ9dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qbs/qbs-1.2.1.ebuild b/dev-util/qbs/qbs-1.2.1.ebuild
new file mode 100644
index 000000000000..72b258314e9c
--- /dev/null
+++ b/dev-util/qbs/qbs-1.2.1.ebuild
@@ -0,0 +1,93 @@
+# 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 $
+
+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 )"
+
+src_prepare() {
+	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_LIBRARY_DIRNAME="$(get_libdir)"
+		QBS_QBS_LIBRARY_DIRNAME="$(get_libdir)" # typo in src/library_dirname.pri
+	)
+
+	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
+}