public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2016-12-22 18:26 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2016-12-22 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     35546a1c31531780dfbc5125b40a774307c31985
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:37 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:26:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35546a1c

dev-db/tora: Depend on x11-libs/qscintilla[qt4]

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 ...re20140929-r1.ebuild => tora-3.0.0_pre20140929-r2.ebuild} |  5 ++---
 dev-db/tora/tora-9999.ebuild                                 | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
similarity index 96%
rename from dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild
rename to dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
index 3c19307..bee25ee 100644
--- a/dev-db/tora/tora-3.0.0_pre20140929-r1.ebuild
+++ b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
@@ -24,14 +24,13 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/ferrisloki
-	x11-libs/qscintilla
+	x11-libs/qscintilla:=[qt4(-)]
 	dev-qt/qtgui:4
 	dev-qt/qtsql:4[mysql?,postgres?]
 	dev-qt/qtxmlpatterns:4
 	=dev-db/oracle-instantclient-basic-11*
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
 "
-
 DEPEND="
 	virtual/pkgconfig
 	${RDEPEND}

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 6970c22..8867f7b 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -22,17 +22,19 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS=""
 
-DEPEND="
-	virtual/pkgconfig
+RDEPEND="
 	dev-libs/ferrisloki
-	x11-libs/qscintilla
+	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 )
-	postgres? ( dev-db/postgresql )
+	postgres? ( dev-db/postgresql:* )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
 "
-RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2017-12-28 10:17 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d0324afc9683504c59285d8d835a0c45d56cff29
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 10:13:38 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 10:17:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0324afc

dev-db/tora: Drop USE=pch, it breaks build

Bug: https://bugs.gentoo.org/577850
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-db/tora/tora-3.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/tora/tora-3.2.ebuild b/dev-db/tora/tora-3.2.ebuild
index bf2e09e7494..36ff60e39c2 100644
--- a/dev-db/tora/tora-3.2.ebuild
+++ b/dev-db/tora/tora-3.2.ebuild
@@ -15,7 +15,7 @@ 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 postgres"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -81,7 +81,7 @@ src_configure() {
 		-DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki"
 		$(cmake-utils_use_find_package doc Doxygen)
 		-DENABLE_ORACLE=$(usex oracle)
-		-DUSE_PCH=$(usex pch)
+		-DUSE_PCH=OFF
 		-DENABLE_PGSQL=$(usex postgres)
 	)
 	cmake-utils_src_configure


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2017-12-28 10:17 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     2591ec4c9f7ad173c32d2bff9c46ddd7eec89203
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 10:03:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 10:17:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2591ec4c

dev-db/tora: Drop old

Closes: https://bugs.gentoo.org/577850
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-db/tora/Manifest                         |  1 -
 dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild | 84 ----------------------------
 2 files changed, 85 deletions(-)

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index f0cbf8f7ce1..282b353face 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,2 +1 @@
-DIST tora-3.0.0_pre20140929.tar.xz 9038680 BLAKE2B 93dc168c78ddf6f016a70e974dfade020bbbbed7fb628c6c7a3600e7cb95122067bf84be8bf99afebc58a735daa47694df757aaa86cdce717a31f504bce302d1 SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73
 DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a

