From 35a714d90af04df573786ce35f5501ee5e7c11ba Mon Sep 17 00:00:00 2001 From: Alexey Zapparov Date: Sun, 2 Jan 2022 16:45:32 +0100 Subject: [PATCH 1/6] dev-ruby/ruby-install: fix 0.8.3-r2 Fix Makefile's version to include Gentoo ebuild revision. Closes: https://bugs.gentoo.org/830341 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alexey Zapparov --- ...tall-0.8.3-r1.ebuild => ruby-install-0.8.3-r2.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename dev-ruby/ruby-install/{ruby-install-0.8.3-r1.ebuild => ruby-install-0.8.3-r2.ebuild} (81%) diff --git a/dev-ruby/ruby-install/ruby-install-0.8.3-r1.ebuild b/dev-ruby/ruby-install/ruby-install-0.8.3-r2.ebuild similarity index 81% rename from dev-ruby/ruby-install/ruby-install-0.8.3-r1.ebuild rename to dev-ruby/ruby-install/ruby-install-0.8.3-r2.ebuild index 1c97407cc1..46ccb1fad3 100644 --- a/dev-ruby/ruby-install/ruby-install-0.8.3-r1.ebuild +++ b/dev-ruby/ruby-install/ruby-install-0.8.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,6 +31,13 @@ src_test() { emake test } +src_prepare() { + default + + sed -i Makefile -e "s/^VERSION=.\+$/VERSION=${PVR}/" \ + || die "Cannot fix doc location to follow Gentoo/FHS guidelines" +} + src_install() { emake DESTDIR="${D}" PREFIX="/usr" install } From 9bcd75510ec55837729942ea10c8065fd1df5280 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 2 Jan 2022 23:25:36 +0500 Subject: [PATCH 2/6] net-misc/gmid: fix live Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/gmid/gmid-1.7.5.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net-misc/gmid/gmid-1.7.5.ebuild b/net-misc/gmid/gmid-1.7.5.ebuild index eb001b79ed..b2b7a3d778 100644 --- a/net-misc/gmid/gmid-1.7.5.ebuild +++ b/net-misc/gmid/gmid-1.7.5.ebuild @@ -33,12 +33,14 @@ DEPEND=" dev-libs/libretls dev-libs/openssl:= " +RDEPEND="${DEPEND}" BDEPEND=" virtual/pkgconfig virtual/yacc - verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) ) " -RDEPEND="${DEPEND}" +if [[ ${PV} != 9999 ]]; then + BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" +fi VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" From 6d004e2fb1dfe0d000aa58389750b537a1858315 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 2 Jan 2022 19:48:40 +0100 Subject: [PATCH 3/6] sec-keys/signify-keys-gmid: add metadata file Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- sec-keys/signify-keys-gmid/metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sec-keys/signify-keys-gmid/metadata.xml diff --git a/sec-keys/signify-keys-gmid/metadata.xml b/sec-keys/signify-keys-gmid/metadata.xml new file mode 100644 index 0000000000..51d94e1dc9 --- /dev/null +++ b/sec-keys/signify-keys-gmid/metadata.xml @@ -0,0 +1,5 @@ + + + + + From 7cf84fe448218cb9c882f0ffdbb93946637fe612 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 2 Jan 2022 19:49:39 +0100 Subject: [PATCH 4/6] sec-keys/signify-keys-telescope: add metadata.xml Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- sec-keys/signify-keys-telescope/metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sec-keys/signify-keys-telescope/metadata.xml diff --git a/sec-keys/signify-keys-telescope/metadata.xml b/sec-keys/signify-keys-telescope/metadata.xml new file mode 100644 index 0000000000..51d94e1dc9 --- /dev/null +++ b/sec-keys/signify-keys-telescope/metadata.xml @@ -0,0 +1,5 @@ + + + + + From c7e86bf9490760d5201c01e0684321081e2a6784 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 2 Jan 2022 19:50:36 +0100 Subject: [PATCH 5/6] dev-python/iuliia: remove non-ASCII character Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- dev-python/iuliia/iuliia-0.11.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/iuliia/iuliia-0.11.4.ebuild b/dev-python/iuliia/iuliia-0.11.4.ebuild index 1eaba52452..09e4665e27 100644 --- a/dev-python/iuliia/iuliia-0.11.4.ebuild +++ b/dev-python/iuliia/iuliia-0.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 ) DISTUTILS_USE_SETUPTOOLS="pyproject.toml" inherit distutils-r1 -DESCRIPTION="Transliterate Cyrillic → Latin in every possible way" +DESCRIPTION="Transliterate Cyrillic to Latin in every possible way" HOMEPAGE=" https://dangry.ru/iuliia/ https://pypi.org/project/iuliia From cd6dae7dc65bafc383593d90c9682296b0f41d6e Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 2 Jan 2022 19:51:18 +0100 Subject: [PATCH 6/6] sec-keys/openpgp-keys-skyjake: remove non-ASCII character Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- .../openpgp-keys-skyjake/openpgp-keys-skyjake-20211224.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sec-keys/openpgp-keys-skyjake/openpgp-keys-skyjake-20211224.ebuild b/sec-keys/openpgp-keys-skyjake/openpgp-keys-skyjake-20211224.ebuild index 8a0f991da3..50783f0f2b 100644 --- a/sec-keys/openpgp-keys-skyjake/openpgp-keys-skyjake-20211224.ebuild +++ b/sec-keys/openpgp-keys-skyjake/openpgp-keys-skyjake-20211224.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_PN="${PN#openpgp-key-}" -DESCRIPTION="OpenPGP keys used by Jaakko Keränen" +DESCRIPTION="OpenPGP keys used by Jaakko Keranen" HOMEPAGE="https://gmi.skyjake.fi" SRC_URI="https://gmi.skyjake.fi/pgp_public_key.txt -> ${P}.asc" S="${WORKDIR}"