[gentoo-commits] repo/gentoo:master commit in: app-text/kchmviewer/files/, app-text/kchmviewer/, profiles/

[gentoo-commits] repo/gentoo:master commit in: app-text/kchmviewer/files/, app-text/kchmviewer/, profiles/

[Andreas Sturmlechner]

commit:     5fc891ec35728d0e081af0cd4eb1dd39cf4e05eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 23:04:46 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 23:05:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc891ec

app-text/kchmviewer: Remove last-rited package

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kchmviewer/Manifest                       |  1 -
 .../files/kchmviewer-7.7-force-qtwebkit.patch      | 26 -------------
 .../files/kchmviewer-7.7-underlinking.patch        | 11 ------
 app-text/kchmviewer/kchmviewer-7.7-r1.ebuild       | 45 ----------------------
 app-text/kchmviewer/metadata.xml                   | 21 ----------
 profiles/package.mask                              |  6 ---
 6 files changed, 110 deletions(-)

diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
deleted file mode 100644
index 6c498dc97cc..00000000000
--- a/app-text/kchmviewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070

diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
deleted file mode 100644
index 897c62a998c..00000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine.
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -113,21 +113,11 @@
- }
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
--    # Qt 5
--    greaterThan(QT_MINOR_VERSION, 5) {
--        # Qt 5.6+
--        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
--        QT += webengine webenginewidgets
--        DEFINES += USE_WEBENGINE
--        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
--        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
--    } else {
-         # Qt 5.0-5.5
-         QT += webkit webkitwidgets
-         DEFINES += USE_WEBKIT
-         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
-         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
--    }
- } else {
-     message("Qt4 is not supported anymore, please do not report any errors")
-     QT += webkit webkitwidgets

diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
deleted file mode 100644
index 75bfed89cbd..00000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -108,7 +108,7 @@
-     HEADERS += dbus_interface.h
-     SOURCES += dbus_interface.cpp
-     CONFIG += dbus
--    LIBS += ../lib/libebook/libebook.a
-+    LIBS += ../lib/libebook/libebook.a -lchm -lzip
-     POST_TARGETDEPS += ../lib/libebook/libebook.a
- }
- 

diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
deleted file mode 100644
index 7864d2f6a30..00000000000
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Feature rich chm file viewer, based on Qt"
-HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/chmlib
-	dev-libs/libzip:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-force-qtwebkit.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dodoc ChangeLog DBUS-bindings FAQ README
-	doicon packages/kchmviewer.png
-	dobin bin/kchmviewer
-	domenu packages/kchmviewer.desktop
-}

diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
deleted file mode 100644
index 9826a818187..00000000000
--- a/app-text/kchmviewer/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
-		widget library with optional KDE libraries. It does not require KDE, but may
-		be compiled with full KDE support, including KDE widgets and KIO/KHTML. The
-		main advantage of KchmViewer is extra support for non-English languages.
-		Unlike other viewers, KchmViewer in most cases is able to detect help file
-		encoding, correctly shows tables of context of Russian, Korean, Chinese and
-		Japanese help files, and does correct search in non-English help files
-		(search for MBCS languages - ja/ko/ch is still in progress). 
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gyunaev/kchmviewer</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 0d79365eb6d..a9c218cd25e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -286,12 +286,6 @@ sys-apps/hwdata-gentoo
 sys-apps/hwsetup
 sys-libs/libkudzu
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-18)
-# Depends on deprecated QtWebKit, dead upstream.
-# Alternatives: kde-apps/okular[chm], app-text/xchm
-# Removal in 30 days.
-app-text/kchmviewer
-
 # Michał Górny <mgorny@gentoo.org> (2020-11-18)
 # Upstream has switched to aiobotocore.  It's a huge hack that requires
 # a very specific botocore version, currently 3 months old.  Given that