* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2023-12-21 16:16 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-21 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 16c27fcf5b6a826969674b2b092cfdaeec04ea45
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 16:16:16 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 16:16:16 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=16c27fcf
net-libs/signon-oauth2: 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/signon-oauth2/signon-oauth2-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
index dc054814c2..1daee49194 100644
--- a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
@@ -40,7 +40,6 @@ DEPEND="
${RDEPEND}
test? (
qt5? ( dev-qt/qttest:5 )
- qt6? ( dev-qt/qtbase:6[test] )
)
"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2024-01-12 14:27 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-01-12 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 07da0fcb87377a4ae07953768129aa05f0da20c2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 14:27:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 14:27:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07da0fcb
net-libs/signon-oauth2: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/signon-oauth2/signon-oauth2-9999.ebuild | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
index 2eadd67a28..02032ded10 100644
--- a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
@@ -13,8 +13,14 @@ if [[ ${PV} = *9999* ]] ; then
EGIT_BRANCH="qt6"
inherit git-r3
else
- SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${MY_P}"
+ COMMIT=d759439066f0a34e5ad352ebab0b3bb2790d429e
+ if [[ -n ${COMMIT} ]] ; then
+ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${COMMIT}/${MY_PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${MY_PN}-${COMMIT}"
+ else
+ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${MY_P}"
+ fi
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
@@ -34,7 +40,7 @@ RDEPEND="
dev-qt/qtnetwork:5[ssl]
)
qt6? ( dev-qt/qtbase:6[network,ssl] )
- >=net-libs/signond-8.61-r1[qt5=,qt6=]
+ >=net-libs/signond-8.61-r100[qt5=,qt6=]
"
DEPEND="
${RDEPEND}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2023-12-17 12:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-17 12:04 UTC (permalink / raw
To: gentoo-commits
commit: ea4b2a9841623743a83cd7106d68d19af1dbf1f0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 05:43:57 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=ea4b2a98
net-libs/signon-oauth2: drop multibuild
We can't build plugins for both qt5 + qt6, so only build one, and depend
on the corresponding qt version in net-libs/signond.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/signon-oauth2/signon-oauth2-9999.ebuild | 40 +++++++++---------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
index be93637379..e0f72c6c28 100644
--- a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
MY_PN=signon-plugin-oauth2
MY_PV=VERSION_${PV}
MY_P=${MY_PN}-${MY_PV}
-inherit qmake-utils multibuild
+inherit qmake-utils
if [[ ${PV} = *9999* ]] ; then
EGIT_REPO_URI="https://gitlab.com/nicolasfella/${MY_PN}.git/"
@@ -24,6 +24,7 @@ HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+qt5 qt6 test"
+REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -32,9 +33,10 @@ RDEPEND="
dev-qt/qtnetwork:5[ssl]
)
qt6? ( dev-qt/qtbase:6[network,ssl] )
- >=net-libs/signond-8.61-r1[qt5?,qt6?]
+ >=net-libs/signond-8.61-r1[qt5=,qt6=]
"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
test? (
qt5? ( dev-qt/qttest:5 )
qt6? ( dev-qt/qtbase:6[test] )
@@ -48,36 +50,24 @@ PATCHES=(
"${FILESDIR}/${PN}-0.25-drop-fno-rtti.patch"
)
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-}
-
src_prepare() {
default
sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die
}
src_configure() {
- my_src_configure() {
- local myqmakeargs=(
- LIBDIR=/usr/$(get_libdir)
- )
- use test || myqmakeargs+=( CONFIG+=nomake_tests )
-
- if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
- eqmake6 "${myqmakeargs[@]}"
- else
- eqmake5 "${myqmakeargs[@]}"
- fi
- }
-
- multibuild_foreach_variant my_src_configure
-}
+ local myqmakeargs=(
+ LIBDIR=/usr/$(get_libdir)
+ )
+ use test || myqmakeargs+=( CONFIG+=nomake_tests )
-src_compile() {
- multibuild_foreach_variant default
+ if use qt6 ; then
+ eqmake6 "${myqmakeargs[@]}"
+ else
+ eqmake5 "${myqmakeargs[@]}"
+ fi
}
src_install() {
- multibuild_foreach_variant emake INSTALL_ROOT="${D}" install
+ emake INSTALL_ROOT="${D}" install
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2023-12-17 12:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-17 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 02fbb2e3e438b9343287db40ed0114506581c7e4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 05:57:22 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=02fbb2e3
net-libs/signon-oauth2: add TODO
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/signon-oauth2/signon-oauth2-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
index e0f72c6c28..dc054814c2 100644
--- a/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-9999.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
LICENSE="LGPL-2.1"
SLOT="0"
+# TODO: drop USE=qt5 and just have USE=qt6 to control which qt?
IUSE="+qt5 qt6 test"
REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2015-08-27 12:11 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-08-27 12:11 UTC (permalink / raw
To: gentoo-commits
commit: 6bb443a43585329de8c6bcce18a4c0647749bb0b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 12:10:41 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 12:11:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bb443a4
net-libs/signon-oauth2: Remove package
Moved to gentoo main repo.
net-libs/signon-oauth2/metadata.xml | 5 ---
net-libs/signon-oauth2/signon-oauth2-0.21.ebuild | 41 ------------------------
2 files changed, 46 deletions(-)
diff --git a/net-libs/signon-oauth2/metadata.xml b/net-libs/signon-oauth2/metadata.xml
deleted file mode 100644
index a23f444..0000000
--- a/net-libs/signon-oauth2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
deleted file mode 100644
index 2c5b49b..0000000
--- a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="OAuth2 plugin for Signon daemon"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- net-libs/signond
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-src_prepare() {
- if use !test; then
- sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro || die "couldn't disable tests"
- else
- sed -i -e '/^INSTALLS.*/,+1d' tests/tests.pro || die "couldn't remove tests from install target"
- fi
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: net-libs/signon-oauth2/
@ 2015-05-12 13:08 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-05-12 13:08 UTC (permalink / raw
To: gentoo-commits
commit: c9da36c441cd5cf6f1e596ca8fe12a5f305eade2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 13:07:49 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue May 12 13:07:49 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c9da36c4
[net-libs/signon-oauth2] Version bump.
Package-Manager: portage-2.2.18
...{signon-oauth2-0.19.ebuild => signon-oauth2-0.21.ebuild} | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.19.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
similarity index 84%
rename from net-libs/signon-oauth2/signon-oauth2-0.19.ebuild
rename to net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
index 81f2e84..c99d365 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.19.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild
@@ -6,22 +6,23 @@ EAPI=5
inherit qmake-utils
-SRC_URI="https://accounts-sso.googlecode.com/files/${P}.tar.bz2"
-SLOT="0"
DESCRIPTION="OAuth2 plugin for Signon daemon"
HOMEPAGE="https://01.org/gsso/"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtnetwork:5
- dev-qt/qttest:5
net-libs/signond
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
src_prepare() {
if use !test; then
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-12 14:27 UTC | newest]
Thread overview: 6+ 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/signon-oauth2/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-12 14:27 Sam James
2023-12-17 12:04 Sam James
2023-12-17 12:04 Sam James
2015-08-27 12:11 Johannes Huber
2015-05-12 13:08 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox