gentoo auto-resync : 12:01:2024 - 19:10:40

4 files changed, 139 insertions, 4 deletions

diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index ca4cb178a064..cd7dde15c563 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,5 +1,7 @@
 AUX accounts-qml-0.7-gcc12.patch 819 BLAKE2B b53cdf8fd455f84c8cc053e10c3082f683f6cd30d5e133695ae44f8afd2b749bc47d9e5ea9f7deb4f894e21ca683bfe75d9928b4a28fc5e0e7ec3c715b16551a SHA512 5c714ba915bf7f0181df491b8a56e3692896d3145b6b869cd6128f4d712ce821c208d8992e75d9cc18841bfa19e2fb9da60a03e4a1b6d2dfb3bc6531b28dae73
 DIST accounts-qml-0.7-patches-1.tar.xz 3416 BLAKE2B bbaef28c3d455d4aa458790a875a321870c90e88ba3e6735790b3ea50d89c6ac4ac3ef3320239fb4a120681690af4144ea616638ebe21e51e898e178a94eb5cb SHA512 3f3f4996311fe76c9a438dc2794394879b655373146baa38be13c54a93f0016035d371ae7152df02b56b25f7898ab7d0752de636202e88acae1ee536f2809ad6
+DIST accounts-qml-0.7_p20231028.tar.bz2 50521 BLAKE2B 6704557e50b40d0be6e706c05ce888f959fd2028c7fa9aea9d3f2064828b6869bee454cd88189e70abe483b0809ec857634b0b8fa5f989fca05ae7af55efb80a SHA512 0d366b526873bdeecb9a5582992b8d659777beff3b5449745141a3c8156e130714acd81343440a2edcff7ed7bfeed2ce1afdb89188c8be2a2737491278b44253
 DIST accounts-qml-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r2.ebuild 1343 BLAKE2B a60cc55e9c2eca0690f185e49afa12cbe878c3a965659657037b604e58721cfdb462ef81cf893cef4899aa9f7587ea11c923527b59f7500e239472d1c292e096 SHA512 17cd20a0067de717c955563e1eb50ddfef726e0c8ae2b1d19fce221510a5609f61d5eb8a8dbda10a31fc4b5d04b37e62622e8e2fefba9056123353916b019a6e
-MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
+EBUILD accounts-qml-0.7-r2.ebuild 1344 BLAKE2B cf839eb0b53d0aa7728cb31aa9e69517ae8d53efeb493082fe3c72c10c28bfd51e6bfdb886c661587770d8f89df884983f5cb7b5df269dcdaf3c219a3abd9183 SHA512 e6589ba7701c56898573385fa32ce198ba2b13c555c28171f5efb32c4fa968b969648061419718b7660a6d31e78eb5e1dd94a2c64f30c9193c3e070d8ce3cb72
+EBUILD accounts-qml-0.7_p20231028.ebuild 2669 BLAKE2B 2f25cc3f40e9e336711da53b01602cf4e9b6186ca3e1f0dd0a516e3d9564ebf3c9aca00695b6278a306b5cda25f72b12a33b712413456cc24735f7c68eae195e SHA512 3a63400ee44b72240879d16a6faa244977cda3d1bd62f8a27d17cbe848e2e910f30ebb9a65761578c3d429008914d0a837666ad390f3b69908685ae7696ab93e
+MISC metadata.xml 347 BLAKE2B 755e5ea43cad3783e4cb0e4f981a70a02cc25a344de46fe29923edcf5737778312017ddb7be004fc7cc075a6ffd206133952f07aeac30f9bf84277c3ea00eff2 SHA512 adbed6a6a004dc5a83adb510ca9ea5a8c2d43639452cc0c7ca28a2bff6a3680bb7a190c3e78d85008ae3cb444d07cf9d34f7e1b296cf2789e49e682fac970456
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
index 502e8c12b743..d1a1aa9bc909 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	doc? (
-		app-doc/doxygen
+		app-text/doxygen
 		dev-qt/qdoc:5
 		dev-qt/qthelp:5
 	)
diff --git a/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild
new file mode 100644
index 000000000000..7b40f6711238
--- /dev/null
+++ b/net-libs/accounts-qml/accounts-qml-0.7_p20231028.ebuild
@@ -0,0 +1,130 @@
+# 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)"
+		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/html )
+	einstalldocs
+}
diff --git a/net-libs/accounts-qml/metadata.xml b/net-libs/accounts-qml/metadata.xml
index 8641e5bdd399..320bd7afdec3 100644
--- a/net-libs/accounts-qml/metadata.xml
+++ b/net-libs/accounts-qml/metadata.xml
@@ -5,4 +5,7 @@
 		<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>