gentoo resync : 09.07.2022

7 files changed, 93 insertions, 231 deletions

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 7f651451eecf..511496d69c71 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,6 +1,4 @@
-AUX tora-3.2-missing-header.patch 547 BLAKE2B 6f3ce8bb09de2bc3793fe6c76c166d0b8d0c1da389d9c0132b83ca2af70623b5f72b6fa0e05d098d03a1e2547af9d2585c4e53c3b4a281c87f67782abe2c3211 SHA512 f3f11c336a2c139a46495f75009762b8bba0d20a1bed3c2f710ed6e94a421e0d3b17241e16919349430a761bc7ddde460af06cdd357741166328fe2b5e4216ec
-AUX tora-3.2-qt-5.11.0.patch 1891 BLAKE2B 4617847e8ede3cbb25dfb3a5121f7664bf36bbe7ec46088565769ef7548b163f31b98a20c850b638ddc5a01d6d42346745c29ef38268e5f34e589a6323433288 SHA512 e03be4fc995020abe63dc9c7b4a24a5e9e9b8e9f3c70355bfebe3696e0dcc4cf88643ac58cf263580873838cfe77f2f594be89e7a475e98b434a88bf9c390eb3
+AUX tora-3.2-qt-includes.patch 1405 BLAKE2B f42d2fd5e39d6de51b3c6555dcb395b0b419d6685b6ce70389c4335f511a52abcfba5c51dc0454b0ddc91ba328dda50cc5727a1c84266c860a9d8781dae67a32 SHA512 1901e7501f8cf79ed74623fd5a5cc948e131cb5f75a9a55b0a712b6980c584a25e909bf7a17575b4604258ba444da7d47fddea34e6267cf73cc078e1547adf9f
 DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a
-EBUILD tora-3.2-r1.ebuild 2343 BLAKE2B 8547018de38570f3134674267568a8df381b1fd8a2f81012d54d3d66d05b5d1a47485a1d331137554bb04a56d62ae95a1a55407ec3c440f64eecd84f5d3a2f22 SHA512 50fe4a0321f1c19b79a886bdec28815c3369c1d948d6832555043da02f77ff44dee177a59654daff99ae547beaa9b5e12cb536b82e363448d16584c8d7a98c46
-EBUILD tora-9999.ebuild 2265 BLAKE2B 87e3e2dbb03a8da2015281e545d9a991bcceaa0eb58a8a4eb2e97afd92e91c4525c21fb07225b7ab9fbf2d69f7fa4de2abb8eccd197780be2f10e32c331c6b77 SHA512 9603b441a35a397cc7a76c06f847cf81f9afd78c9af8233681140d5eb8ccc3a4f609d448cf73442171e3cbb56712a4161e801d370a07f8b0a2c638d27d1cfbeb
-MISC metadata.xml 760 BLAKE2B 2147e376e24a47dd88b4275e028cb3d0a2692f6a571f5437adfd9228c009fe3c17d1670cdb818188a56142259007ce4f9210b5d98b6c761a37efd37a3ae2dcd7 SHA512 2f7fd6658f5f5d2b574ad60ce8e174868a973c7a6a7a82ffbe0479184c8fe7bceeee24c0cd3984f475b81bb93dea2216000c8e96e1dc0c0d097ba83ffd91133c
+EBUILD tora-3.2-r2.ebuild 2170 BLAKE2B 48ebf249349d7d288f3a78e09574bc197c2c483799849d118dfbf4422a3bdad6087c9e6d8bca5d4021cd2bf5d008cb2f91b5391d4d9d1b69cd6018798b96df53 SHA512 91070d06f01e66a2b55aecee4c2643e6b229a6cc1a6cb3b455711b6ab8db03a2cda6888d6ad5c8705305f7c3d5e241c7484c6e216612d233f97d78e867cd24ba
+MISC metadata.xml 537 BLAKE2B 369f7db2a065ddec2d206a0a6ff9111503a92bd1b7b30e43a49e5f3d8bcdd0a52fa407508622162df306d71119c50b595f06b00ce0d56241fff37570124704b7 SHA512 fe6753906e05c28e20b81bb59e8282ad347cccd4b96531ac611ca2632302b1150b9c8c0518c1686bc25eb37c166e838d305edd58044a60d7e8395648d26e55b7
diff --git a/dev-db/tora/files/tora-3.2-missing-header.patch b/dev-db/tora/files/tora-3.2-missing-header.patch
deleted file mode 100644
index 272054b77793..000000000000
--- a/dev-db/tora/files/tora-3.2-missing-header.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 503fb876bd5664b455d234ba21294735a8972c91 Mon Sep 17 00:00:00 2001
-From: Ivan Brezina <ibrezina@ibrezina.net>
-Date: Wed, 5 Jul 2017 10:07:14 +0200
-Subject: [PATCH] linux fix
-
----
- src/editor/tosqltext.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/editor/tosqltext.cpp b/src/editor/tosqltext.cpp
-index c329daf0..60935c12 100644
---- 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>
diff --git a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch b/dev-db/tora/files/tora-3.2-qt-5.11.0.patch
deleted file mode 100644
index d9e50eeaf5b8..000000000000
--- a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001
-From: ibre5041 <ibre5041@ibrezina.net>
-Date: Wed, 30 May 2018 23:22:05 +0200
-Subject: [PATCH] fix for bug #96 - missing #include <QButtonGroup>
-
----
- src/tools/tobrowser.cpp  | 1 +
- src/tools/toscript.cpp   | 1 +
- src/tools/tosecurity.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/tools/tobrowser.cpp b/src/tools/tobrowser.cpp
-index 895be336..69a4c6b6 100644
---- 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"
-diff --git a/src/tools/toscript.cpp b/src/tools/toscript.cpp
-index bc74fc8c..aff26158 100644
---- 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"
-diff --git a/src/tools/tosecurity.cpp b/src/tools/tosecurity.cpp
-index 17f5c3b0..b2694928 100644
---- 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"
-
-From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001
-From: Ivan Brezina <ibrezina@ibrezina.net>
-Date: Wed, 27 Jun 2018 19:11:09 +0200
-Subject: [PATCH] fix for bug #101
-
----
- src/widgets/tohelp.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/tohelp.cpp b/src/widgets/tohelp.cpp
-index 69e3c6a1..4ffd6cea 100644
---- 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/files/tora-3.2-qt-includes.patch b/dev-db/tora/files/tora-3.2-qt-includes.patch
new file mode 100644
index 000000000000..6126cdf71ca9
--- /dev/null
+++ b/dev-db/tora/files/tora-3.2-qt-includes.patch
@@ -0,0 +1,61 @@
+--- 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
index 808b6f98bd88..390a3d3661db 100644
--- a/dev-db/tora/metadata.xml
+++ b/dev-db/tora/metadata.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ikonta@yandex.ru</email>
-		<name>Sergey Starikoff</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- 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>
+		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>
 	</upstream>
diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild
deleted file mode 100644
index b653ad25405a..000000000000
--- a/dev-db/tora/tora-3.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop xdg-utils
-
-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"
-IUSE="doc mysql oracle +postgres"
-REQUIRED_USE="|| ( mysql oracle postgres )"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-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-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-missing-header.patch"
-	"${FILESDIR}/${P}-qt-5.11.0.patch"
-)
-
-src_prepare() {
-	cmake-utils_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)/libferrisloki.so"
-		-DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki)/FerrisLoki"
-		$(cmake-utils_use_find_package doc Doxygen)
-		-DENABLE_ORACLE=$(usex oracle)
-		-DUSE_PCH=OFF
-		-DENABLE_PGSQL=$(usex postgres)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	doicon src/icons/${PN}.xpm || die
-	domenu src/${PN}.desktop || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-3.2-r2.ebuild
index d1bf824895be..7bd8e475a41e 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-3.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils desktop xdg-utils
+inherit cmake desktop toolchain-funcs xdg
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tora-tool/tora"
 	inherit git-r3
 else
@@ -15,11 +15,11 @@ fi
 
 DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs"
 HOMEPAGE="https://github.com/tora-tool/tora/wiki"
-IUSE="doc mysql oracle pch +postgres"
-REQUIRED_USE="|| ( mysql oracle postgres )"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc mysql oracle +postgres"
+REQUIRED_USE="|| ( mysql oracle postgres )"
 
 RDEPEND="
 	dev-libs/ferrisloki
@@ -33,14 +33,20 @@ RDEPEND="
 	oracle? ( dev-db/oracle-instantclient )
 	postgres? ( dev-db/postgresql:* )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-qt-includes.patch )
+
 src_prepare() {
-	cmake-utils_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/" \
@@ -63,29 +69,19 @@ src_configure() {
 		-DWANT_INTERNAL_LOKI=OFF
 		-DWANT_INTERNAL_QSCINTILLA=OFF
 		-DWANT_RPM=OFF
-		-DLOKI_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir ferrisloki)/libferrisloki.so"
-		-DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki)/FerrisLoki"
-		$(cmake-utils_use_find_package doc Doxygen)
+		-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=$(usex pch)
+		-DUSE_PCH=OFF
 		-DENABLE_PGSQL=$(usex postgres)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-
-	doicon src/icons/${PN}.xpm || die
-	domenu src/${PN}.desktop || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
+	cmake_src_install
 
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	doicon src/icons/tora.xpm || die
+	domenu src/tora.desktop || die
 }