commit: 58d027ad283eb3aec4c6b283a20949418785788e Author: hashashini <lavez <AT> gmx <DOT> de> AuthorDate: Sun Sep 14 13:06:01 2014 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Mon Sep 15 22:59:05 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=58d027ad
[qtermwidget,qterminal] Add qt5 support to live ebuilds. --- x11-libs/qtermwidget/metadata.xml | 10 ++++ x11-libs/qtermwidget/qtermwidget-9999.ebuild | 77 ++++++++++++++++++++++++++++ x11-terms/qterminal/qterminal-9999.ebuild | 40 +++++++++++---- 3 files changed, 116 insertions(+), 11 deletions(-) diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml new file mode 100644 index 0000000..a6b07f6 --- /dev/null +++ b/x11-libs/qtermwidget/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <herd>qt</herd> + <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 + 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 new file mode 100644 index 0000000..4f7517f --- /dev/null +++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild @@ -0,0 +1,77 @@ +# 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.2 2014/09/13 16:36:24 kensington Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3} ) + +inherit cmake-utils git-r3 python-r1 + +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 qt4 qt5" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +DEPEND=" + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + )" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake-utils_src_prepare + sed \ + -e 's/int scheme/const QString \&name/' \ + -i pyqt4/qtermwidget.sip || die +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use qt5) + $(cmake-utils_use_build qt4 DESIGNER_PLUGIN) + ) + 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" + + 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_parallel_foreach_impl run_in_build_dir configuration + fi +} + +src_compile() { + cmake-utils_src_compile + + if use python; then + BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl run_in_build_dir emake + fi +} + +src_install() { + cmake-utils_src_install + + if use python; then + BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + BUILD_DIR="${S}/pyqt4" python_parallel_foreach_impl python_optimize + fi +} diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild index 658e33f..7dc83b6 100644 --- a/x11-terms/qterminal/qterminal-9999.ebuild +++ b/x11-terms/qterminal/qterminal-9999.ebuild @@ -2,22 +2,40 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI=5 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 -DESCRIPTION="Qt4-based multitab terminal emulator" -HOMEPAGE="https://github.com/qterminal/"; -EGIT_REPO_URI="git://github.com/qterminal/qterminal.git" +DESCRIPTION="Qt-based multitab terminal emulator" +HOMEPAGE="https://github.com/qterminal/qterminal"; +EGIT_REPO_URI="https://github.com/qterminal/qterminal.git"; -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="" -IUSE="debug" +IUSE="debug qt4 qt5" -DEPEND="dev-qt/qtgui:4 - x11-libs/libqxt - x11-libs/qtermwidget" +REQUIRED_USE="^^ ( qt4 qt5 )" + +DEPEND=" + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + x11-libs/libqxt + ~x11-libs/qtermwidget-${PV}[qt4(+)] + ) + qt5? ( + dev-qt/linguist-tools:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + ~x11-libs/qtermwidget-${PV}[qt5(-)] + )" RDEPEND="${DEPEND}" -#todo: translations +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use qt5) + $(cmake-utils_use_use qt4 SYSTEM_QXT) + ) + cmake-utils_src_configure +}
