gentoo resync : 29.06.2020

6 files changed, 179 insertions, 42 deletions

diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 9729444a1921..3fddd6515b23 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,8 +1,9 @@
-AUX signond-8.60-buildsystem.patch 1306 BLAKE2B 5cf758cd974d54fa39e42291f6d4969f341d37970948d0e1bb6f74367a5a77e5b0be8c7a435af2f7474d9ff8ab6f8352a7ddd83e772b792bb8db97032db2b8ba SHA512 ec69a845da1019c7517ca1163bd09fab2cf1f4e1e8faf27c2baa1ae0da5c5b4689b7fadc4207f744224deff7b99eaada6d41af4c451962bc07c9920d1559ba1f
-AUX signond-8.60-consistent-paths.patch 10565 BLAKE2B 09024a3a877d965ad037f3e77add52589e230b2fdeb133960192b6f26d4272395230621625a78633d084f863fd3aa0c931011f47134587a44e1a27a20ca04e91 SHA512 e3731e360c208c75de3634e507c81be94da29df7592ae90c192a30ef727cdf1c86e939a6d27ddd5b227a7655630dc7320c7181f644721e8b59b37501dc34e2fb
+AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c2118bb7d7babf8f253f168be73cf03934d00a875c99048b1985716d7c1f2ac3a2543bd988939e76631aff8e852a464b4589 SHA512 73ac6551d9c1bb37e331baad427d3770a913ab52833f3112f825a5a28647752f925a40c12bf72a79c0c9b93aacbaca5f357a21a48eae4f1f24341cfeb1ce5b57
+AUX signond-8.60-consistent-paths.patch 10627 BLAKE2B 853cc9816469c0b47c8ecab941c1ade09aa2567a6cbe99012da42d479d35d304eeb869700e4fc9f0623191735c1e445aa2046b904ef151cbc048dda00e3c7cd4 SHA512 3c285e57843d458fb30e21f607dc7edf3009d7bcf68c2641188b1ded4cd44d589541b754803a687adf92b2de11417bf3411c0cf2bfdcd6c7375e32bc1948edfe
 AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b7bc80e55d328d6301fa0040bf3750b33891d1e2ce42cab45622b9633fb93e29277889ce27fb54a98fb44bc022124a SHA512 25ef43ed61f8d422882e944600e2571108927920493558904c039a06af7091ec8fdcdcf030cb4e59ebf53d934aa67265d073084b3d280b204f24f74620e764b9
-AUX signond-8.60-unused-dep.patch 254 BLAKE2B 65f6157833a139b72d4fdb07b3877948ce7d7f327e457c0c2391d715475a7110c5e793f02c950b4a7b289ecca2c387ce6133af3d51c7f0d96b3910795abd4ed9 SHA512 21cb1ee319b3219ac46e6b61eec04d93262a3108311e141fee25fb1280fd6673d5ffac0f7b444a9131d5f8a6b255ba8189a75dec83004680d48eae5776404778
+AUX signond-8.60-drop-fno-rtti.patch 4558 BLAKE2B cd75d2a269b337b43286f9a76d189b4cdd91e4c312b7664de49a2b6e72d63eedd3776ef3fe2a659120556725c748cc5a66a16568d3f24726229ca6baef129fa6 SHA512 d7b3abc6f82fdccba7544176f483d26dfe15200a07d9a44aaf0c2a7b27f09a1bef3e8f6e1a59f7a529c21bf373741f541710d1c3cc958bbcb7e0bd58d45d868c
+AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
 DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 EBUILD signond-8.60-r1.ebuild 1622 BLAKE2B ed235128e02a9d93fde9848d2feff85e1ddfe29cc3b5cc97e63cc04630a898a34722750ead88faa5940bd6983fb193911b588a27fdf022ad1fb3fb88211d9570 SHA512 4b5cca985c36a579420153441d4d75e1ef879262b21145385079e9be8244d2442678b4c742d7b2fe9453d2cb97411190bd01ea03fcf6a96887bf09bc3bc575e0
-EBUILD signond-8.60-r2.ebuild 2166 BLAKE2B a01bf96f0641b976263523f5e09052b129554401577c403f1ff0b57d32586d98dc79aef05ec9d369ecb2589c190f317a5f8727face1aaacb2aeae02be8bd5fdc SHA512 f9bb80adb2d4e0790448d7f31afe40f064be2e2d671d97267e0d842471ae354669a9b26f57a9acf93d352473489f1aaf3f8e0e8e847df9dbd2d0d45cd9159a14
+EBUILD signond-8.60-r2.ebuild 1904 BLAKE2B d2e251511e16cd920ec29642b13569e0620b63a3c4f3b148c4a340605ce3ba8454d6f14423c2ba6166fcb8582ac17f746c64a3826128ea07bbd031f804b0b9cb SHA512 b5fd1c36ffa0377613a01fa4cb975878becfeb087e06c1131db0cbde4bd55e20c20cf495787fd130013cf7fbca58949affec7fa4d6d5ed6d84e31d3893564cec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/files/signond-8.60-buildsystem.patch b/net-libs/signond/files/signond-8.60-buildsystem.patch
index 95c4791ac4e2..a38f8458848c 100644
--- a/net-libs/signond/files/signond-8.60-buildsystem.patch
+++ b/net-libs/signond/files/signond-8.60-buildsystem.patch
@@ -1,16 +1,16 @@
-From 43e953418a5a08c3492d1160e4268dbcf82e7be9 Mon Sep 17 00:00:00 2001
+From 32e001d760dc1a7f884d7dc3a6e6883bd76e2f55 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 20:35:11 +0100
-Subject: [PATCH] Fix build system for Gentoo
+Date: Sun, 28 Jun 2020 21:37:30 +0200
+Subject: [PATCH 1/3] Fix buildsystem
 
-1) remove unused dependency Qt5Xml
-2) don't install example plugin
-3) don't install static libs
+- Disable examples
+- Disable static lib
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  lib/SignOn/SignOn.pro   | 4 +---
  src/plugins/plugins.pro | 1 -
