From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Jun 2021 14:45:01 +0100 Subject: gentoo resync : 20.06.2021 --- dev-libs/libical/Manifest | 4 +- dev-libs/libical/libical-3.0.10.ebuild | 31 ++++----- dev-libs/libical/libical-3.0.9.ebuild | 111 --------------------------------- 3 files changed, 18 insertions(+), 128 deletions(-) delete mode 100644 dev-libs/libical/libical-3.0.9.ebuild (limited to 'dev-libs/libical') diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 4931d19ab65b..a0273ffbbd06 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,7 +1,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37 DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0 -DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268 -EBUILD libical-3.0.10.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f -EBUILD libical-3.0.9.ebuild 2419 BLAKE2B fa7313d6b9fb4e83173aea5df82b8073dc8d3000587e71dfe82aa4b38846e5b3b0543b083304f9832fccd3c31d5e3f194d41aee739fc169daa67db4b97b5f7a4 SHA512 915fcbb970075d32923920f1b08ce3a028c3538c0faa5c41cb4708e7ad5cc10d9f74ac470a8696da06a5a7cf5124b169803a512d3f88371f7df2164a9082553f +EBUILD libical-3.0.10.ebuild 2454 BLAKE2B a0142bd74802511a78e1a173084f996f182e06d5a67d02c24abc0ed8472493a767f6dae58dacc42ae4a74d47522388369b12de89c3baacb8498d01db4f389f5e SHA512 8e4dd7b07cb04f98b5fae037e63b2f572674fe9355c943e598bc4850b4abb75e1b4b1cff4b167541592f68201d5a7d9e8d83782400dd5928346a844a91e4dcaf MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0 diff --git a/dev-libs/libical/libical-3.0.10.ebuild b/dev-libs/libical/libical-3.0.10.ebuild index 5ce88999e056..718a8b5dcf58 100644 --- a/dev-libs/libical/libical-3.0.10.ebuild +++ b/dev-libs/libical/libical-3.0.10.ebuild @@ -3,11 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) VALA_USE_DEPEND="vapigen" inherit cmake python-any-r1 vala -DESCRIPTION="An implementation of basic iCAL protocols" +DESCRIPTION="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" @@ -20,17 +20,6 @@ REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" RESTRICT="!test? ( test )" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - doc? ( app-doc/doxygen ) - introspection? ( dev-libs/gobject-introspection ) - test? ( - ${PYTHON_DEPS} - glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') ) - ) - vala? ( $(vala_depend) ) -" COMMON_DEPEND=" dev-libs/icu:= berkdb? ( sys-libs/db:= ) @@ -42,6 +31,20 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} sys-libs/timezone-data " +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + doc? ( + app-doc/doxygen + glib? ( dev-util/gtk-doc ) + ) + introspection? ( dev-libs/gobject-introspection ) + test? ( + ${PYTHON_DEPS} + glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') ) + ) + vala? ( $(vala_depend) ) +" DOCS=( AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO @@ -100,7 +103,7 @@ src_test() { } src_install() { - use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) + use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) cmake_src_install diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild deleted file mode 100644 index 5ce88999e056..000000000000 --- a/dev-libs/libical/libical-3.0.9.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -VALA_USE_DEPEND="vapigen" -inherit cmake python-any-r1 vala - -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-solaris" -IUSE="berkdb doc examples +glib +introspection static-libs test vala" - -REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" - -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - doc? ( app-doc/doxygen ) - introspection? ( dev-libs/gobject-introspection ) - test? ( - ${PYTHON_DEPS} - glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') ) - ) - vala? ( $(vala_depend) ) -" -COMMON_DEPEND=" - dev-libs/icu:= - berkdb? ( sys-libs/db:= ) - glib? ( dev-libs/glib:2 ) -" -DEPEND="${COMMON_DEPEND} - glib? ( dev-libs/libxml2:2 ) -" -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.4-tests.patch" - "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch" -) - -python_check_deps() { - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - use examples || cmake_comment_add_subdirectory examples - use vala && vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package berkdb BDB) - -DICAL_BUILD_DOCS=$(usex doc) - -DICAL_GLIB=$(usex glib) - -DGOBJECT_INTROSPECTION=$(usex introspection) - -DSHARED_ONLY=$(usex !static-libs) - -DLIBICAL_BUILD_TESTING=$(usex test) - -DICAL_GLIB_VAPI=$(usex vala) - ) - if use vala; then - mycmakeargs+=( - -DVALAC="${VALAC}" - -DVAPIGEN="${VAPIGEN}" - ) - fi - 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 -} -- cgit v1.2.3