gentoo auto-resync : 15:09:2022 - 05:12:09

8 files changed, 120 insertions, 24 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 24383d08d4dd..17f6eeaa32aa 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qml/Manifest b/net-libs/accounts-qml/Manifest
index 168da047ba21..69c66d804455 100644
--- a/net-libs/accounts-qml/Manifest
+++ b/net-libs/accounts-qml/Manifest
@@ -1,4 +1,6 @@
-AUX accounts-qml-0.7-no-tests.patch 307 BLAKE2B 2faefed0d6de1d0f271aece811b5fa064bf67017a8964ad4cd83d2b618e30cce6fabc0272ba3fa5949da1229255602a4b86191dd9e27a91c9f95fd20cffb26e1 SHA512 d0b199098bd7993178084b795138fc87282015525d11e14913056fbaa1b0954fd37d2ad6bb56855513d900fa0ea7a4a4beb31de6bdd4338785bcba9eb1df2eba
+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-module-VERSION_0.7.tar.gz 62029 BLAKE2B 0924b73868135ad5d9ec7545d5b0ba84f140053f0be4d17f1c6d3754ec19e362af906af60fb45e6405b5d080dd8f63845070815b12e8bfeda30032c9ed172708 SHA512 4e0e5df64d0a477e11f412c0def85d0de1730efff9682790f5339a57d58778282aa8ca0fa201e409b3b9a2a75fea70f10555b1f70224a3b95ab8d44b942cf7e1
-EBUILD accounts-qml-0.7-r1.ebuild 971 BLAKE2B 25c8e54d5a5bdf0d24ffd4fbd2663bef48d57e1d5bc44f3834aa9de5eca7e86bb49f838dc6ced1278ea8707513564fa32d4d1a41e12467d849481a0c7395953f SHA512 65adb21f20fe7f72e6985f8d5ce57fa913591c23b6a13fa225b47b72ea9093126af556c3cce29ac305de6b9a7fd4fe6ddbe902cc7f7291c5f59ee4fc863f6301
+EBUILD accounts-qml-0.7-r1.ebuild 1049 BLAKE2B 8fae52112fb577853524b79790a4bfd1225399ba2469a9a711e483280c3cc7dab89f6055d386070f04a0bf6ac508005b12dce0fa3c8bc0ccf20907fde98d46f6 SHA512 69d71aba53cda35fbf261f8677945edfc3ca80dd5dcd03a4ad8b9c6e6211781071b0605d093582033d6283a419258d0f53e9428c0d4ba298f1aebdecee835f0b
+EBUILD accounts-qml-0.7-r2.ebuild 1328 BLAKE2B 804d603c5fdcba79f7b63871c07b10ddf7b2d0ef58e1a8bbc882a046a38e9fea8095c8ef61759e5ed4e23c3540373df4a64dfcfeeb4e384a3d505ac891b53955 SHA512 78cd170252199f1369fc90364e48d9c20faeb798ab3fc31ddde900425879767ade7a40a354484f0ad6fa2c608f4f8103d230b5fe49a8cbd38bdded55ce3d1de8
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
index 2e93ec2c43fd..69d8dd7a258a 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
@@ -7,7 +7,8 @@ inherit qmake-utils
 
 DESCRIPTION="QML bindings for accounts-qt and signond"
 HOMEPAGE="https://accounts-sso.gitlab.io/"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz"
