diff --git a/dev-java/corretto-bin/metadata.xml b/dev-java/corretto-bin/metadata.xml index b56f4a748f..b672734122 100644 --- a/dev-java/corretto-bin/metadata.xml +++ b/dev-java/corretto-bin/metadata.xml @@ -8,4 +8,7 @@ microsoft/openjdk + + Don't install the X backend for AWT, needed by some GUIs + diff --git a/dev-java/microsoft-openjdk-bin/metadata.xml b/dev-java/microsoft-openjdk-bin/metadata.xml index b56f4a748f..b672734122 100644 --- a/dev-java/microsoft-openjdk-bin/metadata.xml +++ b/dev-java/microsoft-openjdk-bin/metadata.xml @@ -8,4 +8,7 @@ microsoft/openjdk + + Don't install the X backend for AWT, needed by some GUIs + diff --git a/dev-python/biplist/biplist-1.0.3.ebuild b/dev-python/biplist/biplist-1.0.3.ebuild index bc03751ae2..7cf2f3dbdd 100644 --- a/dev-python/biplist/biplist-1.0.3.ebuild +++ b/dev-python/biplist/biplist-1.0.3.ebuild @@ -16,10 +16,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -# DEPEND="test? ( ${RDEPEND} )" + +RESTRICT="test" +# Because using dev-python/nose test framework - +# that is abandonware for 10 years +# Related ticket on the upstream: https://github.com/wooster/biplist/issues/14 + REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( "${FILESDIR}/${PN}-python3-compat.patch" ) - -# Removed from ::gentoo -# distutils_enable_tests nose diff --git a/dev-util/deblob/Manifest b/dev-util/deblob/Manifest index 305520c269..ece48925b8 100644 --- a/dev-util/deblob/Manifest +++ b/dev-util/deblob/Manifest @@ -1,2 +1,4 @@ DIST deblob-0.6.tar.gz 47780 BLAKE2B 7c19c9dfb466ef705789768b9424b3ff5861c03f10715c63ea1215cf94a3bf8284304a771953f1311e74fc7aa60e2ab5990d5ab35622b9d578baad98bab3d5e2 SHA512 04381745af4d0bc4958a0a40de448ab45fdfe345dbaac08c93e1729bf90c1cc08f803a9831c346bf0d94258ea570e212ea924363aa50db2de1654f68aa27778a +DIST deblob-0.6.tar.gz.sign 305 BLAKE2B 22f7ea757facb17afbe37b0bdce58c1cb43778a1ba08fe5547052233ef348a4416657ab4a2f08f71d9c4a94cb36de38fe721d0fc9ba2e7bd0ed992f91887c8b7 SHA512 2f96b6aeca51083bb8dd275c9bcfc4341d73a4ca90fe7d39282a591fa3c62849db5c44b9d9e7caa798107b579bf0e50c8873f75d79e906c8b94eacd0688ba16a DIST deblob-0.7.tar.gz 47879 BLAKE2B fa392bebcb07f36dfa894156ff494b23e514fd0c6d2d589fbfa110292a35e9ea8c2c89178e17a0797f01e66e98f16a8c71cea1b8746f8a70eca0cfabae83ae51 SHA512 b0857981a72bd52987a94ce7a6e59c17bc0ca882494bd4e6514f06ffd397bb14fba25562817f41b600b32c4708284d2768946696fbdd8d8a7d421c321fdfa0f7 +DIST deblob-0.7.tar.gz.sign 305 BLAKE2B 184e4868f276b11c7d64e8d3b1de839d47033595aaa58b67d4a8e6dcdb593980f40c6e12b499635aee1e6f2e6cf9efb439445ff4a443b5ba71a5e5776b3f8473 SHA512 c2f3645ae2cc3bd102a98ef2500a80fd9d0ddf2f3117494bcdc8b4162a8a7e561e8b1a5d34641c35376de36a99967fece80c0678f9f21d14c57ede1617403655 diff --git a/dev-util/deblob/deblob-0.6.ebuild b/dev-util/deblob/deblob-0.6.ebuild index 0a382cb7ed..50e013ca81 100644 --- a/dev-util/deblob/deblob-0.6.ebuild +++ b/dev-util/deblob/deblob-0.6.ebuild @@ -7,7 +7,13 @@ if [[ "$PV" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob" else - SRC_URI="https://hacktivis.me/releases/${P}.tar.gz" + VERIFY_SIG_METHOD=signify + inherit verify-sig + + SRC_URI=" + https://hacktivis.me/releases/${P}.tar.gz + verify-sig? ( https://hacktivis.me/releases/${P}.tar.gz.sign ) + " KEYWORDS="~amd64 ~arm64 ~riscv" fi @@ -24,6 +30,24 @@ DEPEND=" # built by hare QA_FLAGS_IGNORED="usr/bin/deblob" +if [[ "${PV}" != "9999" ]] +then + BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2023 )" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2023.pub" + + src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${P}.tar.gz" "${P}.tar.gz.sign" + fi + default + } +fi + src_install() { PREFIX="/usr" default } diff --git a/dev-util/deblob/deblob-0.7.ebuild b/dev-util/deblob/deblob-0.7.ebuild index 4cd6cf63d6..6957771244 100644 --- a/dev-util/deblob/deblob-0.7.ebuild +++ b/dev-util/deblob/deblob-0.7.ebuild @@ -7,7 +7,13 @@ if [[ "$PV" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob" else - SRC_URI="https://hacktivis.me/releases/${P}.tar.gz" + VERIFY_SIG_METHOD=signify + inherit verify-sig + + SRC_URI=" + https://hacktivis.me/releases/${P}.tar.gz + verify-sig? ( https://hacktivis.me/releases/${P}.tar.gz.sign ) + " KEYWORDS="~amd64 ~arm64 ~riscv" fi @@ -23,6 +29,24 @@ DEPEND=" # built by hare QA_FLAGS_IGNORED="usr/bin/deblob" +if [[ "${PV}" != "9999" ]] +then + BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2024 )" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2024.pub" + + src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${P}.tar.gz" "${P}.tar.gz.sign" + fi + default + } +fi + src_install() { PREFIX="/usr" default } diff --git a/dev-util/deblob/deblob-9999.ebuild b/dev-util/deblob/deblob-9999.ebuild index 58c33db344..3400f1d6a3 100644 --- a/dev-util/deblob/deblob-9999.ebuild +++ b/dev-util/deblob/deblob-9999.ebuild @@ -7,7 +7,13 @@ if [[ "$PV" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob" else - SRC_URI="https://hacktivis.me/releases/${P}.tar.gz" + VERIFY_SIG_METHOD=signify + inherit verify-sig + + SRC_URI=" + https://hacktivis.me/releases/${P}.tar.gz + verify-sig? ( https://hacktivis.me/releases/${P}.tar.gz.sign ) + " KEYWORDS="~amd64 ~arm64 ~riscv" fi @@ -21,6 +27,24 @@ DEPEND="dev-lang/hare:=" # built by hare QA_FLAGS_IGNORED="usr/bin/deblob" +if [[ "${PV}" != "9999" ]] +then + BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2023 )" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2023.pub" + + src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${P}.tar.gz" "${P}.tar.gz.sign" + fi + default + } +fi + src_install() { PREFIX="/usr" default } diff --git a/profiles/package.mask b/profiles/package.mask index a9f3817317..10e15e6e03 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -20,15 +20,11 @@ app-text/lizard dev-cpp/libcutl dev-cpp/libstudxml -dev-python/biplist dev-python/http-ece dev-python/proxy_tools dev-python/tweepy dev-util/odb # revdeps -app-backup/b2 -app-forensics/mvt -dev-python/iOSbackup dev-python/mastodon-py dev-python/pywebview # revdeps of revdeps diff --git a/sec-keys/signify-keys-lanodan/Manifest b/sec-keys/signify-keys-lanodan/Manifest new file mode 100644 index 0000000000..d5142df83c --- /dev/null +++ b/sec-keys/signify-keys-lanodan/Manifest @@ -0,0 +1,5 @@ +DIST signify-keys-lanodan-2021-04.pub 112 BLAKE2B beebb4e9d55fda71698c3beb5f8a8f10083ff7fe7614ad1e2186ae748ca8f383ac44f7779ca0e3001edf121f38d6df1716512a50191e78efe8b2a3e4e1e274c7 SHA512 cf73f717fa691dc65414a47d045db2894ca777fc4b82c5180da69b21b1af863d3af7638f049ba8718de392253e073a1ffa9cc778cc5f11d4700a4a871e35952f +DIST signify-keys-lanodan-2023.pub 113 BLAKE2B 42b405c4ebfa84aedb1fef1f6d62514e5f643d27157cd9589152f0c2f65de408aa11adf96214071a0540d1a4da0dd5ebb8441760dce99b50bc6525eca6f105fa SHA512 c7974601ba39f0f74003c5758d3a40c3c5856b324676a72d640283e4b06332f9a4acac2ff887e525659affa714ea9a5e66abaf96a22b72f6e97547453908e599 +DIST signify-keys-lanodan-2023.pub.2021-04.sig 296 BLAKE2B 8f90363458138876567a10bd819f2a724450c51a81ce09782459aa19dafa4787f7724dda2be4774fce4f03a04fa0788ece505d11660e1a5aa639f43a77dd163e SHA512 46fc51024b77b4c5176bc9c4656d6e85cf07613c4947de5d800ade42ccaa19f7f8aec3dafd1ab2276dfd2c0af61468cd6096cfced47388aae0097a3a1d3656f2 +DIST signify-keys-lanodan-2024.pub 113 BLAKE2B aa896060f193195e56aad502201e9dbc67390783ceeb88a7af7c8664e7a7b7d4be42af2ad47fcd5801177903f15e1f29a0e97345d532caa8a7c08c104ea2d672 SHA512 1f1b2799366cc24689469860f42babf529e210e950c804934e47fac12916d127bcba0e90de3f0e71c0ec2cf61a45070058a4a4ecdee3ebb09c1e2503db263d2d +DIST signify-keys-lanodan-2024.pub.2023.sig 296 BLAKE2B 1dd13e1bda406905027163a2d25d9f6eca6394683b5fa3d84622787488a22735aea112d437008ca887d4719bb836a7d62fa8eb914d610282c85edd07204566e9 SHA512 e6f1d54ab524cb1ddbf720c87984818be808653f0092562bf3a6745a2c40108fd442da2a070dc15aad13d5a0b6e4d1f987f17a33162b1d38ec4ff40ea6220613 diff --git a/sec-keys/signify-keys-lanodan/metadata.xml b/sec-keys/signify-keys-lanodan/metadata.xml new file mode 100644 index 0000000000..2092bcc33a --- /dev/null +++ b/sec-keys/signify-keys-lanodan/metadata.xml @@ -0,0 +1,8 @@ + + + + + contact@hacktivis.me + Haelwenn (lanodan) Monnier + + diff --git a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2021.04.ebuild b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2021.04.ebuild new file mode 100644 index 0000000000..cac36a3ea1 --- /dev/null +++ b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2021.04.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_rs 1 -)" +DESCRIPTION="Signify keys used by Haelwenn (lanodan) Monnier" +HOMEPAGE="https://hacktivis.me/releases/signify/" +SRC_URI="https://hacktivis.me/releases/signify/${MY_PV}.pub -> ${PN}-${MY_PV}.pub" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +src_install() { + local files=( ${A} ) + + insinto /usr/share/signify-keys + newins - ${P}.pub < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} diff --git a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild new file mode 100644 index 0000000000..321dda971d --- /dev/null +++ b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2023.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_METHOD=signify +inherit verify-sig + +MY_PREV_PV="2021-04" +DESCRIPTION="Signify keys used by Haelwenn (lanodan) Monnier" +HOMEPAGE="https://hacktivis.me/releases/signify/" +SRC_URI=" + https://hacktivis.me/releases/signify/${PV}.pub -> ${P}.pub + verify-sig? ( https://hacktivis.me/releases/signify/${PV}.pub.${MY_PREV_PV}.sig -> ${P}.pub.${MY_PREV_PV}.sig ) +" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +BDEPEND="verify-sig? ( sec-keys/signify-keys-lanodan:${MY_PREV_PV} )" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-${MY_PREV_PV//-/.}.pub" + +src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${P}.pub" "${P}.pub.${MY_PREV_PV}.sig" + fi + default +} + +src_install() { + insinto /usr/share/signify-keys + doins "${P}.pub" +} diff --git a/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild new file mode 100644 index 0000000000..f41946bf96 --- /dev/null +++ b/sec-keys/signify-keys-lanodan/signify-keys-lanodan-2024.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_METHOD=signify +inherit verify-sig + +MY_PREV_PV="2023" +DESCRIPTION="Signify keys used by Haelwenn (lanodan) Monnier" +HOMEPAGE="https://hacktivis.me/releases/signify/" +SRC_URI=" + https://hacktivis.me/releases/signify/${PV}.pub -> ${P}.pub + verify-sig? ( https://hacktivis.me/releases/signify/${PV}.pub.${MY_PREV_PV}.sig -> ${P}.pub.${MY_PREV_PV}.sig ) +" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +BDEPEND="verify-sig? ( sec-keys/signify-keys-lanodan:${MY_PREV_PV} )" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-${MY_PREV_PV}.pub" + +src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${P}.pub" "${P}.pub.${MY_PREV_PV}.sig" + fi + default +} + +src_install() { + insinto /usr/share/signify-keys + doins "${P}.pub" +} diff --git a/www-client/badwolf/Manifest b/www-client/badwolf/Manifest index 50e3b52294..943ef0b347 100644 --- a/www-client/badwolf/Manifest +++ b/www-client/badwolf/Manifest @@ -1 +1,2 @@ DIST badwolf-1.3.0.tar.gz 114477 BLAKE2B e79c223b597b08acdc5d090a47c179a8ab27727d3cb7b7f842c021b5f1d1f25c2e5604bf8b1cea986270ec97f3a8e25eeae866a124e72df7a7aaf876ecff9b08 SHA512 f83884f9a1c4d12d641f68697d7fab7885803975ead6cb78e88b0b8d2f7b6f9da116f72e39f02c47e8dca89e4ced9b932524338a6211c7d4509c12206c10cdeb +DIST badwolf-1.3.0.tar.gz.sign 308 BLAKE2B aced82f92e7721a297c1989394a1e5588180ae6c97923892c8bc6d379efc3e6a67957d4b5c10e9ca5786230b7576d7553687adaa2042f1eb341358efb7089072 SHA512 0568e25c6602cad1fbe1e3521ca19e45b9e67e561515e9e43a3a75fb80a08b1e2c0d42b95b6125a743095a6dcaed8d45ea908075c886111c52f32c53df844081 diff --git a/www-client/badwolf/badwolf-1.3.0.ebuild b/www-client/badwolf/badwolf-1.3.0.ebuild index 5cd3ef78ea..a105b1849d 100644 --- a/www-client/badwolf/badwolf-1.3.0.ebuild +++ b/www-client/badwolf/badwolf-1.3.0.ebuild @@ -10,11 +10,16 @@ then EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git" inherit git-r3 else + VERIFY_SIG_METHOD=signify + inherit savedconfig verify-sig + MY_P="${PN}-$(ver_rs 3 - 4 .)" - SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz" + SRC_URI=" + https://hacktivis.me/releases/${MY_P}.tar.gz + verify-sig? ( https://hacktivis.me/releases/${MY_P}.tar.gz.sign ) + " KEYWORDS="~amd64 ~arm64 ~ppc64" S="${WORKDIR}/${MY_P}" - inherit savedconfig fi DESCRIPTION="Minimalist and privacy-oriented WebKitGTK+ browser" @@ -39,6 +44,24 @@ PATCHES=( "${FILESDIR}/badwolf-1.3.0-configure_missing_ed.patch" ) +if [[ "${PV}" != "9999" ]] +then + BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2021-04 )" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2021.04.pub" + + src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${MY_P}.tar.gz" "${MY_P}.tar.gz.sign" + fi + default + } +fi + src_configure() { [[ "${PV}" == "9999" ]] || restore_config config.h diff --git a/www-client/badwolf/badwolf-9999.ebuild b/www-client/badwolf/badwolf-9999.ebuild index 1c1de32eff..f372cf41de 100644 --- a/www-client/badwolf/badwolf-9999.ebuild +++ b/www-client/badwolf/badwolf-9999.ebuild @@ -10,11 +10,16 @@ then EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git" inherit git-r3 else + VERIFY_SIG_METHOD=signify + inherit savedconfig verify-sig + MY_P="${PN}-$(ver_rs 3 - 4 .)" - SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz" - KEYWORDS="~amd64" + SRC_URI=" + https://hacktivis.me/releases/${MY_P}.tar.gz + verify-sig? ( https://hacktivis.me/releases/${MY_P}.tar.gz.sign ) + " + KEYWORDS="~amd64 ~arm64 ~ppc64" S="${WORKDIR}/${MY_P}" - inherit savedconfig fi DESCRIPTION="Minimalist and privacy-oriented WebKitGTK+ browser" @@ -35,6 +40,24 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="test? ( app-text/mandoc )" +if [[ "${PV}" != "9999" ]] +then + BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2021-04 )" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2021.04.pub" + + src_unpack() { + if use verify-sig; then + # Too many levels of symbolic links + cd "${DISTDIR}" || die + cp ${A} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_detached "${MY_P}.tar.gz" "${MY_P}.tar.gz.sign" + fi + default + } +fi + src_configure() { [[ "${PV}" == "9999" ]] || restore_config config.h