[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/relational/, sci-mathematics/relational/files/

[Andreas Sturmlechner]

commit:     d0dc04c20c3f6148733c46a22d19c4feeeb41994
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 22:01:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 22:05:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0dc04c2

sci-mathematics/relational: Drop dependency on dev-qt/PyQt5[webkit]

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/relational-2.5-no-qtwebkit.patch         | 67 ++++++++++++++++++++++
 .../relational/relational-2.5-r2.ebuild            | 45 +++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch b/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch
new file mode 100644
index 00000000000..092b4a58e37
--- /dev/null
+++ b/sci-mathematics/relational/files/relational-2.5-no-qtwebkit.patch
@@ -0,0 +1,67 @@
+From bcdf81cdcd7fe531e11cb1db55e63468b7d73d47 Mon Sep 17 00:00:00 2001
+From: Salvo 'LtWorf' Tomaselli <tiposchi@×××××××.it>
+Date: Sat, 26 Aug 2017 17:51:04 +0200
+Subject: [PATCH] Remove embedded browser with website
+
+---
+ relational_gui/about.py | 32 --------------------------------
+ 1 file changed, 32 deletions(-)
+
+diff --git a/relational_gui/about.py b/relational_gui/about.py
+index 4c03c99..55abfc9 100644
+--- a/relational_gui/about.py
++++ b/relational_gui/about.py
+@@ -18,12 +18,6 @@
+ 
+ from PyQt5 import QtCore, QtGui, QtWidgets
+ 
+-try:  # If QtWebKit is available, uses it
+-    from PyQt5 import QtWebKitWidgets
+-    webk = True
+-except:
+-    webk = False
+-
+ version = 0
+ 
+ 
+@@ -85,31 +79,7 @@ def setupUi(self, Dialog):
+         self.tab_2.setObjectName("tab_2")
+         self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.tab_2)
+         self.verticalLayout_7.setObjectName("verticalLayout_7")
+-        if (webk):
+-            self.webView = QtWebKitWidgets.QWebView(self.tab_2)
+-            self.webView.setUrl(
+-                QtCore.QUrl("http://ltworf.github.io/relational/allowed_expressions.html"))
+-            self.webView.setObjectName("webView")
+-            self.verticalLayout_7.addWidget(self.webView)
+-        else:
+-            self.webLink = QtWidgets.QLabel(self.groupBox)
+-            self.webLink.setFont(font)
+-            self.webLink.setObjectName("lblLink")
+-            self.webLink.setText(QtWidgets.QApplication.translate(
+-                "Dialog", "<a href=\"http://ltworf.github.io/relational/\">Relational's website</a>", None,))
+-            self.webLink.setOpenExternalLinks(True)
+-            self.webLink.setTextFormat(QtCore.Qt.AutoText)
+-            self.webLink.setTextInteractionFlags(
+-                QtCore.Qt.LinksAccessibleByKeyboard |
+-                QtCore.Qt.LinksAccessibleByMouse |
+-                QtCore.Qt.TextBrowserInteraction |
+-                QtCore.Qt.TextSelectableByKeyboard |
+-                QtCore.Qt.TextSelectableByMouse
+-            )
+-
+-            self.verticalLayout_7.addWidget(self.webLink)
+ 
+-        self.tabWidget.addTab(self.tab_2, "")
+         self.verticalLayout_2.addWidget(self.tabWidget)
+         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
+         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+@@ -294,8 +264,6 @@ def retranslateUi(self, Dialog):
+                                                                "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read &lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;. </p></body></html>", None))
+         self.tabWidget.setTabText(self.tabWidget.indexOf(self.License), QtWidgets.QApplication.translate(
+             "Dialog", "License", None))
+-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtWidgets.QApplication.translate(
+-            "Dialog", "Docs", None))
+ 
+ 
+ if __name__ == "__main__":

diff --git a/sci-mathematics/relational/relational-2.5-r2.ebuild b/sci-mathematics/relational/relational-2.5-r2.ebuild
new file mode 100644
index 00000000000..0e073dfe099
--- /dev/null
+++ b/sci-mathematics/relational/relational-2.5-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+DESCRIPTION="Educational tool for relational algebra"
+HOMEPAGE="https://ltworf.github.io/relational/"
+SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-no-qtwebkit.patch" )
+
+src_prepare() {
+	default
+
+	sed -i -e '/^Terminal=/ s/0/false/' \
+		-e '/^Keywords=/ s/$/;/' \
+		relational.desktop || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" install-{relational-cli,python3-relational,relational}
+	python_optimize
+
+	dodoc CHANGELOG complexity CREDITS README.md
+}