From b013c091060ad384ed7f05e77402b7307c699db2 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 17 Dec 2021 23:16:13 +0100 Subject: Move {app-crypt → sec-keys}/openpgp-keys-teemutoivola MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-crypt/openpgp-keys-teemutoivola/Manifest | 1 - app-crypt/openpgp-keys-teemutoivola/metadata.xml | 9 --------- .../openpgp-keys-teemutoivola-20210426.ebuild | 22 ---------------------- net-analyzer/vnstat/vnstat-1.17-r1.ebuild | 2 +- net-analyzer/vnstat/vnstat-2.6-r1.ebuild | 2 +- net-analyzer/vnstat/vnstat-2.7.ebuild | 2 +- net-analyzer/vnstat/vnstat-2.8.ebuild | 2 +- net-analyzer/vnstat/vnstat-9999.ebuild | 2 +- profiles/updates/4Q-2021 | 1 + sec-keys/openpgp-keys-teemutoivola/Manifest | 1 + sec-keys/openpgp-keys-teemutoivola/metadata.xml | 9 +++++++++ .../openpgp-keys-teemutoivola-20210426.ebuild | 22 ++++++++++++++++++++++ 12 files changed, 38 insertions(+), 37 deletions(-) delete mode 100644 app-crypt/openpgp-keys-teemutoivola/Manifest delete mode 100644 app-crypt/openpgp-keys-teemutoivola/metadata.xml delete mode 100644 app-crypt/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild create mode 100644 sec-keys/openpgp-keys-teemutoivola/Manifest create mode 100644 sec-keys/openpgp-keys-teemutoivola/metadata.xml create mode 100644 sec-keys/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild diff --git a/app-crypt/openpgp-keys-teemutoivola/Manifest b/app-crypt/openpgp-keys-teemutoivola/Manifest deleted file mode 100644 index 3e3bb8afd069..000000000000 --- a/app-crypt/openpgp-keys-teemutoivola/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openpgp-keys-teemutoivola-20210426-23EF1DD76E65248FB055201ADAFE84E63D140114.asc 3907 BLAKE2B 13e089c7a6f0fdc652e77bd5d201b49687952626644896f152ecf895cff05061a1cee9e07fb22e7b95d2d0e932c8723c321adf1a856528fbe6c8bf30ba80f64d SHA512 898614a9d2e0d20617b93a86de65681f66b1ee0b61108bd2545a5ca59c04f84ce4308b73596ccae241a5534067c1b390f7898d8a4401cd0abcd23a3f5139b95c diff --git a/app-crypt/openpgp-keys-teemutoivola/metadata.xml b/app-crypt/openpgp-keys-teemutoivola/metadata.xml deleted file mode 100644 index 7efb31b9e7f2..000000000000 --- a/app-crypt/openpgp-keys-teemutoivola/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - sam@gentoo.org - Sam James - - - diff --git a/app-crypt/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild b/app-crypt/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild deleted file mode 100644 index 19147d4642bb..000000000000 --- a/app-crypt/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OpenPGP keys used by Teemu Toivola" -HOMEPAGE="https://humdi.net/" -SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-23EF1DD76E65248FB055201ADAFE84E63D140114.asc" -S="${WORKDIR}" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -src_install() { - local files=( - ${P}-23EF1DD76E65248FB055201ADAFE84E63D140114.asc - ) - - insinto /usr/share/openpgp-keys - newins - teemutoivola.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) -} diff --git a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild index d66538eaedb0..d02d852bedfd 100644 --- a/net-analyzer/vnstat/vnstat-1.17-r1.ebuild +++ b/net-analyzer/vnstat/vnstat-1.17-r1.ebuild @@ -25,7 +25,7 @@ DEPEND=" RDEPEND+=" acct-group/vnstat acct-user/vnstat selinux? ( sec-policy/selinux-vnstatd )" -BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" src_prepare() { default diff --git a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild index 828e302eae17..ab8be1d07e6c 100644 --- a/net-analyzer/vnstat/vnstat-2.6-r1.ebuild +++ b/net-analyzer/vnstat/vnstat-2.6-r1.ebuild @@ -20,7 +20,7 @@ else KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" - BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" fi LICENSE="GPL-2" diff --git a/net-analyzer/vnstat/vnstat-2.7.ebuild b/net-analyzer/vnstat/vnstat-2.7.ebuild index 5798621a7601..b596f789e0c9 100644 --- a/net-analyzer/vnstat/vnstat-2.7.ebuild +++ b/net-analyzer/vnstat/vnstat-2.7.ebuild @@ -20,7 +20,7 @@ else KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" - BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" fi LICENSE="GPL-2" diff --git a/net-analyzer/vnstat/vnstat-2.8.ebuild b/net-analyzer/vnstat/vnstat-2.8.ebuild index 5798621a7601..b596f789e0c9 100644 --- a/net-analyzer/vnstat/vnstat-2.8.ebuild +++ b/net-analyzer/vnstat/vnstat-2.8.ebuild @@ -20,7 +20,7 @@ else KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" - BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" fi LICENSE="GPL-2" diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 02ba926a4b8b..407176bb06b7 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -20,7 +20,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" - BDEPEND="verify-sig? ( app-crypt/openpgp-keys-teemutoivola )" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" fi LICENSE="GPL-2" diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 73ccfc4b28b9..e5e2bfd80fc0 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -26,3 +26,4 @@ move app-crypt/openpgp-keys-openzfs sec-keys/openpgp-keys-openzfs move app-crypt/openpgp-keys-python sec-keys/openpgp-keys-python move app-crypt/openpgp-keys-rust sec-keys/openpgp-keys-rust move app-crypt/openpgp-keys-tcpdump sec-keys/openpgp-keys-tcpdump +move app-crypt/openpgp-keys-teemutoivola sec-keys/openpgp-keys-teemutoivola diff --git a/sec-keys/openpgp-keys-teemutoivola/Manifest b/sec-keys/openpgp-keys-teemutoivola/Manifest new file mode 100644 index 000000000000..3e3bb8afd069 --- /dev/null +++ b/sec-keys/openpgp-keys-teemutoivola/Manifest @@ -0,0 +1 @@ +DIST openpgp-keys-teemutoivola-20210426-23EF1DD76E65248FB055201ADAFE84E63D140114.asc 3907 BLAKE2B 13e089c7a6f0fdc652e77bd5d201b49687952626644896f152ecf895cff05061a1cee9e07fb22e7b95d2d0e932c8723c321adf1a856528fbe6c8bf30ba80f64d SHA512 898614a9d2e0d20617b93a86de65681f66b1ee0b61108bd2545a5ca59c04f84ce4308b73596ccae241a5534067c1b390f7898d8a4401cd0abcd23a3f5139b95c diff --git a/sec-keys/openpgp-keys-teemutoivola/metadata.xml b/sec-keys/openpgp-keys-teemutoivola/metadata.xml new file mode 100644 index 000000000000..7efb31b9e7f2 --- /dev/null +++ b/sec-keys/openpgp-keys-teemutoivola/metadata.xml @@ -0,0 +1,9 @@ + + + + + sam@gentoo.org + Sam James + + + diff --git a/sec-keys/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild b/sec-keys/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild new file mode 100644 index 000000000000..19147d4642bb --- /dev/null +++ b/sec-keys/openpgp-keys-teemutoivola/openpgp-keys-teemutoivola-20210426.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="OpenPGP keys used by Teemu Toivola" +HOMEPAGE="https://humdi.net/" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-23EF1DD76E65248FB055201ADAFE84E63D140114.asc" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +src_install() { + local files=( + ${P}-23EF1DD76E65248FB055201ADAFE84E63D140114.asc + ) + + insinto /usr/share/openpgp-keys + newins - teemutoivola.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} -- cgit v1.2.3-65-gdbad