- src/signond/signond.pro | 1 -
- 3 files changed, 1 insertion(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/lib/SignOn/SignOn.pro b/lib/SignOn/SignOn.pro
 index f6a1d61..28af041 100644
@@ -34,18 +34,6 @@ index dfccc4a..ca1c1ae 100644
  SUBDIRS = password \
 -          example \
            test
-diff --git a/src/signond/signond.pro b/src/signond/signond.pro
-index 60ee5e7..211dab6 100644
---- a/src/signond/signond.pro
-+++ b/src/signond/signond.pro
-@@ -4,7 +4,6 @@ TEMPLATE = app
- TARGET = signond
- QT += core \
-     sql \
--    xml \
-     network \
-     dbus
- 
 -- 
-2.24.0
+2.27.0
 
diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch
index f32ac319e570..6743a92678af 100644
--- a/net-libs/signond/files/signond-8.60-consistent-paths.patch
+++ b/net-libs/signond/files/signond-8.60-consistent-paths.patch
@@ -1,11 +1,14 @@
-From c68f31b964f9decf323cd212282cf13d4a42ad21 Mon Sep 17 00:00:00 2001
+From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 22:52:46 +0100
-Subject: [PATCH] Consistent overrideable install paths
+Date: Sun, 28 Jun 2020 21:44:42 +0200
+Subject: [PATCH 3/3] Consistent overrideable install paths
 
 At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong.
 
-This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath INSTALL_PREFIX.
+This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath
+INSTALL_PREFIX.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  common-installs-config.pri                    |  2 +-
  common-pkgconfig.pri                          |  2 +-
@@ -259,5 +262,5 @@ index 2c03e74..ea2fcb2 100644
 +target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon
  INSTALLS = target
 -- 
-2.24.0
+2.27.0
 
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
new file mode 100644
index 000000000000..175d88361c43
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
@@ -0,0 +1,123 @@
+From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Thu, 18 Jun 2020 10:22:04 +0200
+Subject: [PATCH] Don't use -fno-rtti
+
+QProcess uses typeid and crashes otherwise.
+---
+ common-project-config.pri                       | 2 --
+ src/extensions/cryptsetup/cryptsetup.pro        | 1 -
+ src/plugins/plugins.pri                         | 3 +--
+ src/remotepluginprocess/remotepluginprocess.pro | 3 +--
+ tests/extensions/extensions.pri                 | 3 +--
+ tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +--
+ tests/passwordplugintest/passwordplugintest.pro | 3 +--
+ tests/signond-tests/signond-tests.pri           | 3 +--
+ 8 files changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index 606f70bb..abe6cf6d 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -13,8 +13,6 @@ RCC_DIR         = resources
+ 
+ # we don't like warnings...
+ QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+-# Disable RTTI
+-QMAKE_CXXFLAGS += -fno-rtti
+ # Disable exceptions
+ CONFIG += exceptions_off
+ # Use C++11
+diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
+index f4b6e53b..5cc214e4 100644
+--- a/src/extensions/cryptsetup/cryptsetup.pro
++++ b/src/extensions/cryptsetup/cryptsetup.pro
+@@ -29,7 +29,6 @@ QT -= gui
+ 
+ QMAKE_CXXFLAGS += \
+     -fno-exceptions \
+-    -fno-rtti \
+     -fvisibility=hidden
+ 
+ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
+index 2c03e743..074896d5 100644
+--- a/src/plugins/plugins.pri
++++ b/src/plugins/plugins.pri
+@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins
+ QMAKE_LIBDIR += \
+     $${TOP_BUILD_DIR}/lib/plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ headers.path = $${INSTALL_PREFIX}/include/signon-plugins
+ 
+diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro
+index 7c2ea007..36b4cbe0 100644
+--- a/src/remotepluginprocess/remotepluginprocess.pro
++++ b/src/remotepluginprocess/remotepluginprocess.pro
+@@ -40,8 +40,7 @@ LIBS += \
+     -lsignon-plugins-common \
+     -lsignon-plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-                  -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ #DEFINES += QT_NO_CAST_TO_ASCII \
+ #    QT_NO_CAST_FROM_ASCII
+diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri
+index 179cd28d..2fd75955 100644
+--- a/tests/extensions/extensions.pri
++++ b/tests/extensions/extensions.pri
+@@ -20,5 +20,4 @@ INCLUDEPATH += . \
+     $$TOP_SRC_DIR/lib/signond
+ 
+ QMAKE_CXXFLAGS += \
+-    -fno-exceptions \
+-    -fno-rtti
++    -fno-exceptions
+diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
+index 43f2d59f..ac87781d 100644
+--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro
++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
+@@ -36,8 +36,7 @@ INCLUDEPATH += . \
+     $$TOP_SRC_DIR/src/plugins/test
+ DEFINES += SSO_CI_TESTMANAGEMENT
+ DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ check.depends = $$TARGET
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests"
+diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro
+index 6132921e..ce16fdcf 100644
+--- a/tests/passwordplugintest/passwordplugintest.pro
++++ b/tests/passwordplugintest/passwordplugintest.pro
+@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
+     $${TOP_SRC_DIR}/src/plugins \
+     $${TOP_SRC_DIR}/lib
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
+index 1bbd5a15..e95556ba 100644
+--- a/tests/signond-tests/signond-tests.pri
++++ b/tests/signond-tests/signond-tests.pri
+@@ -34,8 +34,7 @@ INCLUDEPATH += . \
+     $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
+     $${TOP_SRC_DIR}/lib \
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
++QMAKE_CXXFLAGS += -fno-exceptions
+ 
+ check.depends = $$TARGET
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET"
+-- 
+GitLab
+
diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch
index dd32af041d4d..54b5ce26f4c7 100644
--- a/net-libs/signond/files/signond-8.60-unused-dep.patch
+++ b/net-libs/signond/files/signond-8.60-unused-dep.patch
@@ -1,6 +1,31 @@
---- a/tests/signond-tests/signond-tests.pri	2020-06-07 10:57:19.327456979 +0200
-+++ b/tests/signond-tests/signond-tests.pri	2020-06-07 11:00:39.866322814 +0200
-@@ -6,7 +6,6 @@
+From 5814507706210031432a4ff727231bb1082576d5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 28 Jun 2020 21:43:09 +0200
+Subject: [PATCH 2/3] Drop unused Qt5Xml dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/signond/signond.pro               | 1 -
+ tests/signond-tests/signond-tests.pri | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/signond/signond.pro b/src/signond/signond.pro
+index 60ee5e7..211dab6 100644
+--- a/src/signond/signond.pro
++++ b/src/signond/signond.pro
+@@ -4,7 +4,6 @@ TEMPLATE = app
+ TARGET = signond
+ QT += core \
+     sql \
+-    xml \
+     network \
+     dbus
+ 
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
+index 1bbd5a1..950baaa 100644
+--- a/tests/signond-tests/signond-tests.pri
++++ b/tests/signond-tests/signond-tests.pri
+@@ -6,7 +6,6 @@ CONFIG += \
  QT += core \
      sql \
      testlib \
@@ -8,3 +33,6 @@
      network \
      dbus
  
+-- 
+2.27.0
+
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
index c775677aaaa5..4c354dd63641 100644
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -27,13 +27,15 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-RESTRICT="!test? ( test )"
+# tests are brittle; they all pass when stars align, bug 727666
+RESTRICT="test !test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-buildsystem.patch"
 	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
 	"${FILESDIR}/${P}-crashfix.patch"
 	"${FILESDIR}/${P}-unused-dep.patch" # bug 727346
+	"${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes
 )
 
 S="${WORKDIR}/${PN}-VERSION_${PV}"
@@ -53,14 +55,6 @@ src_prepare() {
 	sed -e "/CONFIG += c++11/d" \
 		-i common-project-config.pri || die "failed fixing CXXFLAGS"
 
-	# fix runtime failures
-	sed -e "/fno-rtti/d" \
-		-i common-project-config.pri src/plugins/plugins.pri \
-		src/{remotepluginprocess/remotepluginprocess,extensions/cryptsetup/cryptsetup}.pro \
-		tests/{signond-tests/signond-tests,extensions/extensions}.pri \
-		tests/{passwordplugintest/passwordplugintest,libsignon-qt-tests/libsignon-qt-tests}.pro \
-		|| die "failed disabling -fno-rtti"
-
 	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
 		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die