commit: e855dcf51de136548503dc4da10debf3b47a6b3e Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 10:06:36 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 10:10:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e855dcf5
dev-db/tora: treeclean Closes: https://bugs.gentoo.org/914918 (pkgremoved) Closes: https://bugs.gentoo.org/917408 (pkgremoved) Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-db/tora/Manifest | 1 - dev-db/tora/files/tora-3.2-qt-includes.patch | 61 ------------------- dev-db/tora/metadata.xml | 15 ----- dev-db/tora/tora-3.2-r2.ebuild | 87 ---------------------------- profiles/package.mask | 5 -- 5 files changed, 169 deletions(-) diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest deleted file mode 100644 index 282b353face6..000000000000 --- a/dev-db/tora/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a diff --git a/dev-db/tora/files/tora-3.2-qt-includes.patch b/dev-db/tora/files/tora-3.2-qt-includes.patch deleted file mode 100644 index 6126cdf71ca9..000000000000 --- a/dev-db/tora/files/tora-3.2-qt-includes.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/editor/tosqltext.cpp -+++ b/src/editor/tosqltext.cpp -@@ -50,6 +50,7 @@ - #include <QToolTip> - #endif - -+#include <QMenu> - #include <QListWidget> - #include <QVBoxLayout> - #include <QApplication> ---- a/src/main/tooraclesetting.cpp -+++ b/src/main/tooraclesetting.cpp -@@ -45,6 +45,8 @@ - #include "core/toqvalue.h" - #include "core/toquery.h" - -+#include <QtGui/qvalidator.h> -+ - toOracleSetting::toOracleSetting(QWidget *parent) - : QWidget(parent) - , toSettingTab("database.html#oracle") ---- a/src/tools/tobrowser.cpp -+++ b/src/tools/tobrowser.cpp -@@ -65,6 +65,7 @@ - #include <QInputDialog> - #include <QSplitter> - #include <QToolBar> -+#include <QButtonGroup> - - #include "icons/addindex.xpm" - #include "icons/addtable.xpm" ---- a/src/tools/toscript.cpp -+++ b/src/tools/toscript.cpp -@@ -56,6 +56,7 @@ - #include <QSplitter> - #include <QtCore/QTextStream> - #include <QToolBar> -+#include <QButtonGroup> - - #include "icons/execute.xpm" - #include "icons/toscript.xpm" ---- a/src/tools/tosecurity.cpp -+++ b/src/tools/tosecurity.cpp -@@ -46,6 +46,7 @@ - - #include <QSplitter> - #include <QToolBar> -+#include <QButtonGroup> - - #include "icons/addrole.xpm" - #include "icons/adduser.xpm" ---- a/src/widgets/tohelp.cpp -+++ b/src/widgets/tohelp.cpp -@@ -43,6 +43,7 @@ - #include "core/toconfiguration.h" - #include "ts_log/ts_log_utils.h" - -+#include <QAction> - #include <QMessageBox> - #include <QtCore/QSettings> - diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml deleted file mode 100644 index 6db883b8f1dc..000000000000 --- a/dev-db/tora/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - TOra is a Toolkit for Oracle which aims to help the DBA or developer of - database application. Features PL/SQL debugger, SQL worksheet with syntax - highlighting, DB browser and a comprehensive set of DBA tools. Also works - with mySQL and postgreSQL. - </longdescription> - <upstream> - <remote-id type="sourceforge">tora</remote-id> - <remote-id type="github">tora-tool/tora</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-db/tora/tora-3.2-r2.ebuild b/dev-db/tora/tora-3.2-r2.ebuild deleted file mode 100644 index 3749b42c889d..000000000000 --- a/dev-db/tora/tora-3.2-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop toolchain-funcs xdg - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/tora-tool/tora"; - inherit git-r3 -else - SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" -HOMEPAGE="https://github.com/tora-tool/tora/wiki"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc mysql oracle +postgres" -REQUIRED_USE="|| ( mysql oracle postgres )" - -RDEPEND=" - dev-libs/ferrisloki - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5[mysql?,postgres?] - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( dev-db/oracle-instantclient ) - postgres? ( dev-db/postgresql:* ) -" -DEPEND=" - ${RDEPEND} - dev-libs/boost -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( "${FILESDIR}"/${P}-qt-includes.patch ) - -src_prepare() { - cmake_src_prepare - - # fixed in master, only care about recent qscintilla lib name: - sed -e "/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/" \ - -i cmake/modules/FindQScintilla.cmake || die "Failed to fix FindQScintilla.cmake" - - rm -r extlibs/{loki,qscintilla2} || die # ferrisloki, bug #383109 - - sed -e "/COPYING/ d" \ - -i CMakeLists.txt || die "Removal of COPYING file failed" - - # bug 547520 - grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ - die 'Removal of $$ORIGIN failed' -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DB2=OFF - -DQT5_BUILD=ON - -DWANT_INTERNAL_LOKI=OFF - -DWANT_INTERNAL_QSCINTILLA=OFF - -DWANT_RPM=OFF - -DLOKI_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir ferrisloki || die)/libferrisloki.so" - -DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki || die)/FerrisLoki" - $(cmake_use_find_package doc Doxygen) - -DENABLE_ORACLE=$(usex oracle) - -DUSE_PCH=OFF - -DENABLE_PGSQL=$(usex postgres) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - doicon src/icons/tora.xpm || die - domenu src/tora.desktop || die -} diff --git a/profiles/package.mask b/profiles/package.mask index cff4be13e65c..2bc0029d36ab 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -219,11 +219,6 @@ dev-qt/qtstyleplugins # Removal on 2025-02-08. app-text/fbreader -# Andreas Sturmlechner <[email protected]> (2025-01-09) -# Last release from 2017; fails to build w/ GCC-14 and qscintilla-2.14.1. -# Depends on Qt5. Bugs #914918, #917408. Removal on 2025-02-08. -dev-db/tora - # Andreas K. Hüttel <[email protected]> (2025-01-06) # Masked for testing =dev-lang/perl-5.40.1*
