From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-db/tora/Manifest | 6 ++ dev-db/tora/files/tora-3.2-missing-header.patch | 21 ++++++ dev-db/tora/files/tora-3.2-qt-5.11.0.patch | 69 ++++++++++++++++++ dev-db/tora/metadata.xml | 25 +++++++ dev-db/tora/tora-3.2-r1.ebuild | 96 +++++++++++++++++++++++++ dev-db/tora/tora-9999.ebuild | 91 +++++++++++++++++++++++ 6 files changed, 308 insertions(+) create mode 100644 dev-db/tora/Manifest create mode 100644 dev-db/tora/files/tora-3.2-missing-header.patch create mode 100644 dev-db/tora/files/tora-3.2-qt-5.11.0.patch create mode 100644 dev-db/tora/metadata.xml create mode 100644 dev-db/tora/tora-3.2-r1.ebuild create mode 100644 dev-db/tora/tora-9999.ebuild (limited to 'dev-db/tora') diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest new file mode 100644 index 000000000000..d09ac099b053 --- /dev/null +++ b/dev-db/tora/Manifest @@ -0,0 +1,6 @@ +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 +DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a +EBUILD tora-3.2-r1.ebuild 2368 BLAKE2B f08d87c795d850f8c5961d59066bb7c256a862f68ef3f8bc4e8365fdb9e068f3e10815e5157af73a972e5b54486a3999a3b81f23ce1b6d034832b7d154d3923d SHA512 d8380bcebb90abf463a1f80cf315d34c94dccbe6e247c31035c8512931cfdbfa2979bed44a950d463844190e6f3261524c0ff314ac0ddc820d054f682589481c +EBUILD tora-9999.ebuild 2290 BLAKE2B d7a7c82ee7aa1838d8abc3281cd972299816f117258bf4747ef34ab73af3bbeecf2915bfc33ef1bca70d15af240b65fcc5b0386f1f89e494f84b0ab258d4cc98 SHA512 d4d9481e14d53aac151e1d64119d971b822896930153a363945097e5cb4f39f048e8baa465da7d6ebf2cafbfd8d34b9e7d3de9ebeb433929e40ab10046fbb10c +MISC metadata.xml 843 BLAKE2B 483349f54edd1d61c459d689e4f4a65a427bfdc49a05244b8b9ef26f0d49460f3f04a995bca0e9e2becfb335cda699992bf62c4a1d26b264d5469741c01f9bf5 SHA512 fb6b7e2966d2cb74576f2558d44e64a5cf8aa79f78c5eeff58fcf433369b4efd32edb103ad4174bdd7d878466e4db720d81e4b1ff637d7c1193d37d944708247 diff --git a/dev-db/tora/files/tora-3.2-missing-header.patch b/dev-db/tora/files/tora-3.2-missing-header.patch new file mode 100644 index 000000000000..272054b77793 --- /dev/null +++ b/dev-db/tora/files/tora-3.2-missing-header.patch @@ -0,0 +1,21 @@ +From 503fb876bd5664b455d234ba21294735a8972c91 Mon Sep 17 00:00:00 2001 +From: Ivan Brezina +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 + #endif + ++#include + #include + #include + #include 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 new file mode 100644 index 000000000000..d9e50eeaf5b8 --- /dev/null +++ b/dev-db/tora/files/tora-3.2-qt-5.11.0.patch @@ -0,0 +1,69 @@ +From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001 +From: ibre5041 +Date: Wed, 30 May 2018 23:22:05 +0200 +Subject: [PATCH] fix for bug #96 - missing #include + +--- + 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 + #include + #include ++#include + + #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 + #include + #include ++#include + + #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 + #include ++#include + + #include "icons/addrole.xpm" + #include "icons/adduser.xpm" + +From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001 +From: Ivan Brezina +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 + #include + #include + diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml new file mode 100644 index 000000000000..ac37be91b865 --- /dev/null +++ b/dev-db/tora/metadata.xml @@ -0,0 +1,25 @@ + + + + + ikonta@yandex.ru + Sergey Starikoff + + + haubi@gentoo.org + Michael Haubenwallner + + + proxy-maint@gentoo.org + Proxy Maintainers + + + 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. + + + tora + + diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild new file mode 100644 index 000000000000..57c06026bfa5 --- /dev/null +++ b/dev-db/tora/tora-3.2-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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-basic-11* dev-db/oracle-instantclient ) ) + postgres? ( dev-db/postgresql:* ) +" +DEPEND="${RDEPEND} + dev-qt/linguist: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="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so" + -DLOKI_INCLUDE_DIR="$(pkg-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-9999.ebuild new file mode 100644 index 000000000000..1733252f6d51 --- /dev/null +++ b/dev-db/tora/tora-9999.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 pch +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-basic-11* dev-db/oracle-instantclient ) ) + postgres? ( dev-db/postgresql:* ) +" +DEPEND="${RDEPEND} + dev-qt/linguist:5 + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +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="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so" + -DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" + $(cmake-utils_use_find_package doc Doxygen) + -DENABLE_ORACLE=$(usex oracle) + -DUSE_PCH=$(usex pch) + -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 +} -- cgit v1.2.3