[gentoo-commits] repo/proj/libressl:master commit in: x11-misc/qterm/files/, x11-misc/qterm/

[Quentin Retornaz]

commit:     4fdcfd584824bc14d51aa1dde7c8c3b0f7c20e3b
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jul  3 03:47:36 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul  3 17:47:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=4fdcfd58

x11-misc/qterm: Remove package

Works with libressl-3.5.x and qterm-0.7.3-r1::gentoo.

Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 x11-misc/qterm/Manifest                        |  2 -
 x11-misc/qterm/files/qterm-0.7.1-headers.patch | 40 -----------------
 x11-misc/qterm/files/qterm-libressl.patch      | 60 --------------------------
 x11-misc/qterm/metadata.xml                    | 12 ------
 x11-misc/qterm/qterm-0.7.1.ebuild              | 59 -------------------------
 x11-misc/qterm/qterm-0.7.3.ebuild              | 56 ------------------------
 6 files changed, 229 deletions(-)

diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
deleted file mode 100644
index acd52ff..0000000
--- a/x11-misc/qterm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd
-DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046

diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch
deleted file mode 100644
index c442c0a..0000000
--- a/x11-misc/qterm/files/qterm-0.7.1-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/keydialog.h
-+++ b/src/keydialog.h
-@@ -10,6 +10,7 @@
- #ifndef KEYDIALOG_H
- #define KEYDIALOG_H
- 
-+#include <QButtonGroup>
- #include "ui_keydialog.h"
- namespace QTerm
- {
---- a/src/soundconf.h
-+++ b/src/soundconf.h
-@@ -1,6 +1,7 @@
- #ifndef SOUNDCONF_H
- #define SOUNDCONF_H
- 
-+#include <QButtonGroup>
- #include "ui_soundconf.h"
- namespace QTerm
- {
---- a/src/shortcutsdialog.cpp
-+++ b/src/shortcutsdialog.cpp
-@@ -3,6 +3,7 @@
- #include <QKeyEvent>
- #include <QMessageBox>
- #include <QShortcut>
-+#include <QAction>
-
- namespace QTerm {
-
---- a/src/shortcutsdialog.h
-+++ b/src/shortcutsdialog.h
-@@ -3,6 +3,7 @@
-
- #include "ui_shortcutsdialog.h"
- class QShortcut;
-+class QAction;
-
- namespace QTerm{
-

diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch
deleted file mode 100644
index d0e0ae1..0000000
--- a/x11-misc/qterm/files/qterm-libressl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/src/ssh/libcrypto-compat.c
-+++ b/src/ssh/libcrypto-compat.c
-@@ -8,7 +8,7 @@
-  */
- 
- #include "libcrypto-compat.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <string.h>
- #include <openssl/engine.h>
- 
---- a/src/ssh/libcrypto-compat.h
-+++ b/src/ssh/libcrypto-compat.h
-@@ -9,7 +9,7 @@
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
- int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
---- a/src/ssh/socket.cpp
-+++ b/src/ssh/socket.cpp
-@@ -36,7 +36,7 @@
- SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent)
-         : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     OpenSSL_add_all_ciphers();
- #endif
-     m_sessionID = NULL;
-@@ -56,7 +56,7 @@
- 
- SSH2SocketPriv::~SSH2SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_cleanup();
- #endif
- }
-@@ -133,7 +133,7 @@
- #ifdef SSH_DEBUG
-     qDebug() << "init ssh1 session";
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     OpenSSL_add_all_ciphers();
- #endif
-     m_inPacket = new SSH1InBuffer(plainSocket, this);
-@@ -148,7 +148,7 @@
- 
- SSH1SocketPriv::~SSH1SocketPriv()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_cleanup();
- #endif
- }

diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
deleted file mode 100644
index 59fe2d6..0000000
--- a/x11-misc/qterm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@g.o</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">qterm/qterm</remote-id>
-		<remote-id type="sourceforge">qterm</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
deleted file mode 100644
index 7feb999..0000000
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A BBS client based on Qt"
-HOMEPAGE="https://github.com/qterm/qterm"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	x11-libs/libX11
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qthelp:5
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-libressl.patch
-	"${FILESDIR}"/${P}-headers.patch
-)
-DOCS=( README.rst RELEASE_NOTES TODO )
-
-src_prepare() {
-	# file collision with sys-cluster/torque, bug #176533
-	sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt
-	sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT5=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild
deleted file mode 100644
index 5e1d0e4..0000000
--- a/x11-misc/qterm/qterm-0.7.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A BBS client based on Qt"
-HOMEPAGE="https://github.com/qterm/qterm"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	x11-libs/libX11
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qthelp:5
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${PN}-libressl.patch )
-DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt )
-
-src_prepare() {
-	# file collision with sys-cluster/torque, bug #176533
-	sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt
-	sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT5=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}