From 16f57e1f2bd136d5704eeb9c86037b2d5a3c69c3 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 24 May 2022 21:00:57 +0200 Subject: [PATCH 1/4] profiles: mask app-crypt/certbot-dns-digitalocean Signed-off-by: Andrew Ammerlaan --- profiles/package.mask | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 0ca391ecb3..7f85ab4977 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -48,3 +48,7 @@ gnome-extra/extension-manager # Andrew Ammerlaan (2022-04-14) # Depends on unavailable dev-python/regex-2022.3.15 dev-python/dateparser + +# Andrew Ammerlaan (2022-05-24) +# Hard depends on removed version of app-crypt/certbot, needs bump +app-crypt/certbot-dns-digitalocean From d3320b9d483194a30b6b152d6103a1cef738befe Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 24 May 2022 21:05:43 +0200 Subject: [PATCH 2/4] net-misc/yacy: minor QA, add || die, fix indentation Signed-off-by: Andrew Ammerlaan --- net-misc/yacy/yacy-1.924.20210209.10069.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild index c8ca6a480e..6663b8ccda 100644 --- a/net-misc/yacy/yacy-1.924.20210209.10069.ebuild +++ b/net-misc/yacy/yacy-1.924.20210209.10069.ebuild @@ -18,9 +18,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="systemd +openrc" -DEPEND=">=virtual/jdk-1.8 - acct-group/yacy - acct-user/yacy" +DEPEND=" + >=virtual/jdk-1.8 + acct-group/yacy + acct-user/yacy +" RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}" @@ -35,7 +37,7 @@ src_install() { rm ${S}/*.sh || die # remove sources rm -r "${S}/source" || die - rm ${S}/build.properties ${S}/build.xml + rm ${S}/build.properties ${S}/build.xml || die dodoc AUTHORS NOTICE && rm AUTHORS NOTICE COPYRIGHT gpl.txt @@ -49,7 +51,7 @@ src_install() { chown yacy:yacy "${D}/var/log/yacy" || die keepdir /var/log/yacy - rmdir "$D/$yacy_home/DATA" + rmdir "$D/$yacy_home/DATA" || die dosym /var/lib/yacy /${yacy_home}/DATA use openrc && { From 578bab56066bb129ce9c0dc5c4f07e8fe8e1312a Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 24 May 2022 21:07:16 +0200 Subject: [PATCH 3/4] sys-process/snooze: minor QA: remove PN from metadata vars Signed-off-by: Andrew Ammerlaan --- sys-process/snooze/snooze-0.5.ebuild | 4 ++-- sys-process/snooze/snooze-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-process/snooze/snooze-0.5.ebuild b/sys-process/snooze/snooze-0.5.ebuild index 19a93cb6cb..c6b84b601a 100644 --- a/sys-process/snooze/snooze-0.5.ebuild +++ b/sys-process/snooze/snooze-0.5.ebuild @@ -4,8 +4,8 @@ EAPI=7 DESCRIPTION="Run a command at a particular time" -HOMEPAGE="https://github.com/leahneukirchen/${PN}" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/leahneukirchen/snooze" +SRC_URI="https://github.com/leahneukirchen/snooze/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" LICENSE="CC0-1.0" diff --git a/sys-process/snooze/snooze-9999.ebuild b/sys-process/snooze/snooze-9999.ebuild index 2046229175..e7df9d0071 100644 --- a/sys-process/snooze/snooze-9999.ebuild +++ b/sys-process/snooze/snooze-9999.ebuild @@ -4,10 +4,10 @@ EAPI=7 DESCRIPTION="Run a command at a particular time" -HOMEPAGE="https://github.com/leahneukirchen/${PN}" +HOMEPAGE="https://github.com/leahneukirchen/snooze" inherit git-r3 -EGIT_REPO_URI="${HOMEPAGE}.git" +EGIT_REPO_URI="https://github.com/leahneukirchen/snooze.git" LICENSE="CC0-1.0" SLOT="0" From e1e9c0a70d3424971180305144380103efa437c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= Date: Tue, 24 May 2022 21:09:37 +0200 Subject: [PATCH 4/4] dev-util/pmbootstrap: add 1.44.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Duje Mihanović --- dev-util/pmbootstrap/Manifest | 1 + .../pmbootstrap/pmbootstrap-1.44.1.ebuild | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild diff --git a/dev-util/pmbootstrap/Manifest b/dev-util/pmbootstrap/Manifest index 9b2589af24..b5d01ee277 100644 --- a/dev-util/pmbootstrap/Manifest +++ b/dev-util/pmbootstrap/Manifest @@ -1 +1,2 @@ DIST pmbootstrap-1.43.1.tar.gz 225811 BLAKE2B d8e5d74510692f65e1430be9d813c23c95c4e8b44212c21ef01747264333a59cb158fb7f03866ca28d907b2d9ab927bfa9dd347bed7462fab6c64b03b9a629cf SHA512 96ba36dba211eacca44afae2c7009fc3e784e0067547406f9640eda311e3331adc54a81ebecefdf3238096e7a156dd3e56fc5b2864c28810c0526ab3efb64c15 +DIST pmbootstrap-1.44.1.tar.gz 225898 BLAKE2B 0dd8ea621c7ece8cd7f331d06dd85bde6b38c08bcadd8b0bc6d364855bef7204007988d79992b4ecc8d15e89f1f3917aa0104e81f93ab88e62392da6c96a0bcc SHA512 05499bea2d880f7c8ec3e4bf87b819186448eb99855989d88dc7fa320c71b142461e0679d6089cb06cd3f3b887da389e924d03b20e5f9c339b1ef7610b37b2cf diff --git a/dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild b/dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild new file mode 100644 index 0000000000..e4a1d1f11e --- /dev/null +++ b/dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit python-r1 distutils-r1 linux-info + +DESCRIPTION="Helper tool for developing and building postmarketOS" +HOMEPAGE="https://postmarketos.org/" + +SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" + +# According to upstream README either x86, amd64 or arm64 are required. I +# wrote down all other arches because if I just did -* without adding x86 and +# arm64 keywords it would seem like the package only works on amd64, but I can't +# keyword x86 and arm64 because I can't test these. +KEYWORDS="-alpha ~amd64 -arm -hppa -ia64 -ppc -ppc64 -riscv -sparc" +# Tests are disabled because they require the pmaports repository (containing +# postmarketOS APKBUILDs) to be cloned at runtime. +RESTRICT="mirror test" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-vcs/git" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_pretend() { + if kernel_is -lt 3 17 0; then + eerror "pmbootstrap requires Linux 3.17 or greater." + die + fi +}