gentoo resync : 18.12.2020

4 files changed, 2 insertions, 72 deletions

diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index 2b433a0fa59e..3ff580ff18de 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,9 +1,6 @@
-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
 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 1139 BLAKE2B 511171e2f8734cac3bebfb4cb261146e0b0f3c2c7a71b7f3e321bc663a6cd79c010704c1cbb7af5927ad6b23b7f0a7d9cf722ae1e568e63e1aacf1e31d0f6f27 SHA512 27badd72d141bdd279915ef4ef635617b88c2c11330a29af74d92601710525dd57a9eddb7df1742cd18f9863762176ee9f8807ad62158cb92d9b7efe404f89ce
+EBUILD signon-oauth2-0.25.ebuild 1137 BLAKE2B 330a6d2b8409df0fc4b2de83150665226d25b952555752843b07626562a4d046bf4be23b072e365e6c0eb27fb69f72460fc53ccb53c4dd8a1c6413796ea1c6fb SHA512 5f52dd86e72cad9be405ce1a4db42ab7e391eeb0b3722244213ecfb72e27535e1a6b92be554fbfc9af8cf4ab9f4eacf2434d65b63ac4a810d45c3cd5727675c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch
deleted file mode 100644
index dd730e449773..000000000000
--- a/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Diane Trout <diane@ghic.org>
-Description: Don't install the examples as they end up conflicting with
- other packages.
---- a/signon-oauth2.pro
-+++ b/signon-oauth2.pro
-@@ -3,7 +3,7 @@
- 
- TEMPLATE  = subdirs
- CONFIG   += ordered
--SUBDIRS   = src tests example
-+SUBDIRS   = src tests
- 
- include( common-installs-config.pri )
- 
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
deleted file mode 100644
index 5317e17cef7b..000000000000
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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}
-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_PN}-${MY_PV}.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_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-examples.patch"
-	"${FILESDIR}/${P}-dont-install-tests.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e '/QMAKE_CXXFLAGS.*Werror/s/^/#DONT /' common-project-config.pri ||
-		die "failed to disable -Werror"
-	if ! use test; then
-		sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro ||
-			die "Failed to disable tests"
-	fi
-}
-
-src_configure() {
-	eqmake5 \
-		LIBDIR=/usr/$(get_libdir)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
index 90aad7e670c0..cdd4b582c806 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"