From 64e040c2925857e9adb4bed0ac61d07197ff39dd Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 21 Nov 2016 19:36:11 +0200 Subject: [PATCH] app-crypt/gpgme: fix cmake issue Bug: 600418 Package-Manager: portage-2.3.0 --- app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch | 33 +++++++++++++++++++ ...gme-1.8.0.ebuild => gpgme-1.8.0-r1.ebuild} | 1 + 2 files changed, 34 insertions(+) create mode 100644 app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch rename app-crypt/gpgme/{gpgme-1.8.0.ebuild => gpgme-1.8.0-r1.ebuild} (98%) diff --git a/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch new file mode 100644 index 000000000000..09775b868eb6 --- /dev/null +++ b/app-crypt/gpgme/files/gpgme-1.8.0-cmake.patch @@ -0,0 +1,33 @@ +From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 16 Nov 2016 23:09:45 +0100 +Subject: [PATCH] Remove a forgotten instance of @libsuffix@ + +* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten +instance of @libsuffix@. +-- + +b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from +cmake config files, but missed one instance. + +Signed-off-by: Heiko Becker +--- + lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in +index 928d19f..cbe9713 100644 +--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in ++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in +@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) + + set_target_properties(Gpgmepp PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" +- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" ++ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" + IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" + ) + +-- +2.8.0.rc3 + diff --git a/app-crypt/gpgme/gpgme-1.8.0.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r1.ebuild similarity index 98% rename from app-crypt/gpgme/gpgme-1.8.0.ebuild rename to app-crypt/gpgme/gpgme-1.8.0-r1.ebuild index 593dc92b21a6..1015b3c18046 100644 --- a/app-crypt/gpgme/gpgme-1.8.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.8.0-r1.ebuild @@ -40,6 +40,7 @@ REQUIRED_USE="qt5? ( cxx )" PATCHES=( "${FILESDIR}"/${PN}-1.1.8-et_EE.patch + "${FILESDIR}"/${P}-cmake.patch ) do_python() { -- 2.26.2