[gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/files/, dev-libs/libical/, profiles/

[Andreas Sturmlechner]

commit:     f14d0642edab40e1cd9edb198cffdcb3269e8312
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 11:57:52 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 12:31:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14d0642

dev-libs/libical: 3.0.3 version bump

Closes: https://bugs.gentoo.org/656268
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/libical/Manifest                          |  1 +
 .../files/libical-3.0.3-findicu-pkgconfig.patch    | 58 ++++++++++++++
 dev-libs/libical/libical-3.0.3.ebuild              | 90 ++++++++++++++++++++++
 profiles/package.mask                              |  1 +
 4 files changed, 150 insertions(+)

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index a2afb89f3ca..b13528285d1 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1,3 @@
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
+DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70

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 00000000000..7f0ffc4b428
--- /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@××××.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/libical-3.0.3.ebuild b/dev-libs/libical/libical-3.0.3.ebuild
new file mode 100644
index 00000000000..fe0236af8a4
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+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"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="berkdb doc examples static-libs test"
+
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-findicu-pkgconfig.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DGOBJECT_INTROSPECTION=OFF
+		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DSHARED_ONLY=$(usex !static-libs)
+	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake-utils_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index cadd7cafe8f..cf0dc8345c6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -453,6 +453,7 @@ media-fonts/fontawesome:0/5
 # Andreas Sturmlechner <asturm@g.o> (21 Dec 2017)
 # Masked for testing
 =dev-libs/libical-3.0.1
+~dev-libs/libical-3.0.3
 
 # James Le Cuirot <chewi@g.o> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Packages cannot depend