diff --git a/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
deleted file mode 100644
index fdd5149bda7..00000000000
--- a/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-if [[ ${PV} == 9999 ]]; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/tora/code/trunk/tora"
-	inherit subversion
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz"
-fi
-
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://torasql.com/"
-IUSE="debug mysql postgres"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/ferrisloki
-	x11-libs/qscintilla:=[qt4(-)]
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql?,postgres?]
-	dev-qt/qtxmlpatterns:4
-	=dev-db/oracle-instantclient-basic-11*
-	postgres? ( dev-db/postgresql:* )
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [ -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://otn.oracle.com/software/content.html"
-		die
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/COPYING/ d" \
-		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=()
-	mycmakeargs=(-DENABLE_ORACLE=ON)
-	mycmakeargs+=(
-		-DWANT_RPM=OFF
-		-DWANT_BUNDLE=OFF
-		-DWANT_BUNDLE_STANDALONE=OFF
-		-DWANT_INTERNAL_QSCINTILLA=OFF
-		-DWANT_INTERNAL_LOKI=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_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	#
-	doicon src/icons/${PN}.xpm || die
-	domenu src/${PN}.desktop || die
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2018-07-02 15:57 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-07-02 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     bb07d154b32c83f3e29fc6dee2d15602d639ce4f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 15:30:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 15:56:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb07d154

dev-db/tora: Switch to +postgres default, drop obsolete warning

Thanks-to: Sergey S. Starikoff <Ikonta <AT> yandex.ru>
Closes: https://bugs.gentoo.org/645242
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../tora/{tora-9999.ebuild => tora-3.2-r1.ebuild}  | 22 ++++++----------------
 dev-db/tora/tora-9999.ebuild                       | 20 ++++----------------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-3.2-r1.ebuild
similarity index 79%
copy from dev-db/tora/tora-9999.ebuild
copy to dev-db/tora/tora-3.2-r1.ebuild
index 41ee84ac7f5..dd82fa3785b 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 +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,18 +39,7 @@ 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
-}
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -79,7 +69,7 @@ src_configure() {
 		-DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki"
 		$(cmake-utils_use_find_package doc Doxygen)
 		-DENABLE_ORACLE=$(usex oracle)
-		-DUSE_PCH=$(usex pch)
+		-DUSE_PCH=OFF
 		-DENABLE_PGSQL=$(usex postgres)
 	)
 	cmake-utils_src_configure

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 41ee84ac7f5..2f79f2291a8 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2018-07-02 15:57 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-07-02 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1c33609cbaaa76b6317b9e6cd1c69604483debb0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 15:44:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 15:56:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c33609c

dev-db/tora: Drop old

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-db/tora/tora-3.2.ebuild | 105 --------------------------------------------
 1 file changed, 105 deletions(-)

diff --git a/dev-db/tora/tora-3.2.ebuild b/dev-db/tora/tora-3.2.ebuild
deleted file mode 100644
index 36ff60e39c2..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2018-07-02 15:57 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-07-02 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7250799e4ce5e5c03548df592ee5ebabd6839788
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 15:32:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 15:56:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7250799e

dev-db/tora: eutils -> desktop

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-db/tora/tora-3.2-r1.ebuild | 2 +-
 dev-db/tora/tora-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild
index dd82fa3785b..38ee149fef9 100644
--- a/dev-db/tora/tora-3.2-r1.ebuild
+++ b/dev-db/tora/tora-3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 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"

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 2f79f2291a8..1733252f6d5 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -3,7 +3,7 @@
 
 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"


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2020-11-22  9:36 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2020-11-22  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5b051eb4f3f9d5859c556db8af8cdae87afa73dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 09:35:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:36:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b051eb4

dev-db/tora: Fix DEPEND

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/tora/tora-3.2-r1.ebuild | 4 ++--
 dev-db/tora/tora-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild
index 57c06026bfa..b13394c1db8 100644
--- a/dev-db/tora/tora-3.2-r1.ebuild
+++ b/dev-db/tora/tora-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ RDEPEND="
 	postgres? ( dev-db/postgresql:* )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist:5
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 1733252f6d5..14472612ed8 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ RDEPEND="
 	postgres? ( dev-db/postgresql:* )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist:5
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2021-04-23  6:53 Michael Haubenwallner
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Haubenwallner @ 2021-04-23  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     2b902aa89aba994772528dba59e01bf16e0a6272
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 06:11:52 2021 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 06:45:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b902aa8

dev-db/tora: drop self as maintainer

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 dev-db/tora/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml
index 37466537bc7..70dab3d9ecd 100644
--- a/dev-db/tora/metadata.xml
+++ b/dev-db/tora/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ikonta@yandex.ru</email>
 		<name>Sergey Starikoff</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2021-04-23  6:53 Michael Haubenwallner
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Haubenwallner @ 2021-04-23  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     fa66b59ed6831236ca6781b90335db431aa7147d
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 06:14:05 2021 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 06:45:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa66b59e

dev-db/tora: drop obsolete oracle-instantclient dep

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 dev-db/tora/tora-3.2-r1.ebuild | 2 +-
 dev-db/tora/tora-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild
index 31c8b866811..b653ad25405 100644
--- a/dev-db/tora/tora-3.2-r1.ebuild
+++ b/dev-db/tora/tora-3.2-r1.ebuild
@@ -30,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* dev-db/oracle-instantclient ) )
+	oracle? ( dev-db/oracle-instantclient )
 	postgres? ( dev-db/postgresql:* )
 "
 DEPEND="${RDEPEND}

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 1aa682ceab1..d1bf824895b 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -30,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* dev-db/oracle-instantclient ) )
+	oracle? ( dev-db/oracle-instantclient )
 	postgres? ( dev-db/postgresql:* )
 "
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2022-07-02 20:40 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2022-07-02 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e44d9a1359030d2e2522269ee6177f7c24f79fee
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:40:39 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:40:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44d9a13

