From c7c1240b2a698ea660eda88300c76e27b2ccb78f Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sun, 5 Apr 2020 12:24:10 +0200 Subject: [PATCH 1/2] sys-auth/AusweisApp2: change patch Install shared libs only if the were built Move insertion to IF(BUILD_SHARED_LIBS) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Volkmar W. Pogatzki --- .../files/1.20.0-fix-Install.cmake.patch | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch index 5948ded268..9a18e8687b 100644 --- a/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch +++ b/sys-auth/AusweisApp2/files/1.20.0-fix-Install.cmake.patch @@ -1,18 +1,18 @@ diff --git a/cmake/Install.cmake b/cmake/Install.cmake -index a13e029..1fa852d 100644 +index a13e029..336785c 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake -@@ -274,6 +274,13 @@ ELSEIF(UNIX) +@@ -269,6 +269,13 @@ ELSEIF(ANDROID) + ELSEIF(UNIX) + IF(BUILD_SHARED_LIBS) + SET(CMAKE_INSTALL_RPATH "\$ORIGIN") ++ INSTALL(TARGETS AusweisAppActivation AusweisAppActivationCustomScheme AusweisAppActivationIntent ++ AusweisAppActivationInternal AusweisAppActivationWebservice AusweisAppCard AusweisAppCardDrivers ++ AusweisAppCardPcsc AusweisAppConfiguration AusweisAppCore AusweisAppExport AusweisAppFileProvider ++ AusweisAppGlobal AusweisAppInit AusweisAppNetwork AusweisAppRemoteDevice AusweisAppSecureStorage ++ AusweisAppServices AusweisAppSettings AusweisAppUi AusweisAppUiAidl AusweisAppUiCommon ++ AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket AusweisAppUiWidget AusweisAppWhitelistClient ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) + ENDIF() + SET(DEFAULT_FILE_DESTINATION ${CMAKE_INSTALL_DATADIR}/${VENDOR}/AusweisApp2) - SET(TRANSLATION_DESTINATION ${DEFAULT_FILE_DESTINATION}/${TRANSLATION_DESTINATION}) - INSTALL(TARGETS AusweisApp DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Application) -+ INSTALL(TARGETS AusweisAppActivation AusweisAppActivationCustomScheme AusweisAppActivationIntent -+ AusweisAppActivationInternal AusweisAppActivationWebservice AusweisAppCard AusweisAppCardDrivers -+ AusweisAppCardPcsc AusweisAppConfiguration AusweisAppCore AusweisAppExport AusweisAppFileProvider -+ AusweisAppGlobal AusweisAppInit AusweisAppNetwork AusweisAppRemoteDevice AusweisAppSecureStorage -+ AusweisAppServices AusweisAppSettings AusweisAppUi AusweisAppUiAidl AusweisAppUiCommon -+ AusweisAppUiJson AusweisAppUiQml AusweisAppUiWebsocket AusweisAppUiWidget AusweisAppWhitelistClient -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) - CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.metainfo.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml @ONLY) - CONFIGURE_FILE(${PACKAGING_DIR}/linux/${BUNDLE_IDENTIFIER}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.desktop @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_IDENTIFIER}.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo COMPONENT Application) From 7cfeb98d8c54784c28ff0f46424b21f33de16da8 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 5 Apr 2020 16:00:51 +0200 Subject: [PATCH 2/2] dev-python/aspectlib: version bump, tests working Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri --- dev-python/aspectlib/Manifest | 2 +- .../{aspectlib-1.4.2.ebuild => aspectlib-1.5.0.ebuild} | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) rename dev-python/aspectlib/{aspectlib-1.4.2.ebuild => aspectlib-1.5.0.ebuild} (77%) diff --git a/dev-python/aspectlib/Manifest b/dev-python/aspectlib/Manifest index 849dd79b3f..1d8a9ee09e 100644 --- a/dev-python/aspectlib/Manifest +++ b/dev-python/aspectlib/Manifest @@ -1 +1 @@ -DIST aspectlib-1.4.2.tar.gz 154888 BLAKE2B 0194c2f911126caf5949cf6f0acb5a14c260a7824e456a3e3ba9b150331818dc832469798e89dd3cb3fba549b17098115354aabbc66931365475e53598c0bc96 SHA512 fadb90b625ce2faac8f6d29ee28efaee09b4338c3c516c79d9e8753b7fb2ff45e0033174c5c5302f47f1f9e332824f37d56667fb05e66f85b808e8aa3a086f57 +DIST aspectlib-1.5.0.tar.gz 155744 BLAKE2B 9695f2b55634c8080385302f3b35bea2d84c69a593dc62544dafd02f41468f54aee54f1da485e6a963c389dbed40e85d81cdd04d693e8d298761064a72cd9a64 SHA512 313e383d44b8ebbfcb3e657512280ce8a0919dd4736dd058282788ea1c0711c6a33cb9ceecbc711368abda438be515a5579bbd4d31a629208e320be3e7e39381 diff --git a/dev-python/aspectlib/aspectlib-1.4.2.ebuild b/dev-python/aspectlib/aspectlib-1.5.0.ebuild similarity index 77% rename from dev-python/aspectlib/aspectlib-1.4.2.ebuild rename to dev-python/aspectlib/aspectlib-1.5.0.ebuild index 24ebfe8e21..7e9732e858 100644 --- a/dev-python/aspectlib/aspectlib-1.4.2.ebuild +++ b/dev-python/aspectlib/aspectlib-1.5.0.ebuild @@ -20,10 +20,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -# could not get this working, it tries to do all sorts of weird things -# it calls a tests outside the tests folder, which then fails, removing the file results in import error -RESTRICT="test" - RDEPEND=" dev-python/fields[${PYTHON_USEDEP}] " @@ -33,10 +29,10 @@ DEPEND=" dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-python/process-tests[${PYTHON_USEDEP}] -