dev-db/tora: 3.2 version bump

Bug: https://bugs.gentoo.org/577850
Package-Manager: Portage-2.3.12, Repoman-2.3.3
This commit is contained in:
Andreas Sturmlechner
2017-10-22 00:30:02 +02:00
parent 2747b2225c
commit 6b3b10d5bb
4 changed files with 183 additions and 44 deletions

View File

@@ -1 +1,2 @@
DIST tora-3.0.0_pre20140929.tar.xz 9038680 BLAKE2B 93dc168c78ddf6f016a70e974dfade020bbbbed7fb628c6c7a3600e7cb95122067bf84be8bf99afebc58a735daa47694df757aaa86cdce717a31f504bce302d1 SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73
DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a

View File

@@ -0,0 +1,21 @@
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>

105
dev-db/tora/tora-3.2.ebuild Normal file
View File

@@ -0,0 +1,105 @@
# 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 pch 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=$(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
}

View File

@@ -1,91 +1,103 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
inherit cmake-utils eutils
inherit cmake-utils eutils xdg-utils
if [[ ${PV} == 9999 ]]; then
ESVN_REPO_URI="https://svn.code.sf.net/p/tora/code/trunk/tora"
inherit subversion
SRC_URI=""
EGIT_REPO_URI="https://github.com/tora-tool/tora"
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="TOra - Toolkit For Oracle"
HOMEPAGE="http://torasql.com/"
IUSE="debug mysql oracle oci8-instant-client postgres"
DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs"
HOMEPAGE="https://github.com/tora-tool/tora/wiki"
IUSE="doc mysql oracle pch postgres"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS=""
RDEPEND="
dev-libs/ferrisloki
x11-libs/qscintilla:=[qt4(-)]
dev-qt/qtgui:4
dev-qt/qtsql:4[mysql?,postgres?]
dev-qt/qtxmlpatterns:4
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
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="
DEPEND="${RDEPEND}
dev-qt/linguist:5
virtual/pkgconfig
${RDEPEND}
doc? ( app-doc/doxygen )
"
pkg_setup() {
if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then
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 "Otherwise specify -oracle in your USE variable."
eerror
eerror "You can download the Oracle software from"
eerror "http://otn.oracle.com/software/content.html"
eerror "http://www.oracle.com/technetwork/database/features/instant-client/index.html"
die
fi
}
src_prepare() {
sed -i \
-e "/COPYING/ d" \
CMakeLists.txt || die "Removal of COPYING file failed"
# 'svn info' needs .svn subdirectory
[[ ${PV} != 9999 ]] || cp -a "${ESVN_WC_PATH}"/.svn .svn || die
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=()
if use oracle || use oci8-instant-client ; then
mycmakeargs=(-DENABLE_ORACLE=ON)
else
mycmakeargs=(-DENABLE_ORACLE=OFF)
fi
mycmakeargs+=(
-DWANT_RPM=OFF
-DWANT_BUNDLE=OFF
-DWANT_BUNDLE_STANDALONE=OFF
-DWANT_INTERNAL_QSCINTILLA=OFF
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_enable postgres PGSQL)
$(cmake-utils_use_want debug)
# path variables
-DTORA_DOC_DIR=share/doc/${PF}
$(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
domenu src/${PN}.desktop
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
}