Version bump. Remove old.

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 8 insertions, 97 deletions

diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index 53dcf9a31079..ab658f8c1630 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.5 2014/09/19 13:14:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.6 2014/09/19 13:21:57 pesa Exp $
+
+*qbs-1.3.1 (19 Sep 2014)
+
+  19 Sep 2014; Davide Pesavento <pesa@gentoo.org> +qbs-1.3.1.ebuild,
+  -qbs-1.2.2.ebuild, -qbs-1.3.0.ebuild:
+  Version bump. Remove old.
 
   19 Sep 2014; Davide Pesavento <pesa@gentoo.org> qbs-1.3.0.ebuild:
   Fix build with USE=qt5. Patch by Alexander Akulich in bug 523218.
diff --git a/dev-util/qbs/qbs-1.2.2.ebuild b/dev-util/qbs/qbs-1.2.2.ebuild
deleted file mode 100644
index 9aa641f77bfe..000000000000
--- a/dev-util/qbs/qbs-1.2.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.2.ebuild,v 1.1 2014/07/31 23:36:22 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 +qt4 qt5 test"
-
-RDEPEND="
-	qt4? (
-		>=dev-qt/qtcore-4.8:4
-		>=dev-qt/qtgui-4.8:4
-		>=dev-qt/qtscript-4.8:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtscript:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml: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() {
-	sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
-		src/plugins/plugins.pri || die
-
-	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)"
-	)
-
-	if use qt4; then
-		eqmake4 "${myqmakeargs[@]}"
-	elif use qt5; then
-		eqmake5 "${myqmakeargs[@]}"
-	fi
-}
-
-src_test() {
-	export HOME=${T}
-	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-setup-toolchains --detect || die
-	"${S}"/bin/qbs-setup-qt "${qmakepath}" 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.3.0.ebuild b/dev-util/qbs/qbs-1.3.1.ebuild
index 4674544432e5..4dfc77f54fda 100644
--- a/dev-util/qbs/qbs-1.3.0.ebuild
+++ b/dev-util/qbs/qbs-1.3.1.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.3.0.ebuild,v 1.2 2014/09/19 13:14:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.1.ebuild,v 1.1 2014/09/19 13:21:57 pesa Exp $
 
 EAPI=5