version bump (bug #523118)

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

3 files changed, 41 insertions, 69 deletions

diff --git a/x11-libs/qtermwidget/ChangeLog b/x11-libs/qtermwidget/ChangeLog
index 1541bc50328d..e88af393e178 100644
--- a/x11-libs/qtermwidget/ChangeLog
+++ b/x11-libs/qtermwidget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qtermwidget
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/ChangeLog,v 1.12 2014/12/15 21:17:34 pesa Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/ChangeLog,v 1.13 2015/02/03 09:02:33 yngwin Exp $
+
+*qtermwidget-0.6.0 (03 Feb 2015)
+
+  03 Feb 2015; Ben de Groot <yngwin@gentoo.org> +qtermwidget-0.6.0.ebuild,
+  -qtermwidget-9999.ebuild:
+  version bump (bug #523118)
 
   15 Dec 2014; Davide Pesavento <pesa@gentoo.org> metadata.xml,
   qtermwidget-9999.ebuild:
diff --git a/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
new file mode 100644
index 000000000000..22a8322c1cce
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild,v 1.1 2015/02/03 09:02:33 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/qterminal/qtermwidget"
+SRC_URI="https://github.com/qterminal/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+	qt4? ( dev-qt/designer:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_build qt4 DESIGNER_PLUGIN)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
deleted file mode 100644
index 857460da61fd..000000000000
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/qtermwidget-9999.ebuild,v 1.4 2014/12/15 21:17:34 pesa Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit cmake-utils python-r1 git-r3
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/qterminal/qtermwidget"
-EGIT_REPO_URI="https://github.com/qterminal/qtermwidget.git"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug python qt5"
-
-DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	!qt5? (
-		dev-qt/designer:4
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use qt5)
-		$(cmake-utils_use_build !qt5 DESIGNER_PLUGIN)
-	)
-	cmake-utils_src_configure
-
-	# cmake-utils.eclass exports BUILD_DIR only after configure phase, so sed it here
-	sed -i -e "/extra_lib_dirs/s@\.\.@${BUILD_DIR}@" pyqt4/config.py || die
-
-	if use python; then
-		configuration() {
-			"${PYTHON}" config.py || die "${PYTHON} config.py failed"
-		}
-		BUILD_DIR="${S}/pyqt4" python_copy_sources
-		BUILD_DIR="${S}/pyqt4" python_foreach_impl run_in_build_dir configuration
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use python; then
-		BUILD_DIR="${S}/pyqt4" python_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use python; then
-		BUILD_DIR="${S}/pyqt4" python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		BUILD_DIR="${S}/pyqt4" python_foreach_impl python_optimize
-	fi
-}