summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/analog/analog-6.0.13.ebuild6
-rw-r--r--app-backup/duply/duply-2.3.1.ebuild4
-rw-r--r--app-crypt/osslsigncode/Manifest5
-rw-r--r--app-crypt/osslsigncode/metadata.xml1
-rw-r--r--app-crypt/osslsigncode/osslsigncode-2.0.ebuild4
-rw-r--r--app-crypt/osslsigncode/osslsigncode-2.5.ebuild58
-rw-r--r--app-misc/jpipe/jpipe-0.2.0-r1.ebuild2
-rw-r--r--app-text/fbreader/fbreader-0.99.4-r6.ebuild4
-rw-r--r--dev-db/mysql/mysql-5.7.36-r1.ebuild8
-rw-r--r--dev-db/mysql/mysql-8.0.27.ebuild8
-rw-r--r--dev-java/janino/janino-3.1.7.ebuild2
-rw-r--r--dev-libs/eventlog/eventlog-0.2.12.ebuild4
-rw-r--r--dev-libs/xbyak/metadata.xml9
-rw-r--r--dev-libs/xbyak/xbyak-5.73.ebuild4
-rw-r--r--dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild4
-rw-r--r--dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild2
-rw-r--r--dev-scheme/owl-lisp/owl-lisp-0.2.ebuild2
-rw-r--r--dev-scheme/owl-lisp/owl-lisp-9999.ebuild2
-rw-r--r--dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild2
-rw-r--r--dev-tcltk/tkimg/tkimg-1.4.9.ebuild4
-rw-r--r--dev-tcltk/tklib/tklib-0.6-r2.ebuild4
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild2
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild2
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild2
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild2
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild2
-rw-r--r--dev-util/packer/packer-1.7.10.ebuild4
-rw-r--r--games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild4
-rw-r--r--games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild2
-rw-r--r--games-puzzle/gnurobbo/gnurobbo-0.68.ebuild4
-rw-r--r--mail-filter/policyd/policyd-1.82-r4.ebuild2
-rw-r--r--media-fonts/ahem/ahem-1.0.ebuild2
-rw-r--r--media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild4
-rw-r--r--media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild4
-rw-r--r--media-plugins/vdr-undelete/Manifest2
-rw-r--r--media-plugins/vdr-undelete/vdr-undelete-2.3.1_pre1.ebuild (renamed from media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild)7
-rw-r--r--media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild4
-rw-r--r--media-sound/cd-discid/cd-discid-1.4-r1.ebuild2
-rw-r--r--media-sound/gmpc/gmpc-11.8.16-r2.ebuild4
-rw-r--r--media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild4
-rw-r--r--media-video/vdr/vdr-2.4.7-r1.ebuild2
-rw-r--r--net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild4
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.43.ebuild2
-rw-r--r--net-analyzer/zabbix/zabbix-4.0.44.ebuild2
-rw-r--r--net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild2
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild4
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild4
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild4
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild2
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild4
-rw-r--r--net-misc/drive/drive-0.4.0_p20210208.ebuild2
-rw-r--r--net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild2
-rw-r--r--net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild2
-rw-r--r--net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild2
-rw-r--r--net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild2
-rw-r--r--net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild2
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild2
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild2
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild2
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-0.21.0.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-0.21.1.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-21.2.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-22.0.ebuild2
-rw-r--r--net-p2p/deluge/deluge-2.0.5-r2.ebuild2
-rw-r--r--net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild2
-rw-r--r--sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild4
-rw-r--r--sci-libs/p4est/Manifest2
-rw-r--r--sci-libs/p4est/files/p4est-2.8-fix_build_system.patch (renamed from sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch)0
-rw-r--r--sci-libs/p4est/files/p4est-2.8-set_version.patch (renamed from sci-libs/p4est/files/p4est-2.8.0-set_version.patch)0
-rw-r--r--sci-libs/p4est/p4est-2.8-r1.ebuild (renamed from sci-libs/p4est/p4est-2.8.0-r1.ebuild)2
-rw-r--r--sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild4
-rw-r--r--sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild2
-rw-r--r--sys-cluster/torque/torque-6.0.4-r2.ebuild3
-rw-r--r--sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild4
-rw-r--r--sys-process/numad/numad-0.5-r3.ebuild4
-rw-r--r--sys-process/numad/numad-0.5-r4.ebuild2
-rw-r--r--sys-process/numad/numad-9999.ebuild2
-rw-r--r--x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild4
84 files changed, 189 insertions, 124 deletions
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 1fff147bc6ce..55d754de8956 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
-MY_P="${PN}-src-6013ce"
+MY_P="${PN}-src-${PV//.}ce"
DESCRIPTION="A webserver log analyzer"
HOMEPAGE="https://www.c-amie.co.uk/software/analog/"
-SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"
+SRC_URI="http://www.c-amie.co.uk/static/analog/${PV//.}/${MY_P}.zip"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-backup/duply/duply-2.3.1.ebuild b/app-backup/duply/duply-2.3.1.ebuild
index 68e3ae211d57..0fbf1c602199 100644
--- a/app-backup/duply/duply-2.3.1.ebuild
+++ b/app-backup/duply/duply-2.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A shell frontend for duplicity"
HOMEPAGE="https://duply.net"
-SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/2.3.x/${PN}_${PV}.tgz"
+SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%20duplicity%29/$(ver_cut 1-2).x/${PN}_${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 17caabdcebcf..18c0414964e8 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1 +1,6 @@
DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
+DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
+DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
+DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
+DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 8a5edfb125c9..7c529bd10048 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -4,5 +4,6 @@
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">osslsigncode</remote-id>
+ <remote-id type="github">mtrojnar/osslsigncode</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
index 5f3e86ad8cc5..a00e248085ce 100644
--- a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools
DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
new file mode 100644
index 000000000000..3b1e4827338d
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
+
+for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+ SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
+done
+unset test_file
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/openssl:=
+ curl? ( net-misc/curl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if use test ; then
+ local test_file
+ for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
+ cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
+ done
+ unset test_file
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package curl CURL)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cmake_src_test -j1
+}
diff --git a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
index af7dafc3fcb3..1043ced048d3 100644
--- a/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
+++ b/app-misc/jpipe/jpipe-0.2.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit go-module distutils-r1
DESCRIPTION="Command line interface to JMESPath"
HOMEPAGE="https://github.com/pipebus/jpipe https://github.com/jmespath/jp/pull/30 http://jmespath.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- !python? ( https://dev.gentoo.org/~zmedico/dist/jpipe-0.2.0-deps.tar.xz )"
+ !python? ( https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz )"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
diff --git a/app-text/fbreader/fbreader-0.99.4-r6.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
index 5ab017db26e5..7b1a9042d69d 100644
--- a/app-text/fbreader/fbreader-0.99.4-r6.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit qmake-utils toolchain-funcs xdg
DESCRIPTION="E-Book Reader. Supports many e-book formats"
HOMEPAGE="https://www.fbreader.org/"
SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz
- https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch"
+ https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-combined.patch"
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-db/mysql/mysql-5.7.36-r1.ebuild b/dev-db/mysql/mysql-5.7.36-r1.ebuild
index ee5bc3f04468..2e9a483d39a9 100644
--- a/dev-db/mysql/mysql-5.7.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.36-r1.ebuild
@@ -9,11 +9,11 @@ inherit check-reqs cmake flag-o-matic linux-info \
multiprocessing prefix toolchain-funcs multilib-minimal
# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-5.7.36-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${P}-patches-01.tar.xz"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
- https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
- http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/${PN}-boost-${PV}.tar.gz
+ https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz
+ http://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${PV}.tar.gz
${PATCH_SET}"
HOMEPAGE="https://www.mysql.com/"
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index 18dda6ee1678..d90e79f15aa5 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -12,11 +12,11 @@ MY_PV="${PV//_pre*}"
MY_P="${PN}-${MY_PV}"
# Patch version
-PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${PN}-8.0.27-patches-03.tar.xz )
+PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${P}-patches-03.tar.xz )
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
- https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
- http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
+ https://cdn.mysql.com/archives/mysql-$(ver_cut 1-2)/mysql-boost-${MY_PV}.tar.gz
+ http://downloads.mysql.com/archives/MySQL-$(ver_cut 1-2)/${PN}-boost-${MY_PV}.tar.gz
${PATCH_SET[@]}"
HOMEPAGE="https://www.mysql.com/"
diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild
index 46f3e8c96ec4..b0fbd7ad85b3 100644
--- a/dev-java/janino/janino-3.1.7.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="An embedded compiler for run-time compilation purposes"
HOMEPAGE="https://janino-compiler.github.io/janino/"
-SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 528c481f39e5..63c44c31efbd 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit libtool
DESCRIPTION="Support library for syslog-ng"
HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar.gz"
+SRC_URI="http://www.balabit.com/downloads/files/eventlog/$(ver_cut 1-2)/eventlog_${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-libs/xbyak/metadata.xml b/dev-libs/xbyak/metadata.xml
index 1b142c23f268..afe279a31d30 100644
--- a/dev-libs/xbyak/metadata.xml
+++ b/dev-libs/xbyak/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-</maintainer>
+ <maintainer type="person">
+ <email>zx2c4@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">herumi/xbyak</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-libs/xbyak/xbyak-5.73.ebuild b/dev-libs/xbyak/xbyak-5.73.ebuild
index 4cfd5772e810..751793158e94 100644
--- a/dev-libs/xbyak/xbyak-5.73.ebuild
+++ b/dev-libs/xbyak/xbyak-5.73.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="JIT assembler for x86(IA-32)/x64(AMD64, x86-64)"
HOMEPAGE="https://github.com/herumi/xbyak"
-SRC_URI="https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/herumi/xbyak/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
index e93e6a8a10b0..91671fbd91d6 100644
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ MY_PN="Autoload"
DESCRIPTION="PHP Autoload Builder"
HOMEPAGE="https://github.com/theseer/Autoload"
-SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
index 52b294df2d92..031baed90541 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
# internal copy of pycxx highly patched
diff --git a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
index 0ea693d0dc04..05adcbd2ae8e 100644
--- a/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-0.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
else
- SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+ SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/owl-v${PV}"
fi
diff --git a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
index cae7c2bb43c6..551dda855179 100644
--- a/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
+++ b/dev-scheme/owl-lisp/owl-lisp-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/owl-lisp/owl.git"
else
- SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v0.2/owl-v${PV}.tar.gz"
+ SRC_URI="https://gitlab.com/owl-lisp/owl/-/archive/v${PV}/owl-v${PV}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}/owl-v${PV}"
fi
diff --git a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
index 1c0e9a4c3422..db7ad94098e9 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.13-r1.ebuild
@@ -9,7 +9,7 @@ MYP=Img-${PV}-Source
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
LICENSE="BSD"
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index f021bfd25d40..efd7538c429b 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ MYP=Img-${PV}-Source
DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
+SRC_URI="mirror://sourceforge/${PN}/${PN}/$(ver_cut 1-2)/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
LICENSE="BSD"
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
index d1240d9ba41d..09f72a4a67e0 100644
--- a/dev-tcltk/tklib/tklib-0.6-r2.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
HOMEPAGE="http://www.tcl.tk/software/tklib"
-SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+SRC_URI="http://core.tcl.tk/tklib/raw/${P}.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
index 5ee8e0089dbc..e112dc6a8e41 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
index 4225b882677b..eba9ff93c5e7 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
index c4020b7738c6..c7ebffda8f7d 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
index 5f36a5d39e78..ebfc9e5de376 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
- https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
index 7f6a574275ff..9c3c211276ed 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line Bitcoin transaction tool"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/dev-util/packer/packer-1.7.10.ebuild b/dev-util/packer/packer-1.7.10.ebuild
index 2805c0f9c87d..2fe313cded4e 100644
--- a/dev-util/packer/packer-1.7.10.ebuild
+++ b/dev-util/packer/packer-1.7.10.ebuild
@@ -5,12 +5,10 @@ EAPI=7
inherit go-module
-go-module_set_globals
-
DESCRIPTION="A tool to create identical machine images for multiple platforms"
HOMEPAGE="https://www.packer.io"
SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://gentoofiles.s3.eu-central-1.amazonaws.com/packer-1.7.10-deps.tar.xz"
+ https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz"
LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
SLOT="0"
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
index fb1eb3bc1e45..14a3a044c3ce 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit cmake
DESCRIPTION="A simple volleyball game"
HOMEPAGE="http://slime.tuxfamily.org/index.php"
-SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"
+SRC_URI="http://downloads.tuxfamily.org/slime/v${PV//.}/${PN}_${PV}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
index c782b4a45d52..847e5ae74193 100644
--- a/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
+++ b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git"
else
- SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/0.9.4.tar.gz -> ${MY_P}.tar.gz"
+ SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/$(ver_cut 1-3).tar.gz -> ${MY_P}.tar.gz"
KEYWORDS="~amd64"
S="${WORKDIR}"/${MY_PN}-0.9.4
fi
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
index 2d1ba0468719..999c90a4bee9 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux"
HOMEPAGE="http://gnurobbo.sourceforge.net/"
SRC_URI="
mirror://sourceforge/gnurobbo/${P}-source.tar.gz
- https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch
+ https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/$(ver_cut 1-2)+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> ${P}-single-variable-declarations.patch
"
LICENSE="GPL-2 BitstreamVera"
diff --git a/mail-filter/policyd/policyd-1.82-r4.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild
index c4c0e75853d5..a589b431e0d4 100644
--- a/mail-filter/policyd/policyd-1.82-r4.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r4.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
DESCRIPTION="Policy daemon for postfix and other MTAs"
HOMEPAGE="https://wiki.policyd.org"
-SRC_URI="https://download.policyd.org/v1.82/${P}.tar.gz"
+SRC_URI="https://download.policyd.org/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/media-fonts/ahem/ahem-1.0.ebuild b/media-fonts/ahem/ahem-1.0.ebuild
index 1b9507c51b8d..5e6cafc979ce 100644
--- a/media-fonts/ahem/ahem-1.0.ebuild
+++ b/media-fonts/ahem/ahem-1.0.ebuild
@@ -7,7 +7,7 @@ inherit font
DESCRIPTION="Font to help test writers develop predictable tests"
HOMEPAGE="https://github.com/Kozea/Ahem"
-SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Kozea/Ahem/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/a/A}"
LICENSE="CC0-1.0"
diff --git a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
index 58bc74e7206c..275f4e2043fd 100644
--- a/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
+++ b/media-plugins/gmpc-alarm/gmpc-alarm-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="This plugin can start/stop/pause your music at a preset time"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_ALARM"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
index 6731fe7d5127..9b93b17445a6 100644
--- a/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
+++ b/media-plugins/gmpc-albumview/gmpc-albumview-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="This plugin shows your music collection in albums"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_ALBUMVIEW"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
index e5cad496caa7..dde51a38c1c5 100644
--- a/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
+++ b/media-plugins/gmpc-avahi/gmpc-avahi-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="This plugin discovers avahi enabled mpd servers"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_AVAHI"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
index d35d58a72fcf..79cb3b0ded83 100644
--- a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
+++ b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
DESCRIPTION="This plugin integrates GMPC with the Avant Window Navigator"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_AWN"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
index 62adbfa82893..18032061e067 100644
--- a/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
+++ b/media-plugins/gmpc-jamendo/gmpc-jamendo-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Plugin allows you to browse and preview music available on jamendo"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_JAMENDO"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
index db8aec1c12b2..921a0b459e20 100644
--- a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
+++ b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-11.8.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="This plugin uses lyricwiki to fetch lyrics"
HOMEPAGE="https://gmpc.fandom.com/wiki/GMPC_PLUGIN_LYRICWIKI"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
index 7fbd9431c4b9..8908ddc9ad34 100644
--- a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
+++ b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-11.8.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit vala
DESCRIPTION="Bind multimedia keys via gnome settings daemon"
HOMEPAGE="https://gmpc.fandom.com/wiki/Plugins"
-SRC_URI="https://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="https://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
diff --git a/media-plugins/vdr-undelete/Manifest b/media-plugins/vdr-undelete/Manifest
index ac8af1354afa..e9420a7a8afb 100644
--- a/media-plugins/vdr-undelete/Manifest
+++ b/media-plugins/vdr-undelete/Manifest
@@ -1,2 +1,2 @@
DIST vdr-undelete-0.0.7.tgz 34655 BLAKE2B 81f40ad993d06386112ef46c3ba1c1402211c2ec2138aa113dfe8376340416097a691e7b5f4c4fee24e85e7a0b5c16501dc6853374c3e8b27e0a84437dcb0f74 SHA512 c4d634580d91c3d3601767bb29cfe12e0bd13f9d8fd5bab31a3388db1f8724544b371b4ba333cd524aa5243554015517f487f6e8f2de31bd747f1094ba1c84ff
-DIST vdr-undelete-2.3.0_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
+DIST vdr-undelete-2.3.1_pre1.tgz 13865 BLAKE2B 065550c0c6aa150677550450f458db496ac55e6ad1b8024de22abca37093259adfdd6ffc7b9c07a66e76df573c3c1d4d69920bcf56872406234a4898f99021d2 SHA512 3200efcbd2eec5ef04d66fcf9dbbd1973ef7488a332618a6d2f5dc4bc20323e2b88746f02883e9488436b32f21aea2fb60e7e675e247af392ee121423af4b878
diff --git a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild b/media-plugins/vdr-undelete/vdr-undelete-2.3.1_pre1.ebuild
index 7ea4ea0b4a86..a1c810f690c9 100644
--- a/media-plugins/vdr-undelete/vdr-undelete-2.3.0_pre1.ebuild
+++ b/media-plugins/vdr-undelete/vdr-undelete-2.3.1_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,12 +7,11 @@ inherit vdr-plugin-2
DESCRIPTION="VDR Plugin: Recover deleted recordings of VDR"
HOMEPAGE="http://phivdr.dyndns.org/vdr/"
-SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> ${P}.tgz"
+SRC_URI="http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-${PV/_pre/-pre}.tgz -> ${P}.tgz"
+S="${WORKDIR}"/${PN}-${PV/_pre/-pre}
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="amd64 ~arm x86"
DEPEND="media-video/vdr"
-
-S="${WORKDIR}/undelete-2.3.1-pre1"
diff --git a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild b/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
index 093b8a90f1aa..86d6659ed388 100644
--- a/media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
+++ b/media-plugins/zam-plugins/zam-plugins-3.14-r1.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
@@ -8,7 +8,7 @@ DPF_P="DPF-${DPF_COMMIT}"
DESCRIPTION="Collection of LV2/LADSPA/VST/JACK audio plugins for high quality processing"
HOMEPAGE="http://www.zamaudio.com/ https://github.com/zamaudio/zam-plugins"
-SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/3.14.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/zamaudio/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/DISTRHO/DPF/archive/${DPF_COMMIT}.tar.gz -> ${DPF_P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
index be503d716c86..e92d35bd7102 100644
--- a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
+++ b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
HOMEPAGE="https://github.com/taem/cd-discid"
-SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taem/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-upstream-${PV}"
LICENSE="GPL-2"
diff --git a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild b/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
index 911dcb5e0a5a..26780928182f 100644
--- a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit autotools vala xdg
DESCRIPTION="A GTK+2 client for the Music Player Daemon"
HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
index 637e4c6bad13..f08f749298c0 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
HOMEPAGE="http://www.ivtvdriver.org/"
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/1.4.x/${P}.tar.gz"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
index 992581e9e7e2..a7db9e18f489 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic strip-linguas toolchain-funcs
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> ${P}.tbz2
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2
mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index a96afb76f58e..fe3dd350d447 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="A Tool for analyzing network packet dumps"
HOMEPAGE="http://www.tcptrace.org/"
SRC_URI="
http://www.tcptrace.org/download/${P/_p*}.tar.gz
- http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
+ http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz
mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
"
diff --git a/net-analyzer/zabbix/zabbix-4.0.43.ebuild b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
index b6f830af64d9..8436fd2d7b37 100644
--- a/net-analyzer/zabbix/zabbix-4.0.43.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
HOMEPAGE="https://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-4.0.44.ebuild b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
index 1e0af68937f8..b24c08490b7a 100644
--- a/net-analyzer/zabbix/zabbix-4.0.44.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
HOMEPAGE="https://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 2491cc61317b..217f9c0703cc 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="A ZNC module which provides client specific buffers"
HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer"
-SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
index 7a0ea42117b5..ce497ba3df66 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
index 7f080957ecf4..e977b9486557 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
index e88ab219ffae..f152ca146cdb 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
index 2fa948c0c2f8..7ab55f50ba8f 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
- https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
index a0b6796e935b..1a956bd0c44a 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Bitcoin Core consensus library"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-misc/drive/drive-0.4.0_p20210208.ebuild b/net-misc/drive/drive-0.4.0_p20210208.ebuild
index 0e830cdd3de4..8430cba30ee6 100644
--- a/net-misc/drive/drive-0.4.0_p20210208.ebuild
+++ b/net-misc/drive/drive-0.4.0_p20210208.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Google Drive client for the commandline"
HOMEPAGE="https://github.com/odeke-em/drive"
EGIT_COMMIT="bede608f250a9333d55c43396fc5e72827e806fd"
SRC_URI="https://github.com/odeke-em/drive/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/drive-0.4.0_p20210208-deps.tar.xz"
+ https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
KEYWORDS="amd64"
LICENSE="Apache-2.0 BSD MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
index 0d0b3da5862a..573e29aedb9b 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.20.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
index 113fb8d8b046..74c885b4f4dc 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
index e87439f533d4..a79ddadfe6a8 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.21.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
index 64860f8f90a8..009bb9330bba 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-21.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
- https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
index 13129ac9d061..1fb7fd08c62f 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-22.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
index 758d084787aa..75b9007e2706 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
index a746f5216fe3..de71c4269920 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
index a223b7c13eb9..6f24b1ba161e 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-21.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
- https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
index f4d6aa690672..2cac510fe6e8 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
index 70bebb6cd408..2d24cac58585 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
index 56d810b91a5a..421be18661fa 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-21.2.ebuild b/net-p2p/bitcoind/bitcoind-21.2.ebuild
index dff2239e6a07..f986861dc036 100644
--- a/net-p2p/bitcoind/bitcoind-21.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-21.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
- https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/bitcoind/bitcoind-22.0.ebuild b/net-p2p/bitcoind/bitcoind-22.0.ebuild
index df9b06d5f7a8..510d66a3ecf4 100644
--- a/net-p2p/bitcoind/bitcoind-22.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
SRC_URI="
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
- https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+ https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
diff --git a/net-p2p/deluge/deluge-2.0.5-r2.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
index cb1b052dce3e..f7144d94500d 100644
--- a/net-p2p/deluge/deluge-2.0.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
else
- SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+ SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
fi
diff --git a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
index cc101b866c2f..133bf26371ba 100644
--- a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
+++ b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.5.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="haproxy dataplane api / sidecar"
HOMEPAGE="https://github.com/haproxytech/dataplaneapi https://www.haproxy.com/documentation/dataplaneapi/latest/"
SRC_URI="https://github.com/haproxytech/dataplaneapi/archive/v${PV}.tar.gz -> ${P}.tar.gz
- http://gentooexperimental.org/~patrick/haproxy-dataplaneapi-2.5.1-deps.tar.xz"
+ http://gentooexperimental.org/~patrick/${P}-deps.tar.xz"
LICENSE="BSD"
SLOT="0"
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
index 05e25ec750e9..359aa98a784f 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit autotools wxwidgets
DESCRIPTION="A phylogenetic tree viewer"
HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
-SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz"
+SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/$(ver_cut 1-2)/tv-${PV}.tar.gz"
S="${WORKDIR}/tv-${PV}"
LICENSE="GPL-2"
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index c847cfadd1f3..13b4e1e65938 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -2,4 +2,4 @@ DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030c
DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd
-DIST p4est-2.8.0.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
+DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
diff --git a/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch
index e1f86165d5f9..e1f86165d5f9 100644
--- a/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch
+++ b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch
diff --git a/sci-libs/p4est/files/p4est-2.8.0-set_version.patch b/sci-libs/p4est/files/p4est-2.8-set_version.patch
index b24f265f496b..b24f265f496b 100644
--- a/sci-libs/p4est/files/p4est-2.8.0-set_version.patch
+++ b/sci-libs/p4est/files/p4est-2.8-set_version.patch
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8-r1.ebuild
index 177d7985ea02..10b3de8b3e22 100644
--- a/sci-libs/p4est/p4est-2.8.0-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.8-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_BRANCH="develop"
SRC_URI=""
else
- SRC_URI="https://github.com/cburstedde/${PN}/archive/v2.8.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
index f2e494821062..5f4924c68569 100644
--- a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
+++ b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.604.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ MY_PV="${PV//./-}"
DESCRIPTION="Mathematics software for geometry"
HOMEPAGE="https://www.geogebra.org"
-SRC_URI="https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
+SRC_URI="https://download.geogebra.org/installers/$(ver_cut 1-2)/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
diff --git a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
index 3749e86ddc99..5b2e1ae220d4 100644
--- a/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
+++ b/sci-mathematics/geogebra-bin/geogebra-bin-5.0.683.0.ebuild
@@ -9,7 +9,7 @@ MY_PV="${PV//./-}"
DESCRIPTION="Mathematics software for geometry"
HOMEPAGE="https://www.geogebra.org"
-SRC_URI="https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
+SRC_URI="https://download.geogebra.org/installers/$(ver_cut 1-2)/GeoGebra-Linux-Portable-${MY_PV}.tar.bz2
https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg"
LICENSE="Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )"
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index 9019fab049ec..b3886f93053d 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -3,11 +3,12 @@
EAPI=8
+MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
inherit autotools flag-o-matic linux-info toolchain-funcs
DESCRIPTION="Resource manager and queuing system based on OpenPBS"
HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
-SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz
+SRC_URI="https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
diff --git a/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild b/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
index d9691a18fa89..a8d220c9a2d4 100644
--- a/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
+++ b/sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="tools for generating YAFFS images"
HOMEPAGE="https://code.google.com/p/yaffs2utils/"
-SRC_URI="https://yaffs2utils.googlecode.com/files/0.2.9.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://yaffs2utils.googlecode.com/files/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild
index e90c00f370ed..73daa2a98079 100644
--- a/sys-process/numad/numad-0.5-r3.ebuild
+++ b/sys-process/numad/numad-0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
- SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+ SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
KEYWORDS="amd64 -arm arm64 ~ppc64 ~s390 x86"
S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
fi
diff --git a/sys-process/numad/numad-0.5-r4.ebuild b/sys-process/numad/numad-0.5-r4.ebuild
index 33f98562b754..3c2d952864ec 100644
--- a/sys-process/numad/numad-0.5-r4.ebuild
+++ b/sys-process/numad/numad-0.5-r4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
- SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+ SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
fi
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index 61b74b22ad42..07607707eb3c 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
- SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
+ SRC_URI="mirror://gentoo/numad-${PV}-${EGIT_COMMIT:0:7}.tar.bz2"
KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
fi
diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
index 545945eeb9bd..5b3e0ecb73b5 100644
--- a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
+++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Menubar, doc and app bundle integration for GTK+"
HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration"
-SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz"
+SRC_URI="https://download.gnome.org/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"