gentoo resync : 02.06.2018

2 files changed, 58 insertions, 26 deletions

diff --git a/dev-libs/libical/files/fix-libdir-location.patch b/dev-libs/libical/files/fix-libdir-location.patch
deleted file mode 100644
index 53eb2040bc09..000000000000
--- a/dev-libs/libical/files/fix-libdir-location.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 773cf0c..e282ce4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@ endif()
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- 
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce..bf88476 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,5 +8,5 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @VERSION@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
-+Libs: -lical -licalss -licalvcal ${threadslib} ${iculib}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
new file mode 100644
index 000000000000..7f0ffc4b4280
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
@@ -0,0 +1,58 @@
+From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Sat, 26 May 2018 09:06:10 -0400
+Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a
+ hint
+
+---
+ cmake/modules/FindICU.cmake | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake
+index 12a1812d..53213efe 100644
+--- a/cmake/modules/FindICU.cmake
++++ b/cmake/modules/FindICU.cmake
+@@ -23,16 +23,12 @@ if(WIN32)
+   file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+ endif()
+ 
+-if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-  # Already in cache, be silent
+-  set(ICU_FIND_QUIETLY TRUE)
+-endif()
+-
+-#set the root from the ICU_BASE environment
+ file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root)
+-#override the root from ICU_BASE defined to cmake
+ if(DEFINED ICU_BASE)
+   file(TO_NATIVE_PATH "${ICU_BASE}" icu_root)
++else()
++  find_package(PkgConfig QUIET)
++  pkg_check_modules(PC_LibICU QUIET icu-i18n)
+ endif()
+ 
+ # Look for the header file.
+@@ -42,6 +38,7 @@ find_path(
+   HINTS
+   ${icu_root}/include
+   ${_program_FILES_DIR}/icu/include
++  ${PC_LibICU_INCLUDEDIR}
+   /usr/local/opt/icu4c/include
+   DOC "Include directory for the ICU library"
+ )
+@@ -56,6 +53,7 @@ find_library(
+   ${icu_root}/lib/
+   ${_program_FILES_DIR}/icu/lib64/
+   ${_program_FILES_DIR}/icu/lib/
++  ${PC_LibICU_LIBDIR}
+   /usr/local/opt/icu4c/lib/
+   DOC "Libraries to link against for the common parts of ICU"
+ )
+@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+     HINTS
+     ${icu_root}/lib/
+     ${_program_FILES_DIR}/icu/lib/
++    ${PC_LibICU_LIBDIR}
+     /usr/local/opt/icu4c/lib/
+     DOC "Libraries to link against for ICU internationalization"
+   )