dev-python/qtermwidget -> dev-qt/qtermwidget

9 files changed, 161 insertions, 119 deletions

diff --git a/dev-python/qtermwidget/Manifest b/dev-python/qtermwidget/Manifest
deleted file mode 100644
index 96ce6027..00000000
--- a/dev-python/qtermwidget/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtermwidget-0.8.0.tar.xz 160904 SHA256 ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169 SHA512 2e1354b457d49ae2ad37479259549b279f8bb381ce6bce2d18eb3f845af615e796a9d0bd143156b485a1b2abeffc83e686d85f9ee157611b20c8c1bb3254fe82 WHIRLPOOL dfc8f6ae99fa30bb3a66e074ae6a0b817d5a97596cd1987793f5c2a475a04fef2d0643d7baeb543274668571974a23e0658a7c045541abe5dbd1ffe6e19b0e63
diff --git a/dev-qt/qtermwidget/Manifest b/dev-qt/qtermwidget/Manifest
new file mode 100644
index 00000000..971e206f
--- /dev/null
+++ b/dev-qt/qtermwidget/Manifest
@@ -0,0 +1 @@
+DIST qtermwidget-0.7.1.tar.xz 158172 SHA256 82b2f4d7cb58a34e866cf37b512e313f5f01c1d8a84ba532f0adf50e6d834d45 SHA512 a8660ca5355103cf9d9f72ec5213f3c04d02dff44ceaa26297960def07335596eba6b125a7b3ca1a02f8c19a99edffdee68c57ff0c3f357cc3df149d3e9c5c99 WHIRLPOOL d1cf25a9dcb173a96e779b8b382b7705e200aab9db351e22f3b78fe1d8427a831a2e505fa76159399945dc569877941a00a12809bbcfa9e7e8d1ffbadb5228a8
diff --git a/dev-qt/qtermwidget/files/qtermwidget-0.7.1-pyqt5.7-compat.patch b/dev-qt/qtermwidget/files/qtermwidget-0.7.1-pyqt5.7-compat.patch
new file mode 100644
index 00000000..dc2e27b9
--- /dev/null
+++ b/dev-qt/qtermwidget/files/qtermwidget-0.7.1-pyqt5.7-compat.patch
@@ -0,0 +1,155 @@
+diff -Nur a/pyqt/config.py b/pyqt/config.py
+--- a/pyqt/config.py	2016-12-21 17:51:55.000000000 +0000
++++ b/pyqt/config.py	2017-12-04 00:32:48.237068001 +0000
+@@ -5,66 +5,74 @@
+ import site
+ import pprint
+ from distutils import sysconfig
+-import pyqtconfig
+ from PyQt5 import QtCore
+ import PyQt5
+ 
++
+ class Configuration(sipconfig.Configuration):
+-	"""The class that represents PyQt configuration values.
+-	"""
+-	def getEnv(self,name, default):
+-		return os.environ.get(name) or default
+-
+-	def __init__(self):
+-		qtconfig = subprocess.check_output(["/usr/lib64/qt5/bin/qmake", "-query"], universal_newlines=True)
+-		qtconfig = dict(x.split(":", 1) for x in qtconfig.splitlines())
+-
+-		self.pyQtIncludePath = self.getEnv('PYQT_INCLUDE_PATH','/usr/share/sip/PyQt5' )
+-
+-		pyqtconfig = {
+-			"pyqt_config_args":   "--confirm-license -v "+str(self.pyQtIncludePath)+" --qsci-api -q /usr/lib64/qt5/bin/qmake",
+-			"pyqt_version":       QtCore.PYQT_VERSION,
+-			"pyqt_version_str":   QtCore.PYQT_VERSION_STR,
+-			"pyqt_bin_dir":       PyQt5.__path__[0],
+-			"pyqt_mod_dir":       PyQt5.__path__[0],
+-			"pyqt_sip_dir":       str(self.pyQtIncludePath),
+-			"pyqt_modules":       "QtCore QtGui QtWidgets",   #... and many more
+-			"pyqt_sip_flags":     QtCore.PYQT_CONFIGURATION['sip_flags'],
+-			"qt_version":         QtCore.QT_VERSION,
+-			"qt_edition":         "free",
+-			"qt_winconfig":       "shared",
+-			"qt_framework":       0,
+-			"qt_threaded":        1,
+-			"qt_dir":             qtconfig['QT_INSTALL_PREFIX'],
+-			"qt_data_dir":        qtconfig['QT_INSTALL_DATA'],
+-			"qt_archdata_dir":    qtconfig['QT_INSTALL_DATA'],
+-			"qt_inc_dir":         qtconfig['QT_INSTALL_HEADERS'],
+-			"qt_lib_dir":         qtconfig['QT_INSTALL_LIBS']
+-		}
+-
+-		macros = sipconfig._default_macros.copy()
+-		macros['INCDIR_QT'] = qtconfig['QT_INSTALL_HEADERS']
+-		macros['LIBDIR_QT'] = qtconfig['QT_INSTALL_LIBS']
+-		macros['MOC'] = os.path.join(qtconfig['QT_INSTALL_BINS'], 'moc')
++    """The class that represents PyQt configuration values.
++    """
++
++    def getEnv(self, name, default):
++        return os.environ.get(name) or default
+ 
+-		sipconfig.Configuration.__init__(self, [pyqtconfig])
+-		self.set_build_macros(macros)
++    def __init__(self):
++        qmake_bin = subprocess.check_output(
++            ["which", "qmake"], universal_newlines=True).strip(' \t\n\r')
++        qtconfig = subprocess.check_output(
++            [qmake_bin, "-query"], universal_newlines=True)
++        qtconfig = dict(x.split(":", 1) for x in qtconfig.splitlines())
++
++        self.pyQtIncludePath = self.getEnv(
++            'PYQT_INCLUDE_PATH', '/usr/share/sip/PyQt5')
++
++        pyqtconfig = {
++            "pyqt_config_args":   "--confirm-license -v " + str(self.pyQtIncludePath) + " --qsci-api -q " + qmake_bin,
++            "pyqt_version":       QtCore.PYQT_VERSION,
++            "pyqt_version_str":   QtCore.PYQT_VERSION_STR,
++            "pyqt_bin_dir":       PyQt5.__path__[0],
++            "pyqt_mod_dir":       PyQt5.__path__[0],
++            "pyqt_sip_dir":       str(self.pyQtIncludePath),
++            "pyqt_modules":       "QtCore QtGui QtWidgets",  # ... and many more
++            "pyqt_sip_flags":     QtCore.PYQT_CONFIGURATION['sip_flags'],
++            "qt_version":         QtCore.QT_VERSION,
++            "qt_edition":         "free",
++            "qt_winconfig":       "shared",
++            "qt_framework":       0,
++            "qt_threaded":        1,
++            "qt_dir":             qtconfig['QT_INSTALL_PREFIX'],
++            "qt_data_dir":        qtconfig['QT_INSTALL_DATA'],
++            "qt_archdata_dir":    qtconfig['QT_INSTALL_DATA'],
++            "qt_inc_dir":         qtconfig['QT_INSTALL_HEADERS'],
++            "qt_lib_dir":         qtconfig['QT_INSTALL_LIBS']
++        }
++
++        macros = sipconfig._default_macros.copy()
++        macros['INCDIR_QT'] = qtconfig['QT_INSTALL_HEADERS']
++        macros['LIBDIR_QT'] = qtconfig['QT_INSTALL_LIBS']
++        macros['MOC'] = os.path.join(qtconfig['QT_INSTALL_BINS'], 'moc')
+ 
++        sipconfig.Configuration.__init__(self, [pyqtconfig])
++        self.set_build_macros(macros)
+ 
+-## The name of the SIP build file generated by SIP and used by the build system.
++
++# The name of the SIP build file generated by SIP and used by the build system.
+ build_file = "qtermwidget.sbf"
+ 
+ # Get the SIP configuration information.
+ config = Configuration()
+ 
+ # Run SIP to generate the build_file
+-os.system(" ".join([config.sip_bin, '-I' , str(config.pyQtIncludePath), str(config.pyqt_sip_flags), "-b", build_file,"-o", "-c", ". " " qtermwidget.sip"]))
++os.system(" ".join([config.sip_bin, '-I', str(config.pyQtIncludePath), str(
++    config.pyqt_sip_flags), "-b", build_file, "-o", "-c", ". " " qtermwidget.sip"]))
+ 
+ installs = []
+-installs.append(["qtermwidget.sip", os.path.join(config.pyqt_sip_dir,"qtermwidget")])
++installs.append(["qtermwidget.sip", os.path.join(
++    config.pyqt_sip_dir, "qtermwidget")])
+ installs.append(["qtermwidgetconfig.py", config.pyqt_mod_dir])
+ 
+-makefile = sipconfig.SIPModuleMakefile( configuration = config, build_file = build_file, installs = installs,  qt=["QtCore" ,"QtGui", "QtWidgets"] )
++makefile = sipconfig.SIPModuleMakefile(
++    configuration=config, build_file=build_file, installs=installs,  qt=["QtCore", "QtGui", "QtWidgets"])
+ 
+ # Add the library we are wrapping.  The name doesn't include any platform
+ # specific prefixes or extensions (e.g. the "lib" prefix on UNIX, or the
+@@ -73,20 +81,23 @@
+ makefile.extra_lib_dirs.append("..")
+ makefile.extra_libs = ["qtermwidget5"]
+ 
++# Support for C++11
++makefile.extra_cxxflags.append('-std=c++11')
++
+ # Generate the Makefile itself.
+ makefile.generate()
+ 
+ content = {
+-	# Publish where the SIP specifications for this module will be
+-	# installed.
+-	"qtermwidget_sip_dir": config.pyqt_sip_dir,
+-
+-	# Publish the set of SIP flags needed by this module.  As these are the
+-	# same flags needed by the qt module we could leave it out, but this
+-	# allows us to change the flags at a later date without breaking
+-	# scripts that import the configuration module.
+-	"qtermwidget_sip_flags": config.pyqt_sip_flags
+-	}
++    # Publish where the SIP specifications for this module will be
++    # installed.
++    "qtermwidget_sip_dir": config.pyqt_sip_dir,
++
++    # Publish the set of SIP flags needed by this module.  As these are the
++    # same flags needed by the qt module we could leave it out, but this
++    # allows us to change the flags at a later date without breaking
++    # scripts that import the configuration module.
++    "qtermwidget_sip_flags": config.pyqt_sip_flags
++}
+ 
+ # This creates the qtermwidgetconfig.py module from the qtermwidgetconfig.py.in
+ # template and the dictionary.
diff --git a/dev-python/qtermwidget/qtermwidget-0.8.0.ebuild b/dev-qt/qtermwidget/qtermwidget-0.7.1.ebuild
index 46117593..127e975f 100644
--- a/dev-python/qtermwidget/qtermwidget-0.8.0.ebuild
+++ b/dev-qt/qtermwidget/qtermwidget-0.7.1.ebuild
@@ -27,6 +27,11 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${PV}/pyqt"
 
