gentoo resync : 25.11.2020

5 files changed, 105 insertions, 3 deletions

diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index bbcc621d1d7f..94bb25810435 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,9 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
+AUX signon-oauth2-0.25-cxxflags.patch 795 BLAKE2B 6dfd833830d7344f962fb97bde7c54f976be2c41988e90837225f3adfc0cc4b651aa670f35a95dc481ce651d10942a0d386e03f86dca117d4145928cda965111 SHA512 94dffe79441d5ea90acc29e1d457bdec2e762c18a169ae8873963ed612709d472ac55985ca21c41298557eda4e65879d70a595eda635df75a46c7bdea3ab675e
+AUX signon-oauth2-0.25-pkgconfig-libdir.patch 455 BLAKE2B 787c03ead028ff9e7980deb7eb4e2439864a1307e60dfa34b3e7c18d9f2b753016aa79208651624f10cebdfd89b672eb03097a8c7482389e7bb128bb16189e58 SHA512 b0589d51b4d5c7c51754752c7159e501620d782916fcea8aeb7d3eb8b33121372517be4babce48c90e5abd2e1fde9d3663deb66a8d2065e8cdbfedbf938b7a6d
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 1119 BLAKE2B 90c0f1275b8562bb4847e73f1ab6261d5d4e180f507ca80e58b151561e63e98e68c7d2ef9c00672537070d50faebdd9854ae2d899636913523c42076a3078663 SHA512 b51f3c2d641239ccef7d51524b60ef6944c0942ddc617a0b147bb5a6acdc3c8600bdae2abc653be40511a29c11d92155eae15f06e97206ce7dfdbb0a79b9c15c
+DIST signon-oauth2-0.25.tar.gz 41090 BLAKE2B d14cde073cf834427e337f94345b719ad1af38a285587f987f6ed42f96e8aecfcf63720e42b7f86f2018565c198e1f31b7b75da74c86db3e8a15680da70d3f9e SHA512 721cd514ee0a1175e3b1bbaa78dc1a87fd382327bcbee8356de040f04455f7cc80ed173e3f33a6acf4c0d679847063a25282e9d5c9a9be99f730bec41be96451
+EBUILD signon-oauth2-0.24.ebuild 1131 BLAKE2B 2b2e88b2ef23769ca79cd86427e365e10108dccc1a313f6c6e7fdd07db2c4a2bd23381f5a2c68a9483937c0c726239fc5ba0988991b1f296f02ce950f701bfb4 SHA512 ddfb2cdfc778813d176b8fb31346626b5140eefe22b55bbd4a61ffab6fa33d9e9b0603f8a33aa49c3daf2e899e354f58f5a3cee6aa2edc3d6ac61b2e37d37461
+EBUILD signon-oauth2-0.25.ebuild 1140 BLAKE2B b1848c19a4d79c90c7864b326807a365da1644efa493e1a67867fc2d45b934f570b3e593593db0905d6f88c306a0e9ef056bf6fe7638b228e03dcea15c31eb46 SHA512 dde4de232b385877d59cbcb98ebdc2cfd098ad26baeda7bac55c96b5901272e0fd70b15668a9f23fb5b4ed6ccb5c0803abb96d33300cb38227dcb3a9a911f153
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch
new file mode 100644
index 000000000000..ea64d2c8b642
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-cxxflags.patch
@@ -0,0 +1,29 @@
+From 94e7cdbe1b15455e932a2272fdf2284fecfb9204 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 11 Nov 2020 22:35:06 +0100
+Subject: [PATCH] Disable -Werror, -fno-rtti
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ common-project-config.pri | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index e149d90..9c7801a 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -17,10 +17,7 @@ UI_DIR          = ui
+ UI_HEADERS_DIR  = ui/include
+ UI_SOURCES_DIR  = ui/src
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
+-# we don't like warnings...
+-unix:QMAKE_CXXFLAGS += -Werror
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ TOP_SRC_DIR     = $$PWD
+ 
+-- 
+2.29.2
+
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..fd61e4c2aede
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.25-pkgconfig-libdir.patch
@@ -0,0 +1,14 @@
+--- a/src/signon-oauth2plugin.pc	2016-06-02 11:44:21.000000000 +0200
++++ b/src/signon-oauth2plugin.pc	2017-11-03 10:57:35.659278702 +0100
+@@ -1,9 +1,9 @@
+ prefix=/usr
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib/
++libdir=${prefix}/@LIBDIR@/
+ includedir=${prefix}/include
+ Name: signon-oauth2plugin
+ Description: Signon OAuth 2.0 plugin
+ Version: 0.0.1
+ Requires: signon-plugins
+-Libs.private: -L/usr/lib  -lQtCore
++Libs.private: -L/usr/@LIBDIR@  -lQtCore
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index 6afc4fe8d209..5317e17cef7b 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
new file mode 100644
index 000000000000..76e60e083a28
--- /dev/null
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=signon-plugin-oauth2
+MY_PV=VERSION_${PV}
+MY_P=${MY_PN}-${MY_PV}
+inherit qmake-utils
+
+DESCRIPTION="OAuth2 plugin for Signon daemon"
+HOMEPAGE="https://gitlab.com/accounts-sso/signon-plugin-oauth2"
+SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}/${PN}-0.24-dont-install-tests.patch"
+	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-cxxflags.patch"
+)
+
+src_prepare() {
+	default
+	sed -i "s|@LIBDIR@|$(get_libdir)|g" src/signon-oauth2plugin.pc || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		LIBDIR=/usr/$(get_libdir)
+	)
+	use test || myqmakeargs+=( CONFIG+=nomake_tests )
+
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}