From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C339E138334 for ; Sun, 6 Jan 2019 17:04:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3316E0C9D; Sun, 6 Jan 2019 17:04:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 693E6E0C9D for ; Sun, 6 Jan 2019 17:04:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB98C335CD2 for ; Sun, 6 Jan 2019 17:04:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B051850B for ; Sun, 6 Jan 2019 17:04:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1546794228.26c986d5418f063a1398b64ed1c7b4c546a945b0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/, dev-libs/libical/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libical/Manifest dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch dev-libs/libical/libical-3.0.3.ebuild X-VCS-Directories: dev-libs/libical/files/ dev-libs/libical/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 26c986d5418f063a1398b64ed1c7b4c546a945b0 X-VCS-Branch: master Date: Sun, 6 Jan 2019 17:04:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 023b9f6b-aae4-4bc4-9230-5933124aab7f X-Archives-Hash: b1af3431c00e99d20777d23af9baaece commit: 26c986d5418f063a1398b64ed1c7b4c546a945b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 6 16:55:17 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 6 17:03:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c986d5 dev-libs/libical: Drop 3.0.3 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libical/Manifest | 1 - .../files/libical-3.0.3-findicu-pkgconfig.patch | 58 -------------- dev-libs/libical/libical-3.0.3.ebuild | 90 ---------------------- 3 files changed, 149 deletions(-) diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index f74908e452e..bcd8bbd027d 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,3 +1,2 @@ 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 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 7f0ffc4b428..00000000000 --- 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 -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 deleted file mode 100644 index fe0236af8a4..00000000000 --- a/dev-libs/libical/libical-3.0.3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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 -}