dev-db/tora: drop proxied maintainer

Closes: https://bugs.gentoo.org/835915
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-db/tora/metadata.xml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2022-07-02 20:40 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2022-07-02 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     335e457d90da344893f285c6db0baf4fe5d82b89
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:40:38 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:40:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335e457d

dev-db/tora: sync live ebuild

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-db/tora/tora-9999.ebuild | 49 +++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index d1bf824895be..8a85ed0d4a75 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.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,18 @@ 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 )
 "
 
 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/" \
@@ -59,33 +63,22 @@ src_prepare() {
 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)
+		-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
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2022-07-02 20:40 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2022-07-02 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     48fc8ba627cda504c6577c3cc3d68916bcdbe06d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:40:37 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:40:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48fc8ba6

dev-db/tora: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/835915
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{tora-3.2-r1.ebuild => tora-3.2-r2.ebuild}     | 50 ++++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r2.ebuild
similarity index 74%
rename from dev-db/tora/tora-3.2-r1.ebuild
rename to dev-db/tora/tora-3.2-r2.ebuild
index b653ad25405a..0e6cac5f8c23 100644
--- a/dev-db/tora/tora-3.2-r1.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 +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,19 +33,23 @@ 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}-missing-header.patch"
-	"${FILESDIR}/${P}-qt-5.11.0.patch"
+	"${FILESDIR}"/${P}-missing-header.patch
+	"${FILESDIR}"/${P}-qt-5.11.0.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/" \
@@ -68,29 +72,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=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
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/
@ 2022-07-02 20:56 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-07-02 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     546a6f1f5f0ac202d4f659a2f6b2ebbf3ac9a42e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 20:50:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 20:55:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546a6f1f

dev-db/tora: drop 9999

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/tora/tora-9999.ebuild | 84 --------------------------------------------
 1 file changed, 84 deletions(-)

diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
deleted file mode 100644
index 8a85ed0d4a75..000000000000
--- a/dev-db/tora/tora-9999.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop toolchain-funcs xdg
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc mysql oracle +postgres"
-REQUIRED_USE="|| ( mysql oracle postgres )"
-
-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-libs/boost
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-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/" \
-		-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
-		-DWANT_INTERNAL_LOKI=OFF
-		-DWANT_INTERNAL_QSCINTILLA=OFF
-		-DWANT_RPM=OFF
-		-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=OFF
-		-DENABLE_PGSQL=$(usex postgres)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	doicon src/icons/tora.xpm || die
-	domenu src/tora.desktop || die
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-07-02 20:56 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-22  9:36 [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-07-02 20:56 Sam James
2022-07-02 20:40 David Seifert
2022-07-02 20:40 David Seifert
2022-07-02 20:40 David Seifert
2021-04-23  6:53 Michael Haubenwallner
2021-04-23  6:53 Michael Haubenwallner
2018-07-02 15:57 Andreas Sturmlechner
2018-07-02 15:57 Andreas Sturmlechner
2018-07-02 15:57 Andreas Sturmlechner
2017-12-28 10:17 Andreas Sturmlechner
2017-12-28 10:17 Andreas Sturmlechner
2016-12-22 18:26 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox