gentoo resync : 02.06.2018

4 files changed, 79 insertions, 0 deletions

diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index d3c6c07e6660..3912f12dc8ef 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,4 +1,8 @@
 AUX signon-oauth2-0.21-unused-dependency.patch 295 BLAKE2B d4d2e49edaafdbcce8c813a2f1760f527abc1172b34780a0d08505dc0a967baa20b9a75e00a75389d1f25ac86788d0c199751fff692721035f05324109691e86 SHA512 16a1b68ca0d32f1948691cb1372852ec3e45ecac4eb4a2f6fff040400692aa699907e82e73da445e556c5f9107d8048f7803b45bed07d293206a692dddc38b48
+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
 DIST signon-oauth2-0.21.tar.bz2 37819 BLAKE2B 5de9add1952ba94e12b776c7f4b462bfc31ce01c148d8819b6e159510c4b00f4d2fc915a62f585b1061d46efbeb92406e3c117452e4e7f5575404fea3ab20601 SHA512 b0f97353e87c08420c3132f3357522b526a7c48df807ab833e05297ebfc86e0e8f25d4d3aa94e8ebc4aa1d9bc77856d63c43e5b5e9f3e63628f7710b9a056fd0
+DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
 EBUILD signon-oauth2-0.21-r1.ebuild 841 BLAKE2B a6d424f9e2720dc7e1289fb9e0dd432fd8f3c0a6b2015f83fb86a29681cfc73e88892ea0d27ee262d34a420fbfd8f5fc7a2785172ea16ba0b5093611c986d50d SHA512 8fe420882ef3212253a9a0c3ab3111cdd1e0ebf0bd57fa2a7174b4ebb94478e464a909484e619c373de72fb9880f9d4de5fcded607b49dbe5894410c3f924cca
+EBUILD signon-oauth2-0.24.ebuild 945 BLAKE2B 8fe23bd251c2313faed2e5bc441f026ce096759d99fd348e7a8f90635034b7fbfb2146759aaf3d5875c5944bc3fcaac02d5f2c73ef8b2d949529e16e41e35393 SHA512 cbb548ebf497f5c679c93a063e40994c9d72cf883498f6a37578d5999bf050e3dc6ac1bf930116ab1dddb608b68e2a26155bc06855b8ad24e4e80ef1e0e8e834
 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
new file mode 100644
index 000000000000..dd730e449773
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch
@@ -0,0 +1,14 @@
+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/files/signon-oauth2-0.24-dont-install-tests.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch
new file mode 100644
index 000000000000..615bc8b562d2
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/tests.pro	2018-05-29 22:51:43.766914590 +0200
++++ b/tests/tests.pro	2018-05-29 22:52:45.247259336 +0200
+@@ -32,8 +32,6 @@
+ target.path = $${INSTALL_PREFIX}/bin
+ testsuite.path = $${INSTALL_PREFIX}/share/$$TARGET
+ testsuite.files = tests.xml
+-INSTALLS += target \
+-    testsuite
+ 
+ check.depends = $$TARGET
+ check.commands = ./$$TARGET || :
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
new file mode 100644
index 000000000000..ea3dd0c41f71
--- /dev/null
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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://01.org/gsso/"
+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 ~x86"
+IUSE="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
+
+	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
+}