From 0e52cbae2c719c3ef794ebeb0f4374fb96efcff3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 May 2023 11:33:44 +0100 Subject: gentoo auto-resync : 06:05:2023 - 11:33:44 --- app-misc/Manifest.gz | Bin 49943 -> 49945 bytes app-misc/ca-certificates/Manifest | 9 +- .../ca-certificates-20211016.3.83.ebuild | 203 -------------------- .../ca-certificates-20211016.3.86.ebuild | 203 -------------------- .../ca-certificates-20211016.3.87-r1.ebuild | 202 -------------------- .../ca-certificates-20211016.3.89.ebuild | 202 -------------------- .../ca-certificates-20230311.3.89.1.ebuild | 206 +++++++++++++++++++++ app-misc/khal/Manifest | 7 +- app-misc/khal/files/khal-0.10.4-add-etag.patch | 10 - app-misc/khal/khal-0.10.4-r1.ebuild | 45 ----- app-misc/khal/khal-0.10.5.ebuild | 40 ---- app-misc/khal/khal-0.11.1.ebuild | 2 +- 12 files changed, 210 insertions(+), 919 deletions(-) delete mode 100644 app-misc/ca-certificates/ca-certificates-20211016.3.83.ebuild delete mode 100644 app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild delete mode 100644 app-misc/ca-certificates/ca-certificates-20211016.3.87-r1.ebuild delete mode 100644 app-misc/ca-certificates/ca-certificates-20211016.3.89.ebuild create mode 100644 app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild delete mode 100644 app-misc/khal/files/khal-0.10.4-add-etag.patch delete mode 100644 app-misc/khal/khal-0.10.4-r1.ebuild delete mode 100644 app-misc/khal/khal-0.10.5.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 4ee65f3048dc..6aa292d56813 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index d10bb9d458ac..4100afae1b1c 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -3,16 +3,11 @@ AUX ca-certificates-20211016.3.72-no-cryptography.patch 824 BLAKE2B fb71347a7763 AUX ca-certificates-20230311.3.89-no-cryptography.patch 866 BLAKE2B 3ab0ef5d1405c9872eb0b09db697475183d5ee73a33a4196e7c9d8b334724f52e92fb4a4ab0c3ae5c0768274f4f46092a543d7865cc7718c3bf86ac6cd4b2de1 SHA512 4a38362d0577ea1a9f9a5dab02a89ebf8abd7caae0e33f1a6baeb36371eaa8a71cca2ef2543c10f35740efdff53b8089e4cd82031748850338b77755188226a8 DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1 DIST ca-certificates_20230311.tar.xz 257772 BLAKE2B b807a6415126afdc11896efea8e6509d7ad58b26bc8562b276e93176e80bb8b467a5bd2ba948d3dbbeaf0e4477d93f3ea2b99d3186e856fb47d1033cb779d560 SHA512 00571bdc87897813fd7dbe024f3a186cfc9f0d4f55e92545a90888c9e5282f99cb8d75b5932c034731b911bf27a9b38fd7d062dd511eb1152acf8b2811490fa7 -DIST nss-3.83.tar.gz 84844191 BLAKE2B f2e26f69450cbd2c94c5efdd959cb19e874bcb63d09098406ef49f4997bd04bc0ee4bc285c1c4f0ec461194171342c7d31965ac7bc7eefc284783542dfe853b1 SHA512 550cf1116e39e58041feaa67913f570d791e8153cc0522ba7ae02e27a61e0a4e6a25224be0f25d51a842dc11c70d600263450ebff0a9fdaa2840bafa3fc9ddd5 -DIST nss-3.86.tar.gz 71423531 BLAKE2B 36703d99d9616020a165085469be650c2f4ce3e11c2f4f6bd974b1b89f1b9fcfdaa4ffd4d6ee98dabce82e616c170548efa1e51722b524dda8815faccfcf5181 SHA512 c09aeb52d7898617b65a1090cbdd29f6457eff2ebdc61aadb2dbf7b5044eae010ee5eeea729825f1258902936a61a1bff552ee9b26b2f01e5d448bbd8791d1cb -DIST nss-3.87.tar.gz 71435408 BLAKE2B 0d69e18b1e2c4ccfc86db8f3afba94d5000e8ab2a4e766eb6f99f13f57d78b62dd711a0f5f70a24378a3cf1e435cc8ecb7e6fbeae18d5db0176660a0ea35dac2 SHA512 4ec7b94e537df109638b821f3a7e3b7bf31d89c3739a6e4c85cad4fab876390ae482971d6f66198818400f467661e86f39dc1d2a4a88077fd81e3a0b7ed64110 DIST nss-3.88.1.tar.gz 71607211 BLAKE2B ff84d3153a01519a52e83be5327453d8e6a81e1f62ccd69906b549fe42ec5ebf075b403395a67bc75f3c7f7dd33ef49f3b1f33558652ff75ee87e2970b2e06a4 SHA512 d15289803a4c3caa1b7a8872b761a95b4f571688c8b8ffaf2a1478e032a356fbcf8a9239ebe1777561503329f63dd237384e1d8af9ca70fb48b40e70954b455a +DIST nss-3.89.1.tar.gz 71624456 BLAKE2B fca6e09375ba2ce4a6f0bf189cabb9cdb1ba7cb5ebc1a49d47a2d6b509936a60d7f1867f71cdcfa6a81c0cbbf298513981a9b16ac23bbc464c7004bb40b830b4 SHA512 aeece4e8bc28113fc53997b29c89d40b4be74fee4f5d27c4e065d2fa6701038442f4eeeb1fcf98befedb03537a5a48a4701fe270f56197da57946529f9fa02dd DIST nss-3.89.tar.gz 71617802 BLAKE2B 92428a635167f311b258411420c8073fafdbadef5b1fc4ff8400e41834fc67a03f2151265d5bbfb64ae53b9a8acb29750352f6c2c83d1cd9a2f89a2139ad34c9 SHA512 1db06d4575f2c16d2a0629007981211e714f99c014c0a6256dd33d0caf8c809ba8d5be204d018f9d1cc99b9fcd055ac1fb99b399486ed43c9cf3f55f2747de82 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4 -EBUILD ca-certificates-20211016.3.83.ebuild 6073 BLAKE2B 943baa51816993a907213033b1331cf4f7366106fbea3786bb8c3452debc07314825266785767579eccd9daf3312c752a37d5163be10c8813354cbe9f518709a SHA512 a07298d2125b1c0fe466e2b3d22e674a4c45f2dfccde161365942789178cc84283fa4d4047a82bb696b42004cce69db4a58003b718255b5128190756646ccc11 -EBUILD ca-certificates-20211016.3.86.ebuild 6073 BLAKE2B 943baa51816993a907213033b1331cf4f7366106fbea3786bb8c3452debc07314825266785767579eccd9daf3312c752a37d5163be10c8813354cbe9f518709a SHA512 a07298d2125b1c0fe466e2b3d22e674a4c45f2dfccde161365942789178cc84283fa4d4047a82bb696b42004cce69db4a58003b718255b5128190756646ccc11 -EBUILD ca-certificates-20211016.3.87-r1.ebuild 6020 BLAKE2B fcc36d9d9fdca9ccaaedb795c64e7365e628cd132da3e2213e28267c46f3cda99c2e564c782175856598ee500b7eeb928e5e3c2f7d245472794238dc9374a457 SHA512 62e471682c9124b95f3983142051313640d26a70d538e145de8b62fd62fca517031ac8a509c3e05ea4ebc694aee19136acdaf5c346bb7b67a7d89b0a2c3cb798 EBUILD ca-certificates-20211016.3.88.1.ebuild 6020 BLAKE2B fcc36d9d9fdca9ccaaedb795c64e7365e628cd132da3e2213e28267c46f3cda99c2e564c782175856598ee500b7eeb928e5e3c2f7d245472794238dc9374a457 SHA512 62e471682c9124b95f3983142051313640d26a70d538e145de8b62fd62fca517031ac8a509c3e05ea4ebc694aee19136acdaf5c346bb7b67a7d89b0a2c3cb798 -EBUILD ca-certificates-20211016.3.89.ebuild 6028 BLAKE2B 782972ac40f22253f5dad67328acb28f307d3ca9109f17744d97358cadac66ac98e8485823bf4f5c665ff01929d106a79fff9594eb1b416ac3cbeb78c7464cd9 SHA512 bdb9f1dd232e862f05ab87bef6d53f4cca02ba357a866efb9000624eebaa5a86b1237064ac9cb9643db81cb384a6950539d4ea237fe675cfcc59b858a48c8826 +EBUILD ca-certificates-20230311.3.89.1.ebuild 6141 BLAKE2B 3416f9200795c8f536c426e2fba24f8babb515eeb762f197c784a2e44d73b45ba547ad7fba92028f49ad4b454afaf5ae9a0e9c71b6294c1d344685a77a544e61 SHA512 a02f768f2feb24107390650731639d9fcbfc00fb276bc12a2e5fda8b83b119e59d57c956846f69de4ce289f241783e8995e7b76ff31e681fe65ce698f180ae92 EBUILD ca-certificates-20230311.3.89.ebuild 6141 BLAKE2B 3416f9200795c8f536c426e2fba24f8babb515eeb762f197c784a2e44d73b45ba547ad7fba92028f49ad4b454afaf5ae9a0e9c71b6294c1d344685a77a544e61 SHA512 a02f768f2feb24107390650731639d9fcbfc00fb276bc12a2e5fda8b83b119e59d57c956846f69de4ce289f241783e8995e7b76ff31e681fe65ce698f180ae92 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954 diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.83.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.83.ebuild deleted file mode 100644 index 23b947a542d5..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.83.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# Where possible, bump to stable/LTS releases of NSS for the last part -# of the version (when not using a pure Debian release). - -# When triaging user reports, refer to our wiki for tips: -# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - - DEB_VER=$(ver_cut 1) - NSS_VER=$(ver_cut 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="https://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( - https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch - )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" cacert" - -# c_rehash: we run `c_rehash` -# debianutils: we run `run-parts` -CDEPEND="app-misc/c_rehash - sys-apps/debianutils" - -BDEPEND="${CDEPEND}" -if ! ${PRECOMPILED} ; then - BDEPEND+=" ${PYTHON_DEPS}" -fi - -DEPEND="" -if ${PRECOMPILED} ; then - DEPEND+=" !/dev/null || die - eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch - popd >/dev/null || die - fi - fi - - default - eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch - - pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die - eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch - popd >/dev/null || die - - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - -e 's/openssl rehash/c_rehash/' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - - if ! ${PRECOMPILED} ; then - local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" - - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs \ - etc/ca-certificates/update.d \ - "${c}"/mozilla \ - || die - if use cacert ; then - mkdir -p "${c}"/cacert.org || die - mv "${d}"/CA_Cert_Signing_Authority.crt \ - "${c}"/cacert.org/cacert.org_class1.crt || die - mv "${d}"/CAcert_Class_3_Root.crt \ - "${c}"/cacert.org/cacert.org_class3.crt || die - fi - mv "${d}"/*.crt "${c}"/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd "${c}" || die - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ${PN}-${DEB_VER} || die - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die - doenvd 98ca-certificates -} - -pkg_postinst() { - if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then - # If the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild deleted file mode 100644 index 23b947a542d5..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# Where possible, bump to stable/LTS releases of NSS for the last part -# of the version (when not using a pure Debian release). - -# When triaging user reports, refer to our wiki for tips: -# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - - DEB_VER=$(ver_cut 1) - NSS_VER=$(ver_cut 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="https://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( - https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch - )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" cacert" - -# c_rehash: we run `c_rehash` -# debianutils: we run `run-parts` -CDEPEND="app-misc/c_rehash - sys-apps/debianutils" - -BDEPEND="${CDEPEND}" -if ! ${PRECOMPILED} ; then - BDEPEND+=" ${PYTHON_DEPS}" -fi - -DEPEND="" -if ${PRECOMPILED} ; then - DEPEND+=" !/dev/null || die - eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch - popd >/dev/null || die - fi - fi - - default - eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch - - pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die - eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch - popd >/dev/null || die - - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - -e 's/openssl rehash/c_rehash/' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - - if ! ${PRECOMPILED} ; then - local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" - - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs \ - etc/ca-certificates/update.d \ - "${c}"/mozilla \ - || die - if use cacert ; then - mkdir -p "${c}"/cacert.org || die - mv "${d}"/CA_Cert_Signing_Authority.crt \ - "${c}"/cacert.org/cacert.org_class1.crt || die - mv "${d}"/CAcert_Class_3_Root.crt \ - "${c}"/cacert.org/cacert.org_class3.crt || die - fi - mv "${d}"/*.crt "${c}"/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd "${c}" || die - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ${PN}-${DEB_VER} || die - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die - doenvd 98ca-certificates -} - -pkg_postinst() { - if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then - # If the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.87-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.87-r1.ebuild deleted file mode 100644 index 70bceab8cee4..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.87-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# Where possible, bump to stable/LTS releases of NSS for the last part -# of the version (when not using a pure Debian release). - -# When triaging user reports, refer to our wiki for tips: -# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - - DEB_VER=$(ver_cut 1) - NSS_VER=$(ver_cut 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="https://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( - https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch - )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" cacert" - -# c_rehash: we run `c_rehash` -# debianutils: we run `run-parts` -CDEPEND=" - sys-apps/debianutils" - -BDEPEND="${CDEPEND}" -if ! ${PRECOMPILED} ; then - BDEPEND+=" ${PYTHON_DEPS}" -fi - -DEPEND="" -if ${PRECOMPILED} ; then - DEPEND+=" !/dev/null || die - eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch - popd >/dev/null || die - fi - fi - - default - eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch - - pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die - eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch - popd >/dev/null || die - - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - - if ! ${PRECOMPILED} ; then - local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" - - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs \ - etc/ca-certificates/update.d \ - "${c}"/mozilla \ - || die - if use cacert ; then - mkdir -p "${c}"/cacert.org || die - mv "${d}"/CA_Cert_Signing_Authority.crt \ - "${c}"/cacert.org/cacert.org_class1.crt || die - mv "${d}"/CAcert_Class_3_Root.crt \ - "${c}"/cacert.org/cacert.org_class3.crt || die - fi - mv "${d}"/*.crt "${c}"/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd "${c}" || die - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ${PN}-${DEB_VER} || die - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die - doenvd 98ca-certificates -} - -pkg_postinst() { - if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then - # If the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.89.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.89.ebuild deleted file mode 100644 index 8255e1b91566..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.89.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# Where possible, bump to stable/LTS releases of NSS for the last part -# of the version (when not using a pure Debian release). - -# When triaging user reports, refer to our wiki for tips: -# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - - DEB_VER=$(ver_cut 1) - NSS_VER=$(ver_cut 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="https://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( - https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch - )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" cacert" - -# c_rehash: we run `c_rehash` -# debianutils: we run `run-parts` -CDEPEND=" - sys-apps/debianutils" - -BDEPEND="${CDEPEND}" -if ! ${PRECOMPILED} ; then - BDEPEND+=" ${PYTHON_DEPS}" -fi - -DEPEND="" -if ${PRECOMPILED} ; then - DEPEND+=" !/dev/null || die - eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch - popd >/dev/null || die - fi - fi - - default - eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch - - pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die - eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch - popd >/dev/null || die - - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - - if ! ${PRECOMPILED} ; then - local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" - - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs \ - etc/ca-certificates/update.d \ - "${c}"/mozilla \ - || die - if use cacert ; then - mkdir -p "${c}"/cacert.org || die - mv "${d}"/CA_Cert_Signing_Authority.crt \ - "${c}"/cacert.org/cacert.org_class1.crt || die - mv "${d}"/CAcert_Class_3_Root.crt \ - "${c}"/cacert.org/cacert.org_class3.crt || die - fi - mv "${d}"/*.crt "${c}"/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd "${c}" || die - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ${PN}-${DEB_VER} || die - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die - doenvd 98ca-certificates -} - -pkg_postinst() { - if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then - # If the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild new file mode 100644 index 000000000000..1de788f51cb2 --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20230311.3.89.1.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# The Debian ca-certificates package merely takes the CA database as it exists +# in the nss package and repackages it for use by openssl. +# +# The issue with using the compiled debs directly is two fold: +# - they do not update frequently enough for us to rely on them +# - they pull the CA database from nss tip of tree rather than the release +# +# So we take the Debian source tools and combine them with the latest nss +# release to produce (largely) the same end result. The difference is that +# now we know our cert database is kept in sync with nss and, if need be, +# can be sync with nss tip of tree more frequently to respond to bugs. + +# Where possible, bump to stable/LTS releases of NSS for the last part +# of the version (when not using a pure Debian release). + +# When triaging user reports, refer to our wiki for tips: +# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 + +if [[ ${PV} == *.* ]] ; then + # Compile from source ourselves. + PRECOMPILED=false + + DEB_VER=$(ver_cut 1) + NSS_VER=$(ver_cut 2-) + RTM_NAME="NSS_${NSS_VER//./_}_RTM" +else + # Debian precompiled version. + PRECOMPILED=true + inherit unpacker +fi + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="https://packages.debian.org/sid/ca-certificates" +NMU_PR="" +if ${PRECOMPILED} ; then + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" +else + SRC_URI=" + mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + cacert? ( + https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch + ) + " +fi + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" +${PRECOMPILED} || IUSE+=" cacert" + +# c_rehash: we run `c_rehash` +# debianutils: we run `run-parts` +CDEPEND=" + sys-apps/debianutils" + +BDEPEND="${CDEPEND}" +if ! ${PRECOMPILED} ; then + BDEPEND+=" ${PYTHON_DEPS}" +fi + +DEPEND="" +if ${PRECOMPILED} ; then + DEPEND+=" !/dev/null || die + eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch + popd >/dev/null || die + fi + fi + + default + eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch + + pushd "${S}/${PN}" >/dev/null || die + # We patch out the dep on cryptography as it's not particularly useful + # for us. Please see the discussion in bug #821706. Not to be removed lightly! + eapply "${FILESDIR}"/${PN}-20230311.3.89-no-cryptography.patch + popd >/dev/null || die + + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') + sed -i \ + -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ + -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ + usr/sbin/update-ca-certificates || die +} + +src_compile() { + cd "image/${EPREFIX}" || die + + if ! ${PRECOMPILED} ; then + local d="${S}/${PN}/mozilla" c="usr/share/${PN}" + + # Grab the database from the nss sources. + cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die + emake -C "${d}" + + # Now move the files to the same places that the precompiled would. + mkdir -p etc/ssl/certs \ + etc/ca-certificates/update.d \ + "${c}"/mozilla \ + || die + if use cacert ; then + mkdir -p "${c}"/cacert.org || die + mv "${d}"/CA_Cert_Signing_Authority.crt \ + "${c}"/cacert.org/cacert.org_class1.crt || die + mv "${d}"/CAcert_Class_3_Root.crt \ + "${c}"/cacert.org/cacert.org_class3.crt || die + fi + mv "${d}"/*.crt "${c}"/mozilla/ || die + else + mv usr/share/doc/{ca-certificates,${PF}} || die + fi + + ( + echo "# Automatically generated by ${CATEGORY}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${c}" || die + find * -name '*.crt' | LC_ALL=C sort + ) > etc/ca-certificates.conf + + sh usr/sbin/update-ca-certificates --root "${S}/image" || die +} + +src_install() { + cp -pPR image/* "${D}"/ || die + if ! ${PRECOMPILED} ; then + cd ${PN} || die + doman sbin/*.8 + dodoc debian/README.* examples/ca-certificates-local/README + fi + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die + doenvd 98ca-certificates +} + +pkg_postinst() { + if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then + # If the user has local certs, we need to rebuild again + # to include their stuff in the db. + # However it's too overzealous when the user has custom certs in place. + # --fresh is to clean up dangling symlinks + "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" + fi + + if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then + ewarn "Removing the following broken symlinks:" + ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" + fi +} diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest index 44a7023fd8c9..b58d95d5c5a7 100644 --- a/app-misc/khal/Manifest +++ b/app-misc/khal/Manifest @@ -1,8 +1,3 @@ -AUX khal-0.10.4-add-etag.patch 417 BLAKE2B 2eadf7cb5ba1a4bd179a4f8b37278407819de7f798ce9f23723a11694fe9954bb67a267932d85416644a7dcf09544d13ca0107c02c832e63d36122cdab1e00f9 SHA512 ff5cd23b3351e474f8d9327bee52733587f8e5f8ab8973beff3736bd59af017865512c53b0c42b81f1b4fbb8212099b2d0d3751aa67e190f0e57349ffedd87b2 -DIST khal-0.10.4.tar.gz 185736 BLAKE2B 0cb9deb793f577bbcedcbba4788988973ee9d0ab71fdd30a01142a54434767d74b1d10e5bfa5f6a2feb9f18a8a9fe22717d4a38a07ab5e30b331c87b79a79f39 SHA512 b32f1bfe5d3a3976278726a6570eb345a5ad44f63a52b75f045fd0509d145edd5b76e11a10acffd9c3982edc124f93daec34a37c39299c2311796c0314016eb6 -DIST khal-0.10.5.tar.gz 188468 BLAKE2B 195e61fcff7cff1308f2819ec54c5733acebb5ace18f88afa8fc561926857dab3e0e0b82d1f7e3e0235e69ed9ad56544d6eeb95a9e9829dc078d49ebf96c0485 SHA512 f7b1e4d4934757ec7458fc4e73c6b6c5ee6b1c64f6cdc3e61771a2f05041515e4afb73b4a17cbc577747039b689ddd66503e120648c4bfe4e33113a3de6f3d14 DIST khal-0.11.1.tar.gz 193942 BLAKE2B 12f98781b9a64710537f7728a087f24ef1d73600e957eac7b699948047c1676a9c91a38a415741c6acd94a7ba72014d4b009425edab249225c8bef23b94c0387 SHA512 c4fd25dc4981f4937562949b78f81d3e57b7ef54f7f6d96855645ca239eea9dec7ee6f3c957a67261e7ae2975ab55b36a686db476b03f4fd0bacce94e834b239 -EBUILD khal-0.10.4-r1.ebuild 1308 BLAKE2B b8cf9aae27767f7e80b9068cf34d064d209b299002002badc315b4bf5eb721dd1918c1a2f1c79b854e88c5de9e926297b0d9b7ee2dd6a96ec41f45596d7803f7 SHA512 6ce73d8446ef6b871b2069976a9e4a34a9125fa47e95e935bc6f28a4d27150b29b8287af1fa407630cc505de7363545a7e62511b7e7cc0a8b85ae571660f0c5d -EBUILD khal-0.10.5.ebuild 1099 BLAKE2B 730804cced4520b1a5c0110d8555c473c1ca3d9fb5d01f221044ccd967dbcbf8efe3243c44df7a2b21b46c911beeaf028fab19f04c2a4e8c219b1afc2353148f SHA512 498b204022919644907bf5d7863119e106f3f37581b7adab477d5f3d65821e9142659ae90fef298a845f8ed3db3c246922ff858c39e315d30e9fe875f9e50d26 -EBUILD khal-0.11.1.ebuild 1196 BLAKE2B 209ff525dd688b490614f92fbbe2b385ff511ff06658c83061546096e22cac584deabf7655794253f6d0a9b56195d0b952739be21983e4d42527f3e3cde1023d SHA512 ed751facaacce367ad2b74d34d2bbccf36dda6fa8dbc35af2cc2f033918731053291b79634d4a78b5a9fd906f04894403b60cf75608dcf452ee648768f04bed2 +EBUILD khal-0.11.1.ebuild 1202 BLAKE2B 39d2b1bf605123c6a37922f52d89c5500e27ea226b1b50309aad8c2f04c07b1228600f8d9758c58235bd2e75b643a3102190c0602e36a5d5ae0540cb35a44efa SHA512 c3a4f15c900721e80f7176d747a95df324515ad235b8865f02b603e6df309bc637d92eb611dde30d2baa6e55512932d69c8604a78662514387b9f34d8328dab6 MISC metadata.xml 338 BLAKE2B edcc0d1e6743882d7621ea0ddfecbe105fdb1af59bfacb4bc0a94caa8c7d7680ad77f7f03bbefecaa2824da44bbce75ae0692c6ffce609b5d1aa64937383884c SHA512 978522e6e39fba63dc3d0b96be2ba673ed79dcab07bd1d095c2248af3a1bc2d0c8813d16af8148185caf2fc8fd80953269374e2e659c0f35d6a8473874130ebb diff --git a/app-misc/khal/files/khal-0.10.4-add-etag.patch b/app-misc/khal/files/khal-0.10.4-add-etag.patch deleted file mode 100644 index 14b9e6df71bf..000000000000 --- a/app-misc/khal/files/khal-0.10.4-add-etag.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/khal/ui/__init__.py 2022-02-02 16:30:20.507169060 +0100 -+++ b/khal/ui/__init__.py 2022-02-02 16:30:46.497378047 +0100 -@@ -1109,6 +1109,7 @@ - account, href, etag = part.split('\n', 2) - event = self.collection.get_event(href, account) - event.delete_instance(rec_id) -+ event.etag = etag - self.collection.update(event) - - def keypress(self, size, key): diff --git a/app-misc/khal/khal-0.10.4-r1.ebuild b/app-misc/khal/khal-0.10.4-r1.ebuild deleted file mode 100644 index dc6aeab6505c..000000000000 --- a/app-misc/khal/khal-0.10.4-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="A CalDAV based calendar" -HOMEPAGE="https://lostpackets.de/khal/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" - -RDEPEND="dev-python/click[${PYTHON_USEDEP}] - dev-python/click-log[${PYTHON_USEDEP}] - >=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}] - >=dev-python/urwid-1.3.0[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - >=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}] - dev-python/tzlocal[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}]" -BDEPEND=">dev-python/setuptools-scm-1.12.0[${PYTHON_USEDEP}] - dev-python/vdirsyncer[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}]" - -# https://github.com/pimutils/khal/issues/793 -PATCHES=( "${FILESDIR}/${P}-add-etag.patch" ) -DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample ) - -distutils_enable_tests pytest - -src_install() { - distutils-r1_src_install - - insinto /usr/share/zsh/site-functions - doins misc/__khal -} diff --git a/app-misc/khal/khal-0.10.5.ebuild b/app-misc/khal/khal-0.10.5.ebuild deleted file mode 100644 index cc3838fb5aa1..000000000000 --- a/app-misc/khal/khal-0.10.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 pypi - -DESCRIPTION="A CalDAV based calendar" -HOMEPAGE="https://lostpackets.de/khal/ https://github.com/pimutils/khal" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] - dev-python/click-log[${PYTHON_USEDEP}] - dev-python/icalendar[${PYTHON_USEDEP}] - dev-python/urwid[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] - dev-python/atomicwrites[${PYTHON_USEDEP}] - dev-python/tzlocal[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - dev-python/vdirsyncer[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}] -" - -DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample ) - -distutils_enable_tests pytest diff --git a/app-misc/khal/khal-0.11.1.ebuild b/app-misc/khal/khal-0.11.1.ebuild index 49071ea28ff0..d7fb643f20fa 100644 --- a/app-misc/khal/khal-0.11.1.ebuild +++ b/app-misc/khal/khal-0.11.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DISTUTILS_USE_PEP517=setuptools -- cgit v1.2.3