+src_prepare () {
+	default
+	eapply -p2 "${FILESDIR}"/${P}-pyqt5.7-compat.patch
+}
+
 src_compile () {
 	python_foreach_impl python config.py
 	emake || die
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
deleted file mode 100644
index 96ce6027..00000000
--- a/x11-libs/qtermwidget/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtermwidget-0.8.0.tar.xz 160904 SHA256 ef01c2a2bedff008578b65efd47b3fff8e542dfcdf9779b547533c9c75825169 SHA512 2e1354b457d49ae2ad37479259549b279f8bb381ce6bce2d18eb3f845af615e796a9d0bd143156b485a1b2abeffc83e686d85f9ee157611b20c8c1bb3254fe82 WHIRLPOOL dfc8f6ae99fa30bb3a66e074ae6a0b817d5a97596cd1987793f5c2a475a04fef2d0643d7baeb543274668571974a23e0658a7c045541abe5dbd1ffe6e19b0e63
diff --git a/x11-libs/qtermwidget/qtermwidget-0.8.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.8.0.ebuild
deleted file mode 100644
index 5d568599..00000000
--- a/x11-libs/qtermwidget/qtermwidget-0.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
deleted file mode 100644
index 81a09841..00000000
--- a/x11-terms/qterminal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qterminal-0.8.0.tar.xz 104780 SHA256 a741a8688e696537c3bb2dfaa632b9dcc11f3672b9c6a031354b465de5fd987a SHA512 c2046727900bfa8f389a90a38c3843131f324af0b2f52810966f5df624c74fee31c8825b7bd86d0b44c896d276fff6ffbf17dd9796143f5e3940b4ba33dd98af WHIRLPOOL c610024c074faa7869c188e6826e5626c0f2e864723b1d2ea9f414415f86a402388b110e27cc29bfe027e24892acfc814299e8756d8282346b47b42cc5a5bfca
diff --git a/x11-terms/qterminal/files/qterminal-0.8.0-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-0.8.0-no-liblxqt.patch
deleted file mode 100644
index a35081a5..00000000
--- a/x11-terms/qterminal/files/qterminal-0.8.0-no-liblxqt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-10-21 20:44:07.000000000 +0100
-+++ b/CMakeLists.txt	2017-12-03 22:47:14.023310304 +0000
-@@ -24,9 +24,9 @@
-     find_package(Qt5DBus)
- endif()
- find_package(QTermWidget5 REQUIRED)
--find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
--include(LXQtCompilerSettings NO_POLICY_SCOPE)
-+#find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
-+#include(LXQtTranslateTs)
-+#include(LXQtCompilerSettings NO_POLICY_SCOPE)
- message(STATUS "Qt version: ${Qt5Core_VERSION}")
- 
- # TODO remove Qxt
-@@ -109,23 +109,23 @@
- qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
- qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
- qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
--lxqt_translate_ts(QTERM_QM
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${QTERM_SRC}
--        ${QTERM_UI_SRC}
--        ${QTERM_MOC_SRC}
--    TRANSLATION_DIR "src/translations"
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--)
-+#lxqt_translate_ts(QTERM_QM
-+#    UPDATE_TRANSLATIONS
-+#        ${UPDATE_TRANSLATIONS}
-+#    SOURCES
-+#        ${QTERM_SRC}
-+#        ${QTERM_UI_SRC}
-+#        ${QTERM_MOC_SRC}
-+#    TRANSLATION_DIR "src/translations"
-+#    PULL_TRANSLATIONS
-+#        ${PULL_TRANSLATIONS}
-+#    CLEAN_TRANSLATIONS
-+#        ${CLEAN_TRANSLATIONS}
-+#    TRANSLATIONS_REPO
-+#        ${TRANSLATIONS_REPO}
-+#    TRANSLATIONS_REFSPEC
-+#        ${TRANSLATIONS_REFSPEC}
-+#)
- 
- include_directories(
-     "${PROJECT_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-0.8.0.ebuild b/x11-terms/qterminal/qterminal-0.8.0.ebuild
deleted file mode 100644
index 7092e899..00000000
--- a/x11-terms/qterminal/qterminal-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://github.com/lxde/qterminal"
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	~x11-libs/qtermwidget-${PV}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-no-liblxqt.patch" )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}