+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"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -33,7 +34,7 @@ DEPEND="${RDEPEND}
 # dbus problems
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-no-tests.patch" )
+PATCHES=( "${WORKDIR}/${P}-patches-1/${P}-no-tests.patch" )
 
 S="${WORKDIR}/${PN}-module-VERSION_${PV}"
 
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
new file mode 100644
index 000000000000..2555f92d251b
--- /dev/null
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="QML bindings for accounts-qt and signond"
+HOMEPAGE="https://accounts-sso.gitlab.io/"
+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}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+# dbus problems
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	net-libs/accounts-qt
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-qt/qdoc:5
+	)
+"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${WORKDIR}/${P}-patches-1" # bug 849773
+	"${FILESDIR}/${P}-gcc12.patch" # bug 870157, pending upstream
+)
+
+src_prepare() {
+	default
+	rm -v .gitignore doc/html/.gitignore || die
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=no_docs \
+		PREFIX="${EPREFIX}"/usr
+}
+
+src_compile() {
+	default
+	if use doc; then
+		$(qt5_get_bindir)/qdoc doc/accounts-qml-module.qdocconf || die
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install_subtargets
+	use doc && local HTML_DOCS=( doc/html )
+	einstalldocs
+}
diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch
new file mode 100644
index 000000000000..abe820f2383d
--- /dev/null
+++ b/net-libs/accounts-qml/files/accounts-qml-0.7-gcc12.patch
@@ -0,0 +1,30 @@
+From 6bfa9d24363e28971839d86925d9de3d7aef512c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Sep 2022 22:40:30 +0100
+Subject: [PATCH] Fix build failure with GCC 12 (missing <algorithms> include)
+
+Needed for std::sort.
+
+Bug: https://bugs.gentoo.org/870157
+Fixes: 69e17dec5add40655cd9334ec7ad4eef13fed8a4
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/account-service-model.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/account-service-model.cpp b/src/account-service-model.cpp
+index deb157e..20a445c 100644
+--- a/src/account-service-model.cpp
++++ b/src/account-service-model.cpp
+@@ -20,6 +20,8 @@
+ #include "debug.h"
+ #include "manager.h"
+ 
++#include <algorithm>
++
+ #include <Accounts/Account>
+ #include <Accounts/AccountService>
+ #include <Accounts/Application>
+-- 
+GitLab
+
diff --git a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch b/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
deleted file mode 100644
index cfe8dec082bb..000000000000
--- a/net-libs/accounts-qml/files/accounts-qml-0.7-no-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/accounts-qml-module.pro	2016-06-08 09:26:26.000000000 +0200
-+++ b/accounts-qml-module.pro	2019-12-08 14:16:24.058806381 +0100
-@@ -5,8 +5,9 @@
- TEMPLATE = subdirs
- CONFIG += ordered
- SUBDIRS = \
--    src \
--    tests
-+    src
-+
-+CONFIG(tests): SUBDIRS += tests
- 
- include(common-installs-config.pri)
- 
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index cd49cf7e9ec7..008c7830efe2 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,4 @@
 DIST rpcsvc-proto-1.4.3.tar.xz 167964 BLAKE2B dc15392fd68b76ffa92c08039076aed293834b047ebea4a418dc767ea13e3a04b19e5108ebda808dfa4356ca426db610847758d69b23cc66981eb4ea844eb218 SHA512 e46ba9ccdd6c520128bf3a154db90742f288a4d593b094a630141cdc5aeb834ffebf9b0eb6d5d0aad9faef3c445c75e2355cbc3e1382b50d29f4d2799441c6e9
 EBUILD rpcsvc-proto-0-r1.ebuild 471 BLAKE2B b0b4ceaa115b11ede6f31697b22ef19201a61918b8b64efa5e46e859f9e566459e3d9e3e12199eb93075d7d01b3fa21b0b81155f1ebbd3ecf85ac2ba212b2f1e SHA512 2259a0d8b0a1357c882de4d3d1db7cb95cc2756e8d83a2677e42418a5c6549a90e6da0a870cc04935951623cb713c9eb15077f5680e011087e78ef0d14ca80f0
-EBUILD rpcsvc-proto-1.4.3-r1.ebuild 952 BLAKE2B 94d1721fa83baa96bd63249ff6ca3532f1ae3f3706633f6e84aee53d5720c191e98a092247acb93a90aa4aaec7fb87a102eca87b9813abd7756171eafced6f98 SHA512 9dcfeab020127b45cae610d0bc40c3e35aebb2b0db5388be2107aacb8c202b4f4dc028cc061ebef65475db754890456557458eb38bd0dc2fe250c65a2f447933
+EBUILD rpcsvc-proto-1.4.3-r1.ebuild 1098 BLAKE2B 174b875d821f49c18f8f952bfb6c644a950d77b7f83b7a8b78f6cd562f057bcda7645ba179fc33cce4ab9ea9d57d9e644a25aa56b8dd292f15385d3b40b37197 SHA512 28a94298d2bacd886a64cfc2f3362e73db3f6f09d2b6cdf86e829563480215af1504781df137dbdf8d9cd8aa6d26cc28eba2ebcf9f778b6b2a486c0831ad0e27
 MISC metadata.xml 473 BLAKE2B 698516ac72d10ef9da180c90077a04520ba92e66ff8750a8666e799171414cd8ab1a8c0211cac51fbae458e92b55b1627a1d018d3aae71c3ec9f33dd673af775 SHA512 aca1897bf12f0f821170c9b5734f1d990e8efa645481049e989aabad3eea722f9bce410f769f953121b8a2be942fdbca1100514e253fba0c9e356d703c234004
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
index f7687c8b7eca..480e738d5930 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit toolchain-funcs
-
 DESCRIPTION="rpcsvc protocol definitions from glibc"
 HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 SRC_URI="https://github.com/thkukuk/rpcsvc-proto/releases/download/v${PV}/${P}.tar.xz"
@@ -21,9 +19,18 @@ BDEPEND="sys-devel/gettext"
 src_prepare() {
 	default
 
-	# Use ${CHOST}-cpp, not 'cpp': bug #718138
-	# Ideally we should use @CPP@ but rpcgen makes it hard to use '${CHOST}-gcc -E'
-	sed -i -s "s/CPP = \"cpp\";/CPP = \"$(tc-getPROG CPP cpp)\";/" rpcgen/rpc_main.c || die
+	# Search for a valid 'cpp' command.
+	# The CPP envvar might contain '${CC} -E', which does not work for rpcgen.
+	# Bug 718138, 870031, 870061.
+	local x cpp=
+	for x in {${CHOST}-,}{,clang-}cpp; do
+		if type -P "${x}" >/dev/null; then
+			cpp=${x}
+			break
+		fi
+	done
+	[[ -n ${cpp} ]] || die "Unable to find cpp"
+	sed -i -e "s/CPP = \"cpp\";/CPP = \"${cpp}\";/" rpcgen/rpc_main.c || die
 }
 
 src_install() {