public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/
Date: Tue, 16 Apr 2024 21:31:41 +0000 (UTC)	[thread overview]
Message-ID: <1713303036.0ee55a3ef60a76aa7662f02a8afce9c24786d2bf.chiitoo@gentoo> (raw)

commit:     0ee55a3ef60a76aa7662f02a8afce9c24786d2bf
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 21:25:38 2024 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 21:30:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee55a3e

dev-python/qscintilla-python: fixup dependencies

Remove 'cups' from 'qtbase', since 'gui,widgets' should be enough
here (was also changed in 'x11-libs/qscintilla', but was
forgotten here).

Also adjust the 'qt5/qt6' USE dependency.

Closes: https://bugs.gentoo.org/930118
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 .../qscintilla-python-2.14.1-r2.ebuild             | 112 +++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild
new file mode 100644
index 000000000000..23fc7f5155df
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.14.1-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit multibuild python-r1 qmake-utils out-of-source-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}/Python
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug +qt5 qt6"
+
+REQUIRED_USE="|| ( qt5 qt6 ) ${PYTHON_REQUIRED_USE}"
+
+# no tests
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	qt5? (
+		>=dev-python/PyQt5-5.15.5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-python/PyQt6[gui,printsupport,widgets,${PYTHON_USEDEP}]
+		dev-qt/qtbase:6[gui,widgets]
+	)
+	~x11-libs/qscintilla-${PV}:=[qt5(+)?,qt6(-)?]
+"
+RDEPEND="${DEPEND}
+	qt5? ( >=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}] )
+	qt6? ( >=dev-python/PyQt6-sip-13.5:=[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
+	qt5? ( dev-qt/qtcore:5 )
+	qt6? ( dev-qt/qtbase:6 )
+"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		case ${MULTIBUILD_VARIANT} in
+			qt5)
+				configuration() {
+					local myconf=(
+						sip-build
+						--verbose
+						--build-dir="${BUILD_DIR}"
+						--scripts-dir="$(python_get_scriptdir)"
+						--qmake="$(qt5_get_bindir)"/qmake
+						--no-make
+						$(usev debug '--debug --qml-debug --tracing')
+					)
+					echo "${myconf[@]}"
+					"${myconf[@]}" || die
+
+					run_in_build_dir qmake5 -recursive ${MY_PN}.pro
+				}
+				mv pyproject{-${MULTIBUILD_VARIANT},}.toml || die
+				python_foreach_impl configuration
+				;;
+			qt6)
+				configuration() {
+					local myconf=(
+						sip-build
+						--verbose
+						--build-dir="${BUILD_DIR}"
+						--scripts-dir="$(python_get_scriptdir)"
+						--qmake="$(qt6_get_bindir)"/qmake
+						--no-make
+						$(usev debug '--debug --qml-debug --tracing')
+					)
+					echo "${myconf[@]}"
+					"${myconf[@]}" || die
+
+					run_in_build_dir qmake6 -recursive ${MY_PN}.pro
+				}
+				mv pyproject{-${MULTIBUILD_VARIANT},}.toml || die
+				python_foreach_impl configuration
+				;;
+		esac
+	}
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
+}


             reply	other threads:[~2024-04-16 21:31 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-16 21:31 Jimi Huotari [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-08  7:54 [gentoo-commits] repo/gentoo:master commit in: dev-python/qscintilla-python/ Michał Górny
2024-05-08  7:54 Michał Górny
2024-04-16 21:31 Jimi Huotari
2023-10-18 15:51 Sam James
2023-10-18 15:51 Sam James
2023-09-17  6:17 Sam James
2022-11-23 21:18 Andreas Sturmlechner
2022-10-28 18:55 Sam James
2022-10-28 18:55 Sam James
2022-09-26 17:18 Andreas Sturmlechner
2022-09-26 17:18 Andreas Sturmlechner
2022-06-01  1:56 Sam James
2022-06-01  1:55 Sam James
2021-10-22  3:02 Davide Pesavento
2021-10-22  3:02 Davide Pesavento
2021-08-02  3:04 Davide Pesavento
2021-08-02  3:04 Davide Pesavento
2021-07-31  4:14 Sam James
2020-12-17  1:17 Davide Pesavento
2020-10-23 23:27 Andreas Sturmlechner
2020-08-18 11:16 Agostino Sarubbo
2020-08-01 23:20 Andreas Sturmlechner
2020-06-16  5:47 Davide Pesavento
2020-06-10 22:36 Davide Pesavento
2020-03-26 18:38 Davide Pesavento
2020-03-22 10:37 Agostino Sarubbo
2020-03-21 15:52 Agostino Sarubbo
2020-03-07 15:11 Michał Górny
2020-01-11 19:25 Davide Pesavento
2019-12-31 14:06 Agostino Sarubbo
2019-12-31 14:02 Agostino Sarubbo
2019-12-27  1:01 Davide Pesavento
2019-12-23  0:09 Davide Pesavento
2019-12-03  4:18 Aaron Bauman
2019-12-03  2:57 Davide Pesavento
2019-11-16 19:55 Davide Pesavento
2019-04-03  1:01 Davide Pesavento
2019-04-03  1:01 Davide Pesavento
2019-03-21 20:46 Davide Pesavento
2019-03-21 20:30 Davide Pesavento
2018-12-31 23:44 Davide Pesavento
2018-12-31 22:27 Davide Pesavento
2018-12-29 19:12 Thomas Deutschmann
2018-12-15 20:37 Davide Pesavento
2018-10-07 23:22 Davide Pesavento
2018-09-16 23:53 Davide Pesavento
2018-08-26 17:57 Davide Pesavento
2018-08-25 18:48 Davide Pesavento
2018-08-25 18:11 Davide Pesavento
2018-07-09 14:02 Mikle Kolyada
2018-07-06 13:43 Thomas Deutschmann
2018-04-15 17:16 Davide Pesavento
2018-04-12 21:42 Andreas Sturmlechner
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 15:51 Aaron Bauman
2018-03-04 22:16 Davide Pesavento
2017-11-27 23:58 Andreas Sturmlechner
2017-11-25  0:54 Davide Pesavento
2017-11-25  0:33 Davide Pesavento
2017-11-20 15:42 Manuel Rüger
2017-11-12  7:26 Davide Pesavento
2017-11-12  7:26 Davide Pesavento
2017-11-12  7:26 Davide Pesavento
2017-11-02 21:16 Thomas Deutschmann
2017-09-30  7:18 Sergei Trofimovich
2017-09-29 11:33 Michael Palimaka
2017-08-19 18:40 Davide Pesavento
2017-05-02  8:47 Michał Górny
2017-04-16  5:18 Davide Pesavento
2017-01-25  0:54 Davide Pesavento
2017-01-22  1:21 Davide Pesavento
2017-01-08 18:20 Davide Pesavento
2017-01-01 14:20 Michael Palimaka
2016-12-31  6:05 Andrey Grozin
2016-12-22 18:26 David Seifert
2016-10-02 10:08 Jeroen Roovers
2016-07-27  9:31 Davide Pesavento
2016-07-14 20:43 Davide Pesavento
2016-07-14 12:36 Davide Pesavento
2016-07-13 21:22 Michael Palimaka
2016-04-23 22:36 Davide Pesavento
2016-04-20  0:40 Davide Pesavento
2016-04-20  0:40 Davide Pesavento
2015-10-24 15:44 Davide Pesavento

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1713303036.0ee55a3ef60a76aa7662f02a8afce9c24786d2bf.chiitoo@gentoo \
    --to=chiitoo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox