From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- dev-db/Manifest.gz | Bin 20670 -> 20661 bytes dev-db/barman/Manifest | 2 + dev-db/barman/barman-2.4.ebuild | 26 +++++ dev-db/qt5-sqlcipher/Manifest | 3 +- dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild | 47 --------- dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild | 49 ++++++++++ dev-db/soci/Manifest | 4 +- dev-db/soci/soci-3.2.2.ebuild | 46 --------- dev-db/soci/soci-3.2.3.ebuild | 44 +++++---- dev-db/sqldeveloper/Manifest | 2 +- dev-db/sqldeveloper/metadata.xml | 6 +- dev-db/tora/Manifest | 5 +- dev-db/tora/files/tora-3.2-qt-5.11.0.patch | 69 ++++++++++++++ dev-db/tora/tora-3.2-r1.ebuild | 96 +++++++++++++++++++ dev-db/tora/tora-3.2.ebuild | 105 --------------------- dev-db/tora/tora-9999.ebuild | 22 +---- 16 files changed, 280 insertions(+), 246 deletions(-) create mode 100644 dev-db/barman/barman-2.4.ebuild delete mode 100644 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild create mode 100644 dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r3.ebuild delete mode 100644 dev-db/soci/soci-3.2.2.ebuild create mode 100644 dev-db/tora/files/tora-3.2-qt-5.11.0.patch create mode 100644 dev-db/tora/tora-3.2-r1.ebuild delete mode 100644 dev-db/tora/tora-3.2.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index caaca55d6094..205bcbec1a91 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest index fe77e3e8ede1..7a43e9440e34 100644 --- a/dev-db/barman/Manifest +++ b/dev-db/barman/Manifest @@ -1,5 +1,7 @@ DIST barman-2.1.tar.gz 240437 BLAKE2B 6981049812b520c2605c49e5c7baed5cf350eb386114bf80f3ca2d1cd3abdc9b7d55329f4b8de42b6a47acd7d7e7f925b2c3cf7da1e95393ba3d3c7df938f262 SHA512 385e74c8dcd20d6ad46f6a5a0520cfa47a597395acd433a570ca062ee2834a8b75101fc9a04b19dd312373e4a0b017c90826f7fbeb4f32d8c59313d8b79af1e1 DIST barman-2.3.tar.gz 255500 BLAKE2B ae84ceade48faf6c65b1d056a7a5b635e5af53f6fa17d6165676e486286effe144125078f84fe6861d948f5b6d568d547ac3258612c95f5cfd5a5e3160197c5c SHA512 c7885ae4940fc990e3368bc654bfe6924fe36f66e6549d3f263a2f23ead2743b2a9ececf55e393ef3105cdf7fc2f38e491895d8e6135e95372eff9eb0d0bfa69 +DIST barman-2.4.tar.gz 997651 BLAKE2B 34c412752d6f0a8bcaa11e3d4538b6116d980f8c3c04bfd9c6ef997f496c4f9497175349b0d0574673a91c14ffab1469d8a988077c7198a2405af680c8205ca6 SHA512 ef316de7cae7f41d95894892b260e1cc67f62866c6feaf03acd96391ab07d9eb27ea7fd6cb472743cbd56658dde24718ac0892ba2280706098f4bdd14b5674d1 EBUILD barman-2.1.ebuild 643 BLAKE2B 0e3d0ce0899f8cd31c4e73e7b00331d3b8b32ab59e17b3532dcf40a457037c3d1e8fdbd690a8f629c8d9058bac5cf1d887d443d9ca2a31719edf2f102d77b053 SHA512 b3d6eaa4b329cc5fad38eb34d4e96bd65c57f7deba8ca5cd53aacb6b03b57b91752c5c0fda10cf14149904481200b979906d3066496b09de0889ff803684e9bd EBUILD barman-2.3.ebuild 643 BLAKE2B 0e3d0ce0899f8cd31c4e73e7b00331d3b8b32ab59e17b3532dcf40a457037c3d1e8fdbd690a8f629c8d9058bac5cf1d887d443d9ca2a31719edf2f102d77b053 SHA512 b3d6eaa4b329cc5fad38eb34d4e96bd65c57f7deba8ca5cd53aacb6b03b57b91752c5c0fda10cf14149904481200b979906d3066496b09de0889ff803684e9bd +EBUILD barman-2.4.ebuild 658 BLAKE2B 574b4ccc4a4c4bc66777e4b25030eed521d627dc02605efd7083b1ff0e1766ece23e0a5d039e77c0d78c57728ab1384cf656b7f20d606e77bcd4ecc9d3343d9c SHA512 bde0befc55a846395a71e0966e6a0a290707c71d169b26299f155c4037d9785c74ab91592666c0da0098b207d8d8575c6ef23725c9299c4b1b73fc73f2058003 MISC metadata.xml 326 BLAKE2B e34e2bc75606ca796fde6cb82ddcc8993aa093c76a95cd36d1b5ecea0109f301636f5ff5217da2216f029e4891d95a23225f8a5d7ac3fd63c36a3876c70ebd89 SHA512 c0fd87ba5960595461b98161bc9debc37bd5f9665461486845900929854a9b27954020d234688abd9c4589a4066d0185bd11ad53a96551b5399f0025acde4ed1 diff --git a/dev-db/barman/barman-2.4.ebuild b/dev-db/barman/barman-2.4.ebuild new file mode 100644 index 000000000000..f4ffbef2a9cb --- /dev/null +++ b/dev-db/barman/barman-2.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit distutils-r1 + +DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers" + +HOMEPAGE="http://www.pgbarman.org" +SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="" + +RDEPEND="dev-python/argh[${PYTHON_USEDEP}] + >=dev-python/psycopg-2[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/argcomplete[${PYTHON_USEDEP}] + net-misc/rsync + dev-db/postgresql[server]" +DEPEND="" diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest index 12d0fa4586e0..af7293f067e2 100644 --- a/dev-db/qt5-sqlcipher/Manifest +++ b/dev-db/qt5-sqlcipher/Manifest @@ -1,4 +1,5 @@ AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13 +DIST qt5-sqlcipher-1.0.1-qt-5.11.1.tar.xz 8528 BLAKE2B 981565882399943c6ab47b09968c27fa9f53cade5baee66259e416d749905a6bf7a9c1c27ed8165d7b6fc0a72fee85d51bb9ac0c3819b9dab5e89e741e880b13 SHA512 9d64b12990cd81ad1e81b941ff970388c8e7f34fd446ecd4ce2ed58e3f8e50acc06fe88fc0f6693e48b19422e70372516bc36b5c71908e18096e092f261c9eff DIST qt5-sqlcipher-1.0.1.tar.gz 56994 BLAKE2B 9de780126bc7ba99e23b529e6e45d629e9b20d52dfb4d91fcb7c8a6b77b8a8bc17bedaa40a288c4af32e40cc563631e164428be0f8c5a81ffa6143acc58b2e55 SHA512 ba83ba1d98b7764c7ad4bf776b1f39baff44ff6189e51cbc2131150e5a4c2962a21134d21d5ed41f171629395c721fce11ee911d080d304566033d53c552642a -EBUILD qt5-sqlcipher-1.0.1-r2.ebuild 1197 BLAKE2B 2dacdec3175c7c7aaeb27e69c392f38f17a3a86aac21bebdf7828d352c91eeb9603a3adc866a9b64bd812c799e66045aba4048f55c25310efd5c9aeb4a9ed640 SHA512 fcf16f38d76544260d193bc87d9bea5491e2e13429c9f0fea1553cdb09e2c6d981864a8e82341e34e4de009f194ec157fba0f3f6c4691f29eeb5d42d4b397b04 +EBUILD qt5-sqlcipher-1.0.1-r3.ebuild 1281 BLAKE2B e3b45a2ef37f67bdc021c6c8b5108af6cc6def1dbab04c8c4a5b19991751cf2b16cfb12ec444a413b9e5b5f1c2915170d5cde70c2f7ee3668261ac04bdf7ef3e SHA512 3a28c4a2c67c2b5ce77d92843b549c26df8d222c540c369217b09947ccdbf1b472a8a0869eb86a831b3fa8ac9be9584cf1ba48d94766ea8fb725baf00beeaf0d MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild deleted file mode 100644 index 952ae0ab2e74..000000000000 --- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eapi7-ver - -DESCRIPTION="Qt SQL driver plugin for SQLCipher" -HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher" -SRC_URI="https://github.com/blizzard4591/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" # version 2.1 only -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=">=dev-db/sqlcipher-3.4.1 - >=dev-qt/qtcore-5.7.1:5= - >=dev-qt/qtsql-5.7.1:5=[sqlite] - - wschlich@gentoo.org - Wolfram Schlich - + + diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index 293df1e20cf1..d09ac099b053 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -1,5 +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.ebuild 2644 BLAKE2B 33da4e5e08b67ff64533892cfb276aa3779004b5fbbbd9ddb03d0977d88ce9f967599d88f023bff4adf266bff510b1ad433e36a9843065d28ca6daf0a7a107d3 SHA512 2ee3322d1331580402566ddc33cc286d96397a34521217c60a0cdee5ff85805883eebabb4b17e689adc3f093662505a36082f649f304c7146c579d551339b11d -EBUILD tora-9999.ebuild 2603 BLAKE2B 284cba2eeb31b9348250ff0a47b187514a78449f01d6acb6ec7aae608ec8f1e408efc6c2cc8a1363c6963ae35707a88f1ba1186bd04d3854273063c15b90e3d7 SHA512 c8d8e4ea0e72c850ceab531d580f6cb9dc056d9de5e2b02f52bb9bc157cd1e7be6c660040d45c6df57a4b747da4af6e51f2143c6d71dd8a58c7811309d23e2cc +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-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/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-3.2.ebuild b/dev-db/tora/tora-3.2.ebuild deleted file mode 100644 index 36ff60e39c22..000000000000 --- a/dev-db/tora/tora-3.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils 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" - -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* ) - postgres? ( dev-db/postgresql:* ) -" -DEPEND="${RDEPEND} - dev-qt/linguist:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) - -pkg_setup() { - if use oracle && [[ -z "$ORACLE_HOME" ]]; then - eerror "ORACLE_HOME variable is not set." - eerror - eerror "You must install Oracle >= 8i client for Linux in" - eerror "order to compile TOra with Oracle support." - eerror - eerror "You can download the Oracle software from" - eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html" - die - fi -} - -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 index 41ee84ac7f54..1733252f6d51 100644 --- a/dev-db/tora/tora-9999.ebuild +++ b/dev-db/tora/tora-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils eutils xdg-utils +inherit cmake-utils desktop xdg-utils if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/tora-tool/tora" @@ -15,7 +15,8 @@ fi DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" HOMEPAGE="https://github.com/tora-tool/tora/wiki" -IUSE="doc mysql oracle pch postgres" +IUSE="doc mysql oracle pch +postgres" +REQUIRED_USE="|| ( mysql oracle postgres )" SLOT="0" LICENSE="GPL-2" @@ -29,7 +30,7 @@ RDEPEND=" dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( =dev-db/oracle-instantclient-basic-11* ) + oracle? ( || ( =dev-db/oracle-instantclient-basic-11* dev-db/oracle-instantclient ) ) postgres? ( dev-db/postgresql:* ) " DEPEND="${RDEPEND} @@ -38,19 +39,6 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) " -pkg_setup() { - if use oracle && [[ -z "$ORACLE_HOME" ]]; then - eerror "ORACLE_HOME variable is not set." - eerror - eerror "You must install Oracle >= 8i client for Linux in" - eerror "order to compile TOra with Oracle support." - eerror - eerror "You can download the Oracle software from" - eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html" - die - fi -} - src_prepare() { cmake-utils_src_prepare -- cgit v1.2.3