commit: e8342b7d186957ffbfff5485625761645ba61b6c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 21 22:56:23 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 10:25:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8342b7d
dev-libs/libical: 3.0.1 version bump Closes: https://bugs.gentoo.org/641970 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-libs/libical/Manifest | 1 + .../files/libical-3.0.1-pkgconfig-libdir.patch | 44 ++++++++++++ dev-libs/libical/libical-3.0.1.ebuild | 83 ++++++++++++++++++++++ dev-libs/libical/metadata.xml | 11 +-- profiles/package.mask | 4 ++ 5 files changed, 139 insertions(+), 4 deletions(-) diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index e7a5bc04337..a51616f8397 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,2 +1,3 @@ DIST libical-1.0.1.tar.gz 720618 BLAKE2B 7506db93346c1104dbc6572d69e6de1f38730e906ec863badb38f4b7f635a175110f5eb1d9784e5baf74bc509bbf7875e5769ca3e47660012845cbbe6d92309e SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f +DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091 diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch new file mode 100644 index 00000000000..aae02abc537 --- /dev/null +++ b/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch @@ -0,0 +1,44 @@ +Fix pkgconfig libdir paths. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -336,7 +336,7 @@ + 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}") + +--- a/libical.pc.in ++++ b/libical.pc.in +@@ -8,7 +8,7 @@ + Name: libical + Description: An implementation of basic iCAL protocols + Version: @LIBICAL_LIB_VERSION_STRING@ +-Libs: -L${libdir} -lical -licalss -licalvcal ++Libs: -lical -licalss -licalvcal + Libs.private: @PTHREAD_LIBS@ + @REQUIRES_PRIVATE_ICU@ + Cflags: -I${includedir} +--- a/src/libical-glib/CMakeLists.txt ++++ b/src/libical-glib/CMakeLists.txt +@@ -233,7 +233,7 @@ + + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(libdir "\${exec_prefix}/lib") ++set(libdir "${LIB_INSTALL_DIR}") + set(includedir "\${prefix}/include") + + configure_file( +--- a/src/libical-glib/libical-glib.pc.in ++++ b/src/libical-glib/libical-glib.pc.in +@@ -8,4 +8,4 @@ + Version: @LIBICAL_LIB_VERSION_STRING@ + Requires: glib-2.0, gobject-2.0, libical + Cflags: -I{includedir} +-Libs: -L${libdir} -lical-glib ++Libs: -lical-glib + diff --git a/dev-libs/libical/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.1.ebuild new file mode 100644 index 00000000000..d34fc5db5a0 --- /dev/null +++ b/dev-libs/libical/libical-3.0.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 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-1.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 glib introspection static-libs test" + +COMMON_DEPEND=" + dev-libs/icu:= + berkdb? ( sys-libs/db:= ) + glib? ( + dev-libs/glib:2 + dev-libs/libxml2:2 + ) + introspection? ( dev-libs/gobject-introspection:= ) +" +DEPEND="${COMMON_DEPEND} + dev-lang/perl + 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}/${P}-pkgconfig-libdir.patch" ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + use doc || cmake_comment_add_subdirectory doc + use examples || cmake_comment_add_subdirectory examples +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package berkdb BDB) + -DICAL_GLIB=$(usex glib) + -DGOBJECT_INTROSPECTION=$(usex introspection) + -DSHARED_ONLY=$(usex !static-libs) + ) + 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/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml index 35e5fb38c4e..3bd1d015105 100644 --- a/dev-libs/libical/metadata.xml +++ b/dev-libs/libical/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">libical/libical</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">libical/libical</remote-id> + </upstream> + <use> + <flag name="glib">Enable <pkg>dev-libs/glib</pkg> GObject interface support</flag> + </use> </pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 06a3b565c6d..30d2734445c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner <[email protected]> (21 Dec 2017) +# Masked for testing +=dev-libs/libical-3.0.1 + # Michael Palimaka <[email protected]> (22 Dec 2017) # Dead upstream. Requires dead Qt 4. # Masked for removal in 30 days.
