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 D6F07138330 for ; Tue, 29 May 2018 12:32:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE7EEE0826; Tue, 29 May 2018 12:32:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6DD26E0826 for ; Tue, 29 May 2018 12:32:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BFF1D335C87 for ; Tue, 29 May 2018 12:32:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 747D82BA for ; Tue, 29 May 2018 12:32: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: <1527597068.ed478336e09e052bc8b6d1a18e9d0f87ce28655c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/libical/, dev-libs/libical/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libical/Manifest dev-libs/libical/files/fix-libdir-location.patch dev-libs/libical/libical-3.0.1.ebuild profiles/package.mask X-VCS-Directories: dev-libs/libical/files/ dev-libs/libical/ profiles/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ed478336e09e052bc8b6d1a18e9d0f87ce28655c X-VCS-Branch: master Date: Tue, 29 May 2018 12:32: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-Archives-Salt: d8b5fd93-137f-4991-8b5b-7521f09c7cd0 X-Archives-Hash: 210c9ce17801a1d6bf02a2542c973b69 commit: ed478336e09e052bc8b6d1a18e9d0f87ce28655c Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 29 12:10:17 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 29 12:31:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed478336 dev-libs/libical: Drop 3.0.1 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libical/Manifest | 1 - dev-libs/libical/files/fix-libdir-location.patch | 26 ------- dev-libs/libical/libical-3.0.1.ebuild | 87 ------------------------ profiles/package.mask | 1 - 4 files changed, 115 deletions(-) diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index b13528285d1..f0a4b24c461 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.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/fix-libdir-location.patch b/dev-libs/libical/files/fix-libdir-location.patch deleted file mode 100644 index 53eb2040bc0..00000000000 --- 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/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.1.ebuild deleted file mode 100644 index 851a3c097a0..00000000000 --- a/dev-libs/libical/libical-3.0.1.ebuild +++ /dev/null @@ -1,87 +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 - 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=( - -DICAL_GLIB=OFF - -DGOBJECT_INTROSPECTION=OFF - $(cmake-utils_use_find_package berkdb BDB) - -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 cf0dc8345c6..8636afe5ae1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -452,7 +452,6 @@ media-fonts/fontawesome:0/5 # Andreas Sturmlechner (21 Dec 2017) # Masked for testing -=dev-libs/libical-3.0.1 ~dev-libs/libical-3.0.3 # James Le Cuirot (17 Dec 2017)