[gentoo-commits] repo/proj/guru:dev commit in: sys-auth/AusweisApp2/, sys-auth/AusweisApp2/files/

[Volkmar W. Pogatzki]

commit:     e0e7652141b12716016e421ff7ac2b9003dad4da
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Apr  3 15:04:36 2020 +0000
Commit:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
CommitDate: Fri Apr  3 15:04:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e0e76521

sys-auth/AusweisApp2: fix build system

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>

 sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild     |  6 +-----
 sys-auth/AusweisApp2/AusweisApp2-9999.ebuild       |  8 ++------
 sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch | 12 ++++++++++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild 
b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
index a5b7e33..6265462 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.20.0.ebuild
@@ -32,11 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5"
 
-src_configure() {
-       # get rid of QA Notice: The following files contain insecure RUNPATHs
-       local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON )
-       cmake_src_configure
-}
+PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
 
 src_install() {
        cmake_src_install

diff --git a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild 
b/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
index ad3c6f9..ac1500b 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
@@ -32,17 +32,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5"
 
+PATCHES=( "${FILESDIR}"/1.20.0-CMakeLists.patch )
+
 src_prepare() {
        cmake_src_prepare
        eautoreconf
 }
 
-src_configure() {
-       # get rid of QA Notice: The following files contain insecure RUNPATHs
-       local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON )
-       cmake_src_configure
-}
-
 src_install() {
        cmake_src_install
        dolib.so "${BUILD_DIR}"/src/activation/base/libAusweisAppActivation.so

diff --git a/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch 
b/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch
new file mode 100644
index 0000000..2ba3dc8
--- /dev/null
+++ b/sys-auth/AusweisApp2/files/1.20.0-CMakeLists.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e958954..ae85daa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND (IOS OR 
ANDROID))
+ ENDIF()
+ SET(CMAKE_DIR "${PROJECT_SOURCE_DIR}/cmake")
+ SET(CMAKE_MODULE_PATH "${CMAKE_DIR}")
++SET(CMAKE_SKIP_RPATH YES CACHE BOOL "Remove RUNPATH from ELF dynamic 
sections" FORCE)
+ OPTION(BUILD_SHARED_LIBS "Enable build of shared libraries")
+ OPTION(INTEGRATED_SDK "Build platform specific SDK" OFF)
+