gentoo Easter resync : 12.04.2020

5 files changed, 13 insertions, 133 deletions

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 925ae799e26e..602ffcbeff5b 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,10 +1,7 @@
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
-AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee93171766e3e6d99748c873cbbf2e213c8196555db06a82b113d75c7512eb8f75e3beadeedc5529755ed9ef593414b272fcc43eacc12 SHA512 4d5559d147a3ce51697af24c13e2eca0575f4da16bea5db3066e00fad09b6d58d16fb2401e44e9623b9db9b939d4ab115989ee1f8bad2cfe59118e2cf626ead5
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
-DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
-DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
 DIST libical-3.0.7.tar.gz 881352 BLAKE2B ad256833a69ba2e76301b1d9f732ac22c3d5a0030bb81e2d8ef57471338fc583cf1dd21cccb1301d3fcfbe1905a42bebec7c811e90cc8b10faa6e773fc1366fc SHA512 4e1df3fad9c9df795da441243471d05168287519b6155b148b5aa28092ecac687626fa92713b280864a41f6ffc0c7fb43d2770fb1821396cb838e96e76d8d9d8
-EBUILD libical-3.0.5.ebuild 2041 BLAKE2B 4b84677ac53d6d9b3b470cf71b9e9e6c8da2157ed2601298d16530763ce563f59c16635a67a7a85715765c26042bbd0ef53e88c60143f57915cd8c55b1b4b704 SHA512 7a6836d1da1153d1389e7273986d51fb658704103b54dee4176eb8d8e8f53f17894a5fa551446432529daec327b55918dd910c0fb0f834392fcc21107cc3b9ca
-EBUILD libical-3.0.6.ebuild 2260 BLAKE2B 53d8e1e40e4b81c3a2106a7509426c9f670e35ddac5cf806f28a1862963223d6d95830349d2dab142f7fdf71afcc1e75bafae1e466fd9c535506a8c7070607c0 SHA512 7f76624daae75bdb57e82aadb8e3bd44e72c73860125a1de8e705989e7deb004259a90c06e7860130550d06ec134e61e9b00c7e0152c5a7cdd6e3c5f195dedea
-EBUILD libical-3.0.7.ebuild 2263 BLAKE2B 82a804349bd087b7f567d8633f4507eceb88d650780a08e8344be2f9d1852ac80976dea2af59cebbfd8d5343706adfbde000e3438821f5e3b940bad7ab6fab49 SHA512 6a6352ecb36c041908d5d70f2cf036b8b8d9465bf6e1cef718a539715e62d70e6801346e2d2070b3c7784b55f8dde9919ffa30de28f5fc94705b9a625a176040
+DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
+EBUILD libical-3.0.7.ebuild 2263 BLAKE2B 03649ff879a99b59fd764a2cf6bd71e3c7a97137c6c8bda0cbe5ebcc0284d537c867a3b88ef3a0d774374ef355ba6488a87c38d750966a21ec3b1b4c754b8dd5 SHA512 9f3097af4011011c75d6b4e344b6bcaf0cfa1ddbe2a2acea55fc08cb3c4454b69d388333c8bacc158d1d74ccd8be90907bc739af0fcdfa3e24a3fe6643011b89
+EBUILD libical-3.0.8.ebuild 2276 BLAKE2B 421d075c0e076f7cf394db5e7d46119c2a6ec9d909fc59d44ff7770317449ab810d8e3a4633eac99caf2794b0adea6793b2fb412b336be98ccfa2fa01d51fc64 SHA512 c2014dd1fd8fc7b7ab77ad46bae3a214af31fe1f353ea56df9d6ace3fdbd2cd97adc26975f9d423a54867a33b3c29da4965964806f4c9ee3d8154fb2ff53e3bd
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
deleted file mode 100644
index 187a5de0cd4b..000000000000
--- a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f02ca493123b7c8e8eaaa758d787e9e2753fd9b8 Mon Sep 17 00:00:00 2001
-From: Kent Sutherland <git@ksuther.com>
-Date: Fri, 17 May 2019 13:26:52 -0500
-Subject: [PATCH] Include invalid parameters in the maximum number of allowed
- parameters Fixes hangs when iterating lots of invalid parameters (valid
- parameters already have a cap from f6c64896988644a7c6d4d5060f6ab574c2a62fbf)
- oss-fuzz issue 14809
-
----
- src/libical/icalparser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
-index 99803418..fa71e8bd 100644
---- a/src/libical/icalparser.c
-+++ b/src/libical/icalparser.c
-@@ -1098,6 +1098,7 @@ icalcomponent *icalparser_add_line(icalparser *parser, char *line)
- 
-                     icalmemory_free_buffer(str);
-                     str = NULL;
-+                    pcount++;
-                     continue;
-                 }
-             }
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
deleted file mode 100644
index 5fed6087ffa0..000000000000
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-any-r1
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="berkdb doc examples glib static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-"
-# TODO: disabled until useful
-# 	introspection? ( dev-libs/gobject-introspection:= )
-DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-	glib? (
-		dev-libs/glib:2
-		dev-libs/libxml2:2
-	)
-"
-RDEPEND="${DEPEND}
-	sys-libs/timezone-data
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.4-tests.patch"
-	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-fix-lots-of-params.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DICAL_GLIB=$(usex glib)
-		-DICAL_GLIB_VAPI=OFF
-		-DGOBJECT_INTROSPECTION=OFF
-		$(cmake_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DSHARED_ONLY=$(usex !static-libs)
-	)
-# 	TODO: disabled until useful
-# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile docs
-}
-
-src_test() {
-	local myctestargs=(
-		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.7.ebuild b/dev-libs/libical/libical-3.0.7.ebuild
index 725cc5327f81..5ef532a8f443 100644
--- a/dev-libs/libical/libical-3.0.7.ebuild
+++ b/dev-libs/libical/libical-3.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.8.ebuild
index 9be59cdb1257..ea328c4a2882 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_USE_DEPEND="vapigen"
 inherit cmake python-any-r1 vala
 
@@ -13,10 +13,12 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${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-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="berkdb doc examples introspection static-libs test vala"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
 
 BDEPEND="
 	dev-lang/perl
@@ -29,10 +31,10 @@ BDEPEND="
 COMMON_DEPEND="
 	dev-libs/icu:=
 	berkdb? ( sys-libs/db:= )
-	introspection? ( dev-libs/glib:2 )
+	glib? ( dev-libs/glib:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	introspection? ( dev-libs/libxml2:2 )
+	glib? ( dev-libs/libxml2:2 )
 "
 RDEPEND="${COMMON_DEPEND}
 	sys-libs/timezone-data
@@ -62,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package berkdb BDB)
 		-DICAL_BUILD_DOCS=$(usex doc)
-		-DICAL_GLIB=$(usex introspection)
+		-DICAL_GLIB=$(usex glib)
 		-DGOBJECT_INTROSPECTION=$(usex introspection)
 		-DSHARED_ONLY=$(usex !static-libs)
 		-DLIBICAL_BUILD_TESTING=$(usex test)