public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-07-25 20:05 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-07-25 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba8aef245ea39c2a5f7437de78ff1be5a1854a4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 18:46:52 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 20:04:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba8aef2

dev-libs/kdsingleapplication: Drop IUSE qt6 (dropping qt5 "option")

- Fix IUSE doc, examples
- Use qmake-utils to set QHELPGEN_EXECUTABLE
- Simplify src_install(), cmake_src_install calls einstalldocs
- Do not use rm -f (we want to know when sth. breaks)
- Arrayify HTML_DOCS and make local

Bug: https://bugs.gentoo.org/935012
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kdsingleapplication-1.1.0-r1.ebuild            | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..6614a67561d6
--- /dev/null
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake qmake-utils
+
+DESCRIPTION="KDAB's helper class for single-instance policy applications"
+HOMEPAGE="https://github.com/KDAB/KDSingleApplication"
+SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kdsingleapplication-${PV}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-qt/qtbase:6[network,widgets]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		dev-qt/qttools:6[assistant]
+	)
+	examples? ( dev-util/patchelf )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DKDSingleApplication_QT6=ON
+		-DKDSingleApplication_DOCS=$(usex doc)
+		-DKDSingleApplication_EXAMPLES=$(usex examples)
+		-DKDSingleApplication_TESTS=$(usex test)
+	)
+	use examples && mycmakeargs+=(
+		-DQHELPGEN_EXECUTABLE="$(qt6_get_bindir)/../libexec/qhelpgenerator"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc; then
+		if use examples; then
+			rm -r "${BUILD_DIR}"/docs/api/html/examples || die
+		fi
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/api/html/. )
+	fi
+	if use examples; then
+		patchelf --remove-rpath "${BUILD_DIR}"/bin/widgetsingleapplication || die
+		dobin "${BUILD_DIR}"/bin/widgetsingleapplication
+	fi
+	cmake_src_install
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-07-25 20:05 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-07-25 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8d2f5bad0da9a837935bc1bac1bc10daf15b19b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 19:16:15 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 20:04:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2f5bad

dev-libs/kdsingleapplication: drop 1.1.0

Closes: https://bugs.gentoo.org/935012
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kdsingleapplication-1.1.0.ebuild               | 96 ----------------------
 1 file changed, 96 deletions(-)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0.ebuild
deleted file mode 100644
index 67fef37a2e74..000000000000
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="KDAB's helper class for single-instance policy applications"
-HOMEPAGE="https://github.com/KDAB/KDSingleApplication"
-SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kdsingleapplication-${PV}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="doc examples test qt6"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	qt6? (
-		dev-qt/qtbase:6[network,widgets]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qthelp:5
-		qt6? (
-			dev-qt/qttools:6[assistant]
-		)
-	)
-	examples? (
-		dev-util/patchelf
-	)
-	dev-qt/qttest:5
-"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( qt5 $(usev qt6) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		)
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=(
-				-DKDSingleApplication_DOCS=OFF
-				-DKDSingleApplication_EXAMPLES=OFF
-				-DKDSingleApplication_QT6=ON
-				-DKDSingleApplication_TESTS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DKDSingleApplication_DOCS=$(usex doc)
-				-DKDSingleApplication_EXAMPLES=$(usex examples)
-				-DKDSingleApplication_QT6=OFF
-				-DKDSingleApplication_TESTS=$(usex test)
-			)
-		fi
-		cmake_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	mytest() {
-		[[ ${MULTIBUILD_VARIANT} == qt5 ]] && cmake_src_test
-	}
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		cmake_src_install
-		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
-			rm -rf "${BUILD_DIR}"/docs/api/html/examples || die
-			use doc && HTML_DOCS="${BUILD_DIR}/docs/api/html/*"
-			if use examples; then
-				patchelf --remove-rpath "${BUILD_DIR}"/bin/widgetsingleapplication || die
-				dobin "${BUILD_DIR}"/bin/widgetsingleapplication
-			fi
-		fi
-	}
-	multibuild_foreach_variant myinstall
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-07-26  1:06 Jakov Smolić
  0 siblings, 0 replies; 6+ messages in thread
From: Jakov Smolić @ 2024-07-26  1:06 UTC (permalink / raw
  To: gentoo-commits

commit:     54d320909a51b335540f2bef97cc9131e9e06721
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 01:06:38 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 01:06:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d32090

dev-libs/kdsingleapplication: Keyword 1.1.0-r1 ppc64, #926898

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index 6614a67561d6..e8956a2e22ba 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kd
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-07-30 21:31 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-07-30 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e2e809881a1dddad2075c403677b0d4539c362e3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 21:29:53 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 21:30:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e80988

dev-libs/kdsingleapplication: Fix IUSE doc/examples cmake args

Closes: https://bugs.gentoo.org/936650
Closes: https://bugs.gentoo.org/936648
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index e8956a2e22ba..1d7dcfa84e12 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 		-DKDSingleApplication_EXAMPLES=$(usex examples)
 		-DKDSingleApplication_TESTS=$(usex test)
 	)
-	use examples && mycmakeargs+=(
+	use doc && mycmakeargs+=(
 		-DQHELPGEN_EXECUTABLE="$(qt6_get_bindir)/../libexec/qhelpgenerator"
 	)
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-08-29 19:42 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-08-29 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ed5bdbda30c7fe9c251bced4ed657f603326c4fa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 19:40:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 19:40:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5bdbda

dev-libs/kdsingleapplication: Stabilize 1.1.0-r1 x86, #938676

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

 dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index 1d7dcfa84e12..b54e88db5e76 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kd
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/
@ 2024-08-29 19:42 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-08-29 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     011db69ee09a657f976ecf3f1725541b677676f1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 19:40:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 19:40:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011db69e

dev-libs/kdsingleapplication: Stabilize 1.1.0-r1 amd64, #938676

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

 dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
index b54e88db5e76..17e8f739c4a8 100644
--- a/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
+++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kd
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-08-29 19:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 19:42 [gentoo-commits] repo/gentoo:master commit in: dev-libs/kdsingleapplication/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 19:42 Sam James
2024-07-30 21:31 Andreas Sturmlechner
2024-07-26  1:06 Jakov Smolić
2024-07-25 20:05 Andreas Sturmlechner
2024-07-25 20:05 Andreas Sturmlechner

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