From 9592d1fe093f4eef957080db70fb3de7d4949f60 Mon Sep 17 00:00:00 2001 From: "José P. R. N. Assis" Date: Thu, 1 Feb 2024 09:12:15 -0300 Subject: dev-db/sqliteman: fix qscintilla dep #916232 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding [qt5(+)] to the qscintilla dependency in preparation to supporting Qt5/Qt6 QScintilla multibuild. Revision number bumped to -r6. Keywords kept as-is. Bug: https://bugs.gentoo.org/916232 Signed-off-by: José P. R. N. Assis Signed-off-by: Jimi Huotari --- dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild | 38 ------------------------------ dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild | 38 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild create mode 100644 dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild deleted file mode 100644 index 655184f548cf..000000000000 --- a/dev-db/sqliteman/sqliteman-1.2.2-r5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Powerful GUI manager for the Sqlite3 database" -HOMEPAGE="https://sourceforge.net/projects/sqliteman/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.10.3:=" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-lpthread.patch" - "${FILESDIR}/${P}-qt5.patch" - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-desktop.patch" -) - -src_prepare() { - # remove bundled lib - rm -rf ${PN}/qscintilla2 || die - - append-flags -fPIC - cmake_src_prepare -} diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild new file mode 100644 index 000000000000..f36aabb52938 --- /dev/null +++ b/dev-db/sqliteman/sqliteman-1.2.2-r6.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Powerful GUI manager for the Sqlite3 database" +HOMEPAGE="https://sourceforge.net/projects/sqliteman/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + >=x11-libs/qscintilla-2.10.3:=[qt5(+)]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-lpthread.patch" + "${FILESDIR}/${P}-qt5.patch" + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-desktop.patch" +) + +src_prepare() { + # remove bundled lib + rm -rf ${PN}/qscintilla2 || die + + append-flags -fPIC + cmake_src_prepare +} -- cgit v1.2.3-65-gdbad