Re-enable python bindings; add qt5 support.

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

3 files changed, 59 insertions, 50 deletions

diff --git a/x11-libs/qtermwidget/ChangeLog b/x11-libs/qtermwidget/ChangeLog
index abdfdc2c3179..1541bc50328d 100644
--- a/x11-libs/qtermwidget/ChangeLog
+++ b/x11-libs/qtermwidget/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2014/12/15 20:44:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/ChangeLog,v 1.12 2014/12/15 21:17:34 pesa Exp $
+
+  15 Dec 2014; Davide Pesavento <pesa@gentoo.org> metadata.xml,
+  qtermwidget-9999.ebuild:
+  Re-enable python bindings; add qt5 support.
 
   15 Dec 2014; Davide Pesavento <pesa@gentoo.org> qtermwidget-0.4.0.37.ebuild,
   qtermwidget-0.4.0.ebuild, qtermwidget-9999.ebuild:
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
index 3daad8badd98..a6b07f6b87ee 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -5,6 +5,6 @@
 	<longdescription lang="en">
 	QTermWidget is an opensource project based on KDE4 Konsole application.
 	The main goal of this project is to provide unicode-enabled, embeddable
-	Qt4 widget for using as a built-in console or terminal emulation widget.
+	Qt widget for using as a built-in console or terminal emulation widget.
 	</longdescription>
 </pkgmetadata>
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index aecc387a23d0..857460da61fd 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,62 +1,67 @@
 # 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.3 2014/12/15 20:44:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtermwidget/qtermwidget-9999.ebuild,v 1.4 2014/12/15 21:17:34 pesa Exp $
 
-EAPI="5"
+EAPI=5
 
-# Uncomment python related code when upstream updates their bindings
-#PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python{2_7,3_3} )
 
-inherit cmake-utils git-r3 #python-r1
+inherit cmake-utils python-r1 git-r3
 
-DESCRIPTION="Qt4 terminal emulator widget"
-HOMEPAGE="https://github.com/qterminal/"
-EGIT_REPO_URI="git://github.com/qterminal/qtermwidget.git"
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/qterminal/qtermwidget"
+EGIT_REPO_URI="https://github.com/qterminal/qtermwidget.git"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug" # python
+IUSE="debug python qt5"
 
 DEPEND="
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	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_prepare() {
-#	cmake-utils_src_prepare
-#	sed \
-#		-e 's/int scheme/const QString \&name/' \
-#		-i pyqt4/qtermwidget.sip || die "sed qtermwidget.sip failed"
-#}
-#
-#src_configure() {
-#	cmake-utils_src_configure
-#
-#	# cmake-utils.eclass exports BUILD_DIR only after configure phase, so sed it here
-#	sed \
-#		-e "/extra_lib_dirs/s@\.\.@${BUILD_DIR}@" \
-#		-e '/extra_libs/s/qtermwidget/qtermwidget4/' \
-#		-i pyqt4/config.py || die "sed config.py failed"
-#
-#	configuration() {
-#		${PYTHON} config.py || die "${PYTHON} config.py failed"
-#	}
-#	use python && BUILD_DIR="${S}/pyqt4" python_copy_sources
-#	use python && BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl run_in_build_dir configuration || die "python configuration failed"
-#}
-#
-#src_compile() {
-#	cmake-utils_src_compile
-#
-#	use python && BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl run_in_build_dir emake || die "python compilation failed"
-#}
-#
-#src_install() {
-#	cmake-utils_src_install
-#
-#	use python && BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl run_in_build_dir emake DESTDIR="${D}" install || die "python installation failed"
-#	use python && BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl python_optimize || die "python byte-compilation failed"
-#}
+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
+}