gentoo resync : 26.12.2017

4 files changed, 186 insertions, 45 deletions

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 5b5221fad58c..8aef9820b2b9 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,4 +1,7 @@
+AUX tora-3.2-missing-header.patch 547 BLAKE2B 6f3ce8bb09de2bc3793fe6c76c166d0b8d0c1da389d9c0132b83ca2af70623b5f72b6fa0e05d098d03a1e2547af9d2585c4e53c3b4a281c87f67782abe2c3211 SHA512 f3f11c336a2c139a46495f75009762b8bba0d20a1bed3c2f710ed6e94a421e0d3b17241e16919349430a761bc7ddde460af06cdd357741166328fe2b5e4216ec
 DIST tora-3.0.0_pre20140929.tar.xz 9038680 BLAKE2B 93dc168c78ddf6f016a70e974dfade020bbbbed7fb628c6c7a3600e7cb95122067bf84be8bf99afebc58a735daa47694df757aaa86cdce717a31f504bce302d1 SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73
+DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a
 EBUILD tora-3.0.0_pre20140929-r2.ebuild 1981 BLAKE2B 41f53fb16e047feb5ee0d209741dac310f73e72d454d1db6fe80aecb3c566eb3594dbd818b955c981f0181c670cd9159f4984da59538777af4a6a6e40126261e SHA512 53c7c86a061c37734c0228d569bcb01a87169d6ba2642f4e2b13c182a7e4f639d4000ac67b1df8e64f36ab294831ed5abf85fde1d08171e2d721fe2d5504cfaf
-EBUILD tora-9999.ebuild 2286 BLAKE2B 0e56fdd8e4ad8e570af910e808a8709f53f77858c8c99bbb4d856965fe57d622ea335b56ce0d9b6e355c95cc9bde3f70f3ac84558d1195dcfa01666490a5199b SHA512 236f131869f595a3076c32143c238a42f34342be6524c01512d4b6e738b73b05552e54878eda9be621ffbeef79841000bc90c8f52154aca52e20e7855da94deb
+EBUILD tora-3.2.ebuild 2656 BLAKE2B 855892253d3828cabd21c4dce5b15c190e38bb5c3195fe026034f95bc0053e55c8e0a7f6fc5fc32c68e8a193b936b4bd1f8ba026b565c37dc9ba1855e27aa705 SHA512 c6a5e21530863998fe79c604e4c20566e426008a52266a74d6acf47fd3849b28343fb29754e21c2d54a9c3c973a9e0329b64146e28ece31d9df62fba4a8eff0b
+EBUILD tora-9999.ebuild 2603 BLAKE2B 284cba2eeb31b9348250ff0a47b187514a78449f01d6acb6ec7aae608ec8f1e408efc6c2cc8a1363c6963ae35707a88f1ba1186bd04d3854273063c15b90e3d7 SHA512 c8d8e4ea0e72c850ceab531d580f6cb9dc056d9de5e2b02f52bb9bc157cd1e7be6c660040d45c6df57a4b747da4af6e51f2143c6d71dd8a58c7811309d23e2cc
 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 <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/tora-3.2.ebuild b/dev-db/tora/tora-3.2.ebuild
new file mode 100644
index 000000000000..bf2e09e74948
--- /dev/null
+++ b/dev-db/tora/tora-3.2.ebuild
@@ -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
+}
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index c4a02d4c4a13..41ee84ac7f54 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -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
 }