From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38B2D158093 for ; Sat, 2 Jul 2022 20:40:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F0EAE0828; Sat, 2 Jul 2022 20:40:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68C02E0828 for ; Sat, 2 Jul 2022 20:40:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31AEB341C5A for ; Sat, 2 Jul 2022 20:40:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D11A50D for ; Sat, 2 Jul 2022 20:40:46 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1656794438.335e457d90da344893f285c6db0baf4fe5d82b89.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/tora/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/tora/tora-9999.ebuild X-VCS-Directories: dev-db/tora/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 335e457d90da344893f285c6db0baf4fe5d82b89 X-VCS-Branch: master Date: Sat, 2 Jul 2022 20:40:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f32ea717-5f27-467e-9307-9aa661dd3679 X-Archives-Hash: 2460439b7ded6adaadd70d54cfa57441 commit: 335e457d90da344893f285c6db0baf4fe5d82b89 Author: David Seifert gentoo org> AuthorDate: Sat Jul 2 20:40:38 2022 +0000 Commit: David Seifert gentoo 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 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 }