gentoo resync : 12.01.2019

4 files changed, 40 insertions, 70 deletions

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 79430cb5a0d4..2ba001cf03b0 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,9 +4,9 @@ AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e53
 AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
 AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
-AUX libical-3.0.3-findicu-pkgconfig.patch 1760 BLAKE2B ff9dc09bc7f82632abf3d89d50463a2630f83a4cae1fe264cd1d3739c33d98634bd0e347cabe4e924f96e7791fedf06b71b790745a2519e5517e8c5305e3a1e7 SHA512 f6ecf28b65bbf9a10b3a26b5bf2e8b81574c6724b917d12943bae9f3773e40198cf609ea685a7222361941bd13cef73b3a60b86ae250fb6bd171c0845e243861
+AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
-DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
+DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
 EBUILD libical-2.0.0-r3.ebuild 1708 BLAKE2B a6fc6d8a7ca16ad6a629c5a708b138535a098d65cb0c89c39df889d2d6087c11ddf884afb18fc1d7fcbb297262c2b5b53fa7d0108b825d8cd0057948a3c3efdc SHA512 24d4b757d3bc4657c3d24cdd442b91f7b64113a88c023de39a7f01ec13ad91f255595acb9c0767835837a660fabe316cb3f160f4beab6614a8e20b3cf7ea77ef
-EBUILD libical-3.0.3.ebuild 2043 BLAKE2B a0a4448402c5236149e4abbd6693d4c644735384df3fa43a56d54bef7a9f971e2f7143ee59c0e068a12d4300341efaf65da44fee8385fa805fe11df8800503a1 SHA512 d0ad2e651743715869783b10aabe6b3f7b7afb515aded889f587e9195a7b20b2f270ab9bdd7444d4384d0c65b13240d40e78b726fe3cf100303977089dcb686a
+EBUILD libical-3.0.4.ebuild 2051 BLAKE2B 3e64a56437c5b4f9b5fc30ace560499ec7065441a358a268212d5c0aa135671af03200d7c9154e74929281c2bbb4fdea5dabaa8396c896fb1d7569856229c34c SHA512 b16dfdaac032f875d4d17eca8619525319dc550902bc4dd98578fe19ed95997be72857c06a7431092879e8bfa1a12d189a6fd188d8a960aaf6f30ce6238b9b8f
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
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
deleted file mode 100644
index 7f0ffc4b4280..000000000000
--- a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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"
-   )
diff --git a/dev-libs/libical/files/libical-3.0.4-tests.patch b/dev-libs/libical/files/libical-3.0.4-tests.patch
new file mode 100644
index 000000000000..7ecf6e1f2d76
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-tests.patch
@@ -0,0 +1,25 @@
+From 3066463eb407853626277442eba725ddde58b843 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 6 Jan 2019 17:41:10 +0100
+Subject: [PATCH] Try to fix test dir path
+
+---
+ src/test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index b1179c2c..af7ce3fc 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_definitions(-DTEST_DATADIR=${TEST_DATADIR})
+ macro(setprops _name)
+   if(UNIX)
+     set_tests_properties(${_name} PROPERTIES
+-      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
++      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/test"
+     )
+   endif()
+   if(WIN32)
+-- 
+2.20.1
+
diff --git a/dev-libs/libical/libical-3.0.3.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index fe0236af8a46..9682f722827d 100644
--- a/dev-libs/libical/libical-3.0.3.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit cmake-utils python-any-r1
 
 DESCRIPTION="An implementation of basic iCAL protocols"
 HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
@@ -21,17 +21,17 @@ IUSE="berkdb doc examples static-libs test"
 # 		dev-libs/libxml2:2
 # 	)
 # 	introspection? ( dev-libs/gobject-introspection:= )
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/icu:=
 	berkdb? ( sys-libs/db:= )
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( ${PYTHON_DEPS} )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	sys-libs/timezone-data
 "
 
@@ -42,7 +42,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-findicu-pkgconfig.patch"
+	"${FILESDIR}/${P}-tests.patch"
 )
 
 pkg_setup() {
@@ -74,7 +74,10 @@ src_compile() {
 }
 
 src_test() {
-	local myctestargs=( -j1 )
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
 	cmake-utils_src_test
 }