* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2023-12-17 12:04 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-17 12:04 UTC (permalink / raw
To: gentoo-commits
commit: ae150890176998951cac4dc6107a7566c1f83c89
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 05:54:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 12:04:31 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae150890
net-libs/accounts-qml: fix multibuild
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index 5f43ea702f..f04e0f0b77 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -67,11 +67,14 @@ pkg_setup() {
src_prepare() {
default
- rm -v .gitignore doc/html/.gitignore || die
+ rm -v doc/html/.gitignore || die
+ multibuild_copy_sources
}
src_configure() {
my_src_configure() {
+ cd "${BUILD_DIR}" || die
+
local myqmakeargs=(
CONFIG+=no_docs \
PREFIX="${EPREFIX}"/usr
@@ -88,7 +91,12 @@ src_configure() {
}
src_compile() {
- multibuild_foreach_variant default
+ my_src_compile() {
+ emake -C "${BUILD_DIR}"
+ }
+
+ multibuild_foreach_variant my_src_compile
+
if use doc; then
local qtanybindir
if has_version "dev-qt/qttools:6[qdoc]"; then
@@ -103,7 +111,11 @@ src_compile() {
}
src_install() {
- multibuild_foreach_variant emake INSTALL_ROOT="${D}" install_subtargets
+ my_src_install() {
+ emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets
+ }
+
+ multibuild_foreach_variant my_src_install
use doc && local HTML_DOCS=( doc/html )
einstalldocs
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2023-12-21 16:16 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-21 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 5f8755e13ba871be8edba9b042426d510414faea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 16:16:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 16:16:05 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f8755e1
net-libs/accounts-qml: fix qt6 test deps
No need for USE=test for this, that's just for building qt's tests.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index f04e0f0b77..8bc3d0c1ba 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
dev-qt/qtgui:5
dev-qt/qttest:5
)
- qt6? ( dev-qt/qtbase:6[gui,test] )
+ qt6? ( dev-qt/qtbase:6[gui] )
)
"
BDEPEND="
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2024-01-03 18:29 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-01-03 18:29 UTC (permalink / raw
To: gentoo-commits
commit: e5a18e76cfced163fbafb34a19b5c722866fb4f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 17:47:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 18:08:47 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e5a18e76
net-libs/accounts-qml: Add missing REQUIRED_USE
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index e3edd80353..1e2eb81a77 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="doc +qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
# dbus problems
RESTRICT="test"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2024-01-12 14:27 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-01-12 14:27 UTC (permalink / raw
To: gentoo-commits
commit: bd8da64e9d6c9fcd71f2fccae6928c3f9c0d833d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 14:26:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 14:26:59 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd8da64e
net-libs/accounts-qml: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index 1e2eb81a77..68c5ede3c7 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -9,9 +9,17 @@ if [[ ${PV} = *9999* ]] ; then
EGIT_REPO_URI="https://gitlab.com/accounts-sso/accounts-qml-module.git/"
inherit git-r3
else
- SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz
- https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz"
- S="${WORKDIR}/${PN}-module-VERSION_${PV}"
+ COMMIT=05e79ebbbf3784a87f72b7be571070125c10dfe3
+ if [[ -n ${COMMIT} ]] ; then
+ SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/${COMMIT}/${PN}-module-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${PN}-module-${COMMIT}"
+ else
+ SRC_URI="
+ https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz
+ "
+ S="${WORKDIR}/${PN}-module-VERSION_${PV}"
+ fi
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
@@ -35,8 +43,8 @@ RDEPEND="
dev-qt/qtbase:6
dev-qt/qtdeclarative:6
)
- >=net-libs/accounts-qt-1.16-r1[qt5?,qt6?]
- >=net-libs/signond-8.61-r1[qt5?,qt6?]
+ >=net-libs/accounts-qt-1.16_p20220803[qt5?,qt6?]
+ >=net-libs/signond-8.61-r100[qt5?,qt6?]
"
DEPEND="${RDEPEND}
test? (
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2024-01-13 16:39 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-01-13 16:39 UTC (permalink / raw
To: gentoo-commits
commit: f55d84b295ffb0be8a897b10ca6aa7a293bf180a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 16:38:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 16:38:12 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f55d84b2
net-libs/accounts-qml: app-doc/doxygen -> app-text/doxygen
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index 68c5ede3c7..7b40f67112 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
doc? (
- app-doc/doxygen
+ app-text/doxygen
|| (
( dev-qt/qttools:6[assistant,qdoc] )
(
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2024-06-19 15:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-06-19 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 11212a988d078f8a77eb8ea481bfa341b8e211ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 15:18:12 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 15:18:12 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=11212a98
net-libs/accounts-qml: Fix build w/ USE=doc
Bug: https://bugs.gentoo.org/934547
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
index 7b40f67112..4412dd400a 100644
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-9999.ebuild
@@ -109,7 +109,7 @@ src_compile() {
if use doc; then
local qtanybindir
if has_version "dev-qt/qttools:6[qdoc]"; then
- qtanybindir="$(qt6_get_libdir)"
+ qtanybindir="$(qt6_get_libdir)/qt6/bin/"
elif has_version "dev-qt/qdoc:5"; then
qtanybindir="$(qt5_get_bindir)"
else
@@ -125,6 +125,6 @@ src_install() {
}
multibuild_foreach_variant my_src_install
- use doc && local HTML_DOCS=( doc/html )
+ use doc && local HTML_DOCS=( doc )
einstalldocs
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/
@ 2024-08-09 19:36 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-08-09 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 2f3821253961c1654215f9c550e0c421832b85a8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 19:35:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 19:36:40 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f382125
net-libs/accounts-qml: treeclean
Served its purpose for in-overlay KF6 porting.
No need for a stale live ebuild accumulating dust.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/accounts-qml/accounts-qml-9999.ebuild | 130 -------------------------
net-libs/accounts-qml/metadata.xml | 11 ---
2 files changed, 141 deletions(-)
diff --git a/net-libs/accounts-qml/accounts-qml-9999.ebuild b/net-libs/accounts-qml/accounts-qml-9999.ebuild
deleted file mode 100644
index 4412dd400a..0000000000
--- a/net-libs/accounts-qml/accounts-qml-9999.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils multibuild
-
-if [[ ${PV} = *9999* ]] ; then
- EGIT_REPO_URI="https://gitlab.com/accounts-sso/accounts-qml-module.git/"
- inherit git-r3
-else
- COMMIT=05e79ebbbf3784a87f72b7be571070125c10dfe3
- if [[ -n ${COMMIT} ]] ; then
- SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/${COMMIT}/${PN}-module-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/${PN}-module-${COMMIT}"
- else
- SRC_URI="
- https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.bz2
- https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz
- "
- S="${WORKDIR}/${PN}-module-VERSION_${PV}"
- fi
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QML bindings for accounts-qt and signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc +qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
-
-# dbus problems
-RESTRICT="test"
-
-RDEPEND="
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- )
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qtdeclarative:6
- )
- >=net-libs/accounts-qt-1.16_p20220803[qt5?,qt6?]
- >=net-libs/signond-8.61-r100[qt5?,qt6?]
-"
-DEPEND="${RDEPEND}
- test? (
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qttest:5
- )
- qt6? ( dev-qt/qtbase:6[gui] )
- )
-"
-BDEPEND="
- doc? (
- app-text/doxygen
- || (
- ( dev-qt/qttools:6[assistant,qdoc] )
- (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
- )
- )
-"
-
-DOCS=( README.md )
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
-src_prepare() {
- default
- rm -v doc/html/.gitignore || die
- multibuild_copy_sources
-}
-
-src_configure() {
- my_src_configure() {
- cd "${BUILD_DIR}" || die
-
- local myqmakeargs=(
- CONFIG+=no_docs \
- PREFIX="${EPREFIX}"/usr
- )
-
- if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
- eqmake6 "${myqmakeargs[@]}"
- else
- eqmake5 "${myqmakeargs[@]}"
- fi
- }
-
- multibuild_foreach_variant my_src_configure
-}
-
-src_compile() {
- my_src_compile() {
- emake -C "${BUILD_DIR}"
- }
-
- multibuild_foreach_variant my_src_compile
-
- if use doc; then
- local qtanybindir
- if has_version "dev-qt/qttools:6[qdoc]"; then
- qtanybindir="$(qt6_get_libdir)/qt6/bin/"
- elif has_version "dev-qt/qdoc:5"; then
- qtanybindir="$(qt5_get_bindir)"
- else
- eerror "dev-qt/qttools:6[qdoc] nor dev-qt/qdoc:5 available even though in deps(?)"
- fi
- ${qtanybindir}/qdoc doc/accounts-qml-module.qdocconf || die
- fi
-}
-
-src_install() {
- my_src_install() {
- emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install_subtargets
- }
-
- multibuild_foreach_variant my_src_install
- use doc && local HTML_DOCS=( doc )
- einstalldocs
-}
diff --git a/net-libs/accounts-qml/metadata.xml b/net-libs/accounts-qml/metadata.xml
deleted file mode 100644
index 320bd7afde..0000000000
--- a/net-libs/accounts-qml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="gitlab">accounts-sso/accounts-qml-module</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-08-09 19:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-21 16:16 [gentoo-commits] proj/kde:master commit in: net-libs/accounts-qml/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-09 19:36 Andreas Sturmlechner
2024-06-19 15:19 Andreas Sturmlechner
2024-01-13 16:39 Sam James
2024-01-12 14:27 Sam James
2024-01-03 18:29 Andreas Sturmlechner
2023-12-17 12:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox