diff options
Diffstat (limited to 'dev-libs/libical')
| -rw-r--r-- | dev-libs/libical/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch | 44 | ||||
| -rw-r--r-- | dev-libs/libical/libical-3.0.17.ebuild (renamed from dev-libs/libical/libical-3.0.10.ebuild) | 35 | ||||
| -rw-r--r-- | dev-libs/libical/libical-3.0.18.ebuild (renamed from dev-libs/libical/libical-3.0.11.ebuild) | 39 | ||||
| -rw-r--r-- | dev-libs/libical/metadata.xml | 2 |
5 files changed, 41 insertions, 83 deletions
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index 683059d3d905..c7b0779ec931 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -1,2 +1,2 @@ -DIST libical-3.0.10.tar.gz 889470 BLAKE2B 990a37cdb6a00c52bab1a10f5899752dc2f9f0f2c3e0ada9e54803007e3db97dcd600544bf45a9a0646631aaf41839a0818b5d70b3e6e305826db2dd1cc30bdb SHA512 e32ccaff9b8a501f340567a1221c580023e4ed79918519bfa88aee2c0e8b62f5ea37e10907f2eb6fbd346a57408708a74e30aaf9a57a8d711eae30ddc974ddd0 -DIST libical-3.0.11.tar.gz 891646 BLAKE2B 8e52f5d33586f435eb3311854c5ae5b96393f917cf119d46ef66bb1a10a4db2b1bf2a828c4cd0a4fb99428f44633b6a5592b144d0167f70887aaac3393312655 SHA512 cdee86c50edc2373ab2024d7d4ae26dd4b9a728dbc13083472c4923c67f61ff3cef7d43edca762c6a11979d2040fc1576a033eaa23a19e58af8f14a7d67fc139 +DIST libical-3.0.17.tar.gz 909125 BLAKE2B 002eba515280c685db49d7f6781048ca4f86a22fb44a740b459fd8ae8f7dd669cb8a623df16e87913a397fc9b242d75c999e7aea26f09254982d77f1c9f87ac2 SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7 +DIST libical-3.0.18.tar.gz 908948 BLAKE2B 0d3a665bce64752bbb1d28afea708643e6f52f19d5e5eae576aac40b720661e5c9593ff1e5ae48ef9a6c1b54259a7848847817ae669bbc8ef6b34bf1c7d90ee6 SHA512 53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 diff --git a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch deleted file mode 100644 index a3a80e9f76f5..000000000000 --- a/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -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.10.ebuild b/dev-libs/libical/libical-3.0.17.ebuild index 3efd1ffc1495..93d55917bd08 100644 --- a/dev-libs/libical/libical-3.0.10.ebuild +++ b/dev-libs/libical/libical-3.0.17.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) VALA_USE_DEPEND="vapigen" inherit cmake python-any-r1 vala @@ -13,8 +13,8 @@ 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="berkdb doc examples +glib +introspection static-libs test vala" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc examples +glib +introspection static-libs test vala" REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" @@ -22,7 +22,6 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/icu:= - berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) " DEPEND="${COMMON_DEPEND} @@ -35,7 +34,7 @@ BDEPEND=" dev-lang/perl virtual/pkgconfig doc? ( - app-doc/doxygen + app-text/doxygen[dot] glib? ( dev-util/gtk-doc ) ) introspection? ( dev-libs/gobject-introspection ) @@ -47,17 +46,17 @@ BDEPEND=" " DOCS=( - AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO - doc/{AddingOrModifyingComponents,UsingLibical}.txt + AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO + doc/{AddingOrModifyingComponents.txt,UsingLibical.md} ) PATCHES=( "${FILESDIR}/${PN}-3.0.4-tests.patch" - "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch" + "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" ) python_check_deps() { - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" } pkg_setup() { @@ -66,13 +65,14 @@ pkg_setup() { src_prepare() { cmake_src_prepare + use examples || cmake_comment_add_subdirectory examples - use vala && vala_src_prepare + use vala && vala_setup } src_configure() { local mycmakeargs=( - $(cmake_use_find_package berkdb BDB) + -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON -DICAL_BUILD_DOCS=$(usex doc) -DICAL_GLIB=$(usex glib) -DGOBJECT_INTROSPECTION=$(usex introspection) @@ -91,7 +91,12 @@ src_configure() { src_compile() { cmake_src_compile - use doc && cmake_src_compile docs + + if use doc; then + cmake_src_compile docs + + HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) + fi } src_test() { @@ -103,8 +108,6 @@ src_test() { } src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) - cmake_src_install if use examples; then diff --git a/dev-libs/libical/libical-3.0.11.ebuild b/dev-libs/libical/libical-3.0.18.ebuild index 4a1c23b6ce92..09aa9244e951 100644 --- a/dev-libs/libical/libical-3.0.11.ebuild +++ b/dev-libs/libical/libical-3.0.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..12} ) VALA_USE_DEPEND="vapigen" inherit cmake python-any-r1 vala @@ -13,8 +13,8 @@ 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="berkdb doc examples +glib +introspection static-libs test vala" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc examples +glib +introspection static-libs test vala" REQUIRED_USE="introspection? ( glib ) vala? ( introspection )" @@ -22,7 +22,6 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/icu:= - berkdb? ( sys-libs/db:= ) glib? ( dev-libs/glib:2 ) " DEPEND="${COMMON_DEPEND} @@ -35,7 +34,7 @@ BDEPEND=" dev-lang/perl virtual/pkgconfig doc? ( - app-doc/doxygen[dot] + app-text/doxygen[dot] glib? ( dev-util/gtk-doc ) ) introspection? ( dev-libs/gobject-introspection ) @@ -47,17 +46,14 @@ BDEPEND=" " DOCS=( - AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO - doc/{AddingOrModifyingComponents,UsingLibical}.txt + AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO + doc/{AddingOrModifyingComponents.txt,UsingLibical.md} ) -PATCHES=( - "${FILESDIR}/${PN}-3.0.4-tests.patch" - "${FILESDIR}/${P}-pkgconfig-libdir.patch" -) +PATCHES=( "${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch" ) python_check_deps() { - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" } pkg_setup() { @@ -66,14 +62,14 @@ pkg_setup() { src_prepare() { cmake_src_prepare - use examples || cmake_comment_add_subdirectory examples - use vala && vala_src_prepare + use vala && vala_setup } src_configure() { local mycmakeargs=( - $(cmake_use_find_package berkdb BDB) + -DCMAKE_DISABLE_FIND_PACKAGE_BerkeleyDB=ON -DICAL_BUILD_DOCS=$(usex doc) + -DLIBICAL_BUILD_EXAMPLES=$(use examples) -DICAL_GLIB=$(usex glib) -DGOBJECT_INTROSPECTION=$(usex introspection) -DSHARED_ONLY=$(usex !static-libs) @@ -91,7 +87,12 @@ src_configure() { src_compile() { cmake_src_compile - use doc && cmake_src_compile docs + + if use doc; then + cmake_src_compile docs + + HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) + fi } src_test() { @@ -103,8 +104,6 @@ src_test() { } src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) - cmake_src_install if use examples; then diff --git a/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml index 3ef977ba572e..1bf758400523 100644 --- a/dev-libs/libical/metadata.xml +++ b/dev-libs/libical/metadata.xml @@ -9,6 +9,6 @@ <remote-id type="github">libical/libical</remote-id> </upstream> <use> - <flag name="glib">Enable dev-libs/glib interface support</flag> + <flag name="glib">Enable <pkg>dev-libs/glib</pkg> interface support</flag> </use> </pkgmetadata> |