diff --git a/Manual.md b/Manual.md
index 478a34be696ba7..9b354695b9819a 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1758,14 +1758,13 @@ installs its fonts
 <a id="pkg_rename"></a>
 ### Renaming a package
 
-- Create empty package of old name, depending on new package. This is
+- Create an empty subpackage of old name, depending on new package. This is
 necessary to provide updates to systems where old package is already
-installed. This should be a subpackage of new one, except when version
-number of new package decreased: then create a separate template using
-old version and increased revision.
+installed. This should be a subpackage of new one. When the version
+number of the transitional package decreases, add `reverts` entries to it.
+- append `" (transitional dummy package)"` to the package's `short_desc`.
 - Edit references to package in other templates and common/shlibs.
-- Don't set `replaces=`, it can result in removing both packages from
-systems by xbps.
+- Set `replaces="old-name>=0` on the new package.
 
 <a id="pkg_remove"></a>
 ### Removing a package
diff --git a/srcpkgs/7zip/template b/srcpkgs/7zip/template
index cd2435d2f9cb67..2b4229536d18af 100644
--- a/srcpkgs/7zip/template
+++ b/srcpkgs/7zip/template
@@ -1,7 +1,7 @@
 # Template file for '7zip'
 pkgname=7zip
 version=25.01
-revision=1
+revision=2
 short_desc="File archiver with a high compression ratio"
 maintainer="Roberto Ricci <io@r-ricci.it>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
@@ -14,6 +14,7 @@ alternatives="
  7z:7za:/usr/bin/7zip
  7z:7zr:/usr/bin/7zip
  7z:7zz:/usr/bin/7zip"
+replaces="p7zip>=0"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	# missing pthread_attr_setaffinity_np()
@@ -52,6 +53,7 @@ do_install() {
 	 7z:7za:/usr/bin/7zip-unrar
 	 7z:7zr:/usr/bin/7zip-unrar
 	 7z:7zz:/usr/bin/7zip-unrar"
+	replaces="p7zip-unrar>=0"
 
 	pkg_install() {
 		vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/rar/7zz" 7zip-unrar
@@ -61,7 +63,7 @@ do_install() {
 
 p7zip_package() {
 	metapackage=yes
-	depends=7zip
+	depends="7zip"
 	short_desc="Command-line version of the 7zip compressed file archive"
 	short_desc+=" (transitional dummy package)"
 }
diff --git a/srcpkgs/DisplayCAL/template b/srcpkgs/DisplayCAL/template
index 98d98695fa65c0..4ab867d13bc6ed 100644
--- a/srcpkgs/DisplayCAL/template
+++ b/srcpkgs/DisplayCAL/template
@@ -1,7 +1,7 @@
 # Template file for 'DisplayCAL'
 pkgname=DisplayCAL
 version=3.9.17
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel"
@@ -14,6 +14,7 @@ homepage="https://github.com/eoyilmaz/displaycal-py3"
 distfiles="https://github.com/eoyilmaz/displaycal-py3/archive/refs/tags/${version}.tar.gz"
 checksum=ddc84d7e2c6b4bbaf981d2a8fb99910d14fd39b89023de4fac824098eb567544
 make_check=no # checks fail to build
+replaces="dispcalGUI>=0"
 
 post_extract() {
 	# GitHub tarball misses VERSION file, PyPI tarball misses other bits
diff --git a/srcpkgs/EmulationStation-rpi b/srcpkgs/EmulationStation-rpi
new file mode 120000
index 00000000000000..d6ed3e45959928
--- /dev/null
+++ b/srcpkgs/EmulationStation-rpi
@@ -0,0 +1 @@
+EmulationStation
\ No newline at end of file
diff --git a/srcpkgs/EmulationStation-rpi/template b/srcpkgs/EmulationStation-rpi/template
deleted file mode 100644
index f114659c787c54..00000000000000
--- a/srcpkgs/EmulationStation-rpi/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'EmulationStation-rpi'
-pkgname=EmulationStation-rpi
-version=2.0.1a
-revision=4
-metapackage=yes
-archs="aarch64* armv6l* armv7l*"
-depends="EmulationStation"
-short_desc="A flexible emulator front-end - (transitional dummy package)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/Herdinger/EmulationStation"
diff --git a/srcpkgs/EmulationStation/template b/srcpkgs/EmulationStation/template
index 00c2ec8f944d3c..5c4c2ca126b638 100644
--- a/srcpkgs/EmulationStation/template
+++ b/srcpkgs/EmulationStation/template
@@ -1,7 +1,7 @@
 # Template file for 'EmulationStation'
 pkgname=EmulationStation
 version=2.9.4
-revision=1
+revision=2
 _pugixml_version=1.10
 create_wrksrc=yes
 build_style=cmake
@@ -17,6 +17,7 @@ distfiles="https://github.com/RetroPie/EmulationStation/archive/v${version}.tar.
  https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-${_pugixml_version}.tar.gz"
 checksum="79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a
  55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a"
+replaces="EmulationStation-rpi>=0"
 
 post_extract() {
 	mv EmulationStation-$version/* .
@@ -27,3 +28,9 @@ post_extract() {
 post_install() {
 	vlicense LICENSE.md
 }
+
+EmulationStation-rpi_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	metapackage=yes
+}
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 8ad7690c890d8d..3ac1fdc0006b45 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
 # Template file for 'Endeavour'
 pkgname=Endeavour
 version=43.0
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -16,12 +16,13 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
 distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/${version}/Endeavour-${version}.tar.gz"
 checksum=f5f442611f03b2471a522e976bfb156de36824b1ecf8c13a9b35a996f50670a3
+replaces="gnome-todo>=0"
 
 build_options="gir"
 build_options_default="gir"
 
 gnome-todo_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - transitional dummy package"
+	short_desc+=" (transitional dummy package)"
 	metapackage=yes
 }
diff --git a/srcpkgs/OpenCL-Headers/template b/srcpkgs/OpenCL-Headers/template
index 4d7942754e62aa..190e5778bd151d 100644
--- a/srcpkgs/OpenCL-Headers/template
+++ b/srcpkgs/OpenCL-Headers/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenCL-Headers'
 pkgname=OpenCL-Headers
 version=2025.07.22
-revision=1
+revision=2
 build_style=cmake
 short_desc="Khronos OpenCL (Open Computing Language) header files"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -10,7 +10,7 @@ homepage="https://github.com/KhronosGroup/OpenCL-Headers"
 distfiles="https://github.com/KhronosGroup/OpenCL-Headers/archive/v${version}.tar.gz"
 checksum=98f0a3ea26b4aec051e533cb1750db2998ab8e82eda97269ed6efe66ec94a240
 provides="opencl-headers-${version}_${revision}"
-replaces="opencl-headers>=0"
+replaces="opencl-headers>=0 opencl2-headers>=0"
 
 opencl2-headers_package() {
 	metapackage=yes
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index eac6f53540901c..c48e4ab185f26e 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,7 +1,7 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
 version=2.20.0
-revision=1
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3-setuptools python3-wheel python3-docutils
  python3-Jinja2 python3-yaml"
@@ -18,7 +18,7 @@ changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*
 distfiles="${PYPI_SITE}/a/ansible_core/ansible_core-${version}.tar.gz"
 checksum=cd73faf28a056c933bc1eee8f66ab597e7ec7309d42c8a6e5d6e4294c4a78b54
 conflicts="ansible<2.10.1_1"
-replaces="ansible-base<2.11.0_1"
+replaces="ansible-base>=0"
 
 do_check() {
 	# Test script is missing and exists to be in child of root
diff --git a/srcpkgs/antimicrox/template b/srcpkgs/antimicrox/template
index 677f7e654ae7ba..101d567c4f3fa6 100644
--- a/srcpkgs/antimicrox/template
+++ b/srcpkgs/antimicrox/template
@@ -1,7 +1,7 @@
 # Template file for 'antimicrox'
 pkgname=antimicrox
 version=3.3.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake
  qt5-host-tools"
@@ -14,6 +14,7 @@ homepage="https://github.com/AntiMicroX/antimicrox"
 changelog="https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/CHANGELOG.md"
 distfiles="https://github.com/AntiMicroX/antimicrox/archive/${version}.tar.gz"
 checksum=c5e8d7c827f64b0a162133f9cac2ddc8dc0c9243541fae1a8ced5424b4fb7b3c
+replaces="antimicro>=0"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
@@ -22,6 +23,6 @@ fi
 
 antimicro_package() {
 	metapackage=yes
-	depends="${sourcepkg}"
-	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
 }
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index 708905f42d9a30..2bdac52d0fa1b0 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -2,7 +2,7 @@
 pkgname=apache-directory-studio-bin
 _pkgname=ApacheDirectoryStudio
 version=2.0.0.v20210717+M17
-revision=1
+revision=2
 _version="${version/+/-}"
 archs="x86_64"
 depends="virtual?java-runtime gtk+3 desktop-file-utils"
@@ -17,6 +17,7 @@ checksum="24764eff94ad3a257a899d34f9933276af0d201fba9017d6737558b2ffd5eda7
 python_version=3
 nopie=yes
 skip_extraction="${_pkgname}-${_version}-src.zip"
+replaces="apache-directory-studio>=0"
 
 post_extract() {
 	bsdtar --strip-components 3 -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkgname}-${_version}-src.zip" \
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 7d6cc1cfb67c51..7e0b8c278ebad4 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,7 +1,7 @@
 # Template file for 'attica'
 pkgname=attica
 version=5.116.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
 makedepends="qt5-devel"
@@ -11,6 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=681107c4dd989999cecd002c58c01ec3af8317bb9da5267809ad465750d21fea
+replaces="attica-qt5>=0"
 
 do_check() {
 	cd build
@@ -21,6 +22,7 @@ do_check() {
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	replaces="attica-qt5-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 63a08b9b7a890a..f2ad6f71d5c81e 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.8
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -112,6 +112,7 @@ do_install() {
 
 avahi-python3-utils_package() {
 	depends="avahi-python3>=${version}_${revision}"
+	replaces="avahi-python-utils>=0"
 	short_desc="Avahi python utilities"
 	python_version=3
 	pkg_install() {
@@ -121,7 +122,7 @@ avahi-python3-utils_package() {
 }
 
 avahi-python-utils_package() {
-	short_desc="Avahi python utilities - transitional dummy pkg"
+	short_desc="Avahi python utilities (transitional dummy package)"
 	depends="avahi-python3-utils>=${version}_${revision}"
 	metapackage=yes
 }
diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template
index 714888e9ebca33..11047053255b50 100644
--- a/srcpkgs/bCNC/template
+++ b/srcpkgs/bCNC/template
@@ -1,7 +1,7 @@
 # Template file for 'bCNC'
 pkgname=bCNC
 version=0.9.15
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy
@@ -13,6 +13,7 @@ homepage="https://github.com/vlachoudis/bCNC"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=7ca77f8914d2da51b4a2bf5db1fe48f52037e59e972769bf48c932fbee2d5ff3
 make_check=no # all tests require pyautogui, which is not packaged
+replaces="bcnc>=0"
 
 post_install() {
 	vmkdir usr/share/applications
diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index facbacca02c481..fcea31f14df19c 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=4.5.0
-revision=1
+revision=2
 build_style=python3-pep517
 hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-pip python3-setuptools_scm python3-wheel"
 depends="python3-argcomplete python3-Arrow python3-b2sdk python3-docutils python3-phx-class-registry
@@ -14,6 +14,7 @@ distfiles="${PYPI_SITE}/b/b2/b2-${version}.tar.gz"
 checksum=e07b10bc451331ac7150f27c227e9be9a9958dd3a96480db19f9ac6d565cbaef
 replaces="python-b2>=0"
 make_check=no # tests require unpackaged dependencies
+replaces="python-b2>=0"
 
 post_install() {
 	# Avoid conflict with Boost's b2 tool
@@ -25,5 +26,5 @@ post_install() {
 python-b2_package() {
 	depends="backblaze-b2>=${version}_${revision}"
 	metapackage=yes
-	short_desc+=" - transitional package"
+	short_desc+=" (transitional dummy package)"
 }
diff --git a/srcpkgs/baloo-widgets/template b/srcpkgs/baloo-widgets/template
index e83815d69bbdee..f00e21e78452d6 100644
--- a/srcpkgs/baloo-widgets/template
+++ b/srcpkgs/baloo-widgets/template
@@ -1,7 +1,7 @@
 # Template file for 'baloo-widgets'
 pkgname=baloo-widgets
 version=25.12.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DBUILD_WITH_QT6=ON
  -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
@@ -24,10 +24,12 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
 checksum=606ad6246fabfd9b91a2d458c758c322973c46bf37d15a1b2da08568c3d2ab23
+replaces="baloo-widgets5>=0"
 
 baloo-widgets-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	replaces="baloo-widgets5-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
@@ -36,13 +38,13 @@ baloo-widgets-devel_package() {
 }
 
 baloo-widgets5_package() {
-	short_desc+=" - (Dummy transitional package)"
+	short_desc+=" (transitional dummy package)"
 	metapackage=yes
 	depends="baloo-widgets-${version}_${revision}"
 }
 
 baloo-widgets5-devel_package() {
-	short_desc+=" - (Dummy transitional package)"
+	short_desc+=" (transitional dummy package)"
 	metapackage=yes
 	depends="baloo-widgets-devel-${version}_${revision}"
 }
diff --git a/srcpkgs/base-container-full/template b/srcpkgs/base-container-full/template
index 377b4def0f525d..1593bb33f2a734 100644
--- a/srcpkgs/base-container-full/template
+++ b/srcpkgs/base-container-full/template
@@ -1,19 +1,18 @@
 # Template file for 'base-container-full'
 pkgname=base-container-full
 version=0.11
-revision=3
+revision=4
 metapackage=yes
-short_desc="Void Linux base system meta package for containers/chroots"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Public Domain"
-homepage="https://www.voidlinux.org/"
-
-depends="
- base-files ncurses coreutils findutils diffutils
+depends="base-files ncurses coreutils findutils diffutils
  dash bash grep gzip file sed gawk less util-linux which tar man-pages
  mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd
  procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd
  iproute2 iputils iw xbps nvi sudo traceroute kmod removed-packages"
+short_desc="Void Linux base system meta package for containers/chroots"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org/"
+replaces="base-voidstrap>=0"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;
diff --git a/srcpkgs/base-container/template b/srcpkgs/base-container/template
index b8e798677fe62c..7905f432d076db 100644
--- a/srcpkgs/base-container/template
+++ b/srcpkgs/base-container/template
@@ -1,17 +1,16 @@
 # Template file for 'base-container'
 pkgname=base-container
 version=0.3
-revision=3
+revision=4
 metapackage=yes
+depends="base-files coreutils findutils diffutils dash grep gzip sed gawk
+ util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata
+ runit-void removed-packages"
 short_desc="Void Linux base system meta for minimal containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org/"
-
-depends="
- base-files coreutils findutils diffutils dash grep gzip sed gawk
- util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata
- runit-void removed-packages"
+replaces="base-minimal>=0"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl";;
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index ceec63ce7ab6e2..ea270a68af4c05 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-control-center'
 pkgname=budgie-control-center
 version=1.4.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3 libxml2"
@@ -21,9 +21,10 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/BuddiesOfBudgie/budgie-control-center"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz"
 checksum=120d760b6c1190e937cc7f3b3c50227682960123ff0bccfe3ff4902785550d82
+replaces="budgie-control-center-devel>=0"
 
 budgie-control-center-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - transitional package"
+	short_desc+=" (transitional dummy package)"
 	metapackage=yes
 }
diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template
index 205510f17f66fe..ba1d8bbf5607a6 100644
--- a/srcpkgs/cava/template
+++ b/srcpkgs/cava/template
@@ -1,7 +1,7 @@
 # Template file for 'cava'
 pkgname=cava
 version=0.10.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf-archive automake libtool pkg-config"
 makedepends="fftw-devel iniparser-devel ncurses-devel SDL2-devel
@@ -16,6 +16,7 @@ distfiles="https://github.com/karlstav/cava/archive/refs/tags/${version}.tar.gz"
 checksum=43f994f7e609fab843af868d8a7bc21471ac62c5a4724ef97693201eac42e70a
 build_options="alsa jack pipewire pulseaudio sndio"
 build_options_default="alsa jack pipewire pulseaudio sndio"
+replaces="xava>=0 cava-gui>=0"
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
diff --git a/srcpkgs/cbatticon/template b/srcpkgs/cbatticon/template
index 3466e6abd39f48..4108cdd4f613ac 100644
--- a/srcpkgs/cbatticon/template
+++ b/srcpkgs/cbatticon/template
@@ -1,7 +1,7 @@
-# Template file for 'cbatticon' 
+# Template file for 'cbatticon'
 pkgname=cbatticon
 version=1.6.13
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gettext pkg-config"
@@ -13,6 +13,7 @@ homepage="https://github.com/valr/cbatticon"
 changelog="https://raw.githubusercontent.com/valr/cbatticon/master/Changelog"
 distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz"
 checksum=87c6dae4a20dcfbf4897b110a7c5105fa8cf10de74b19e128b0cfd6212c55098
+replaces="cbatticon-gtk2>=0 cbatticon-gtk3>=0"
 
 post_install() {
 	mv ${DESTDIR}/usr/share/doc/cbatticon-${version} ${DESTDIR}/usr/share/doc/cbatticon
diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index f52b64be96341a..8d50b7df5659a5 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,7 +1,7 @@
 # Template file for 'celluloid'
 pkgname=celluloid
 version=0.27
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="gtk4-devel libadwaita-devel libepoxy-devel libglib-devel
@@ -12,6 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://celluloid-player.github.io/"
 distfiles="https://github.com/celluloid-player/celluloid/releases/download/v${version}/celluloid-${version}.tar.xz"
 checksum=216656c4495bb3ca02dc4ad9cf3da8e8f15c8f80e870eeac8eb1eedab4c3788b
+replaces="gnome-mpv>=0"
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index d7586caa8d05d3..3fa541d53cd7cf 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,7 +1,7 @@
 # Template file for 'dav1d'
 pkgname=dav1d
 version=1.5.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Denable_asm=true -Denable_tools=true -Dfuzzing_engine=none
  -Dtestdata_tests=false"
@@ -25,6 +25,7 @@ esac
 
 libdav1d_package() {
 	short_desc+=" - runtime library"
+	replaces="libdav1d6>=0"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vlicense COPYING
diff --git a/srcpkgs/dbus-elogind b/srcpkgs/dbus-elogind
new file mode 120000
index 00000000000000..95a521b44c1ec1
--- /dev/null
+++ b/srcpkgs/dbus-elogind
@@ -0,0 +1 @@
+dbus
\ No newline at end of file
diff --git a/srcpkgs/dbus-elogind-libs b/srcpkgs/dbus-elogind-libs
index 742714e21edba1..95a521b44c1ec1 120000
--- a/srcpkgs/dbus-elogind-libs
+++ b/srcpkgs/dbus-elogind-libs
@@ -1 +1 @@
-dbus-elogind
\ No newline at end of file
+dbus
\ No newline at end of file
diff --git a/srcpkgs/dbus-elogind-x11 b/srcpkgs/dbus-elogind-x11
index 742714e21edba1..95a521b44c1ec1 120000
--- a/srcpkgs/dbus-elogind-x11
+++ b/srcpkgs/dbus-elogind-x11
@@ -1 +1 @@
-dbus-elogind
\ No newline at end of file
+dbus
\ No newline at end of file
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
deleted file mode 100644
index 7e40f6d5e369cd..00000000000000
--- a/srcpkgs/dbus-elogind/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'dbus-elogind'
-pkgname=dbus-elogind
-version=1.14.6
-revision=2
-metapackage=yes
-depends="dbus>=1.14.6_2"
-short_desc="Message bus system (transitional dummy package)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://dbus.freedesktop.org/"
-
-dbus-elogind-libs_package() {
-	short_desc="Message bus system - shared libraries (transitional dummy package)"
-	depends="dbus-libs>=1.14.6_2"
-}
-
-dbus-elogind-x11_package() {
-	short_desc="Message bus system - X11 support (transitional dummy package)"
-	depends="dbus-x11>=1.14.6_2"
-}
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index f0b6ae9fcf0f24..bc140fae4839d3 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.16.2
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dselinux=disabled -Dinotify=enabled -Ddbus_user=dbus
  -Dxml_docs=enabled -Ddoxygen_docs=disabled -Depoll=enabled
@@ -18,8 +18,8 @@ distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
 checksum=0ba2a1a4b16afe7bceb2c07e9ce99a8c2c3508e5dec290dbb643384bd6beb7e2
 python_version=3
 conf_files="/etc/dbus-1/*.conf"
+replaces="dbus-elogind>=0"
 
-# Create dbus:22 system account.
 system_accounts="dbus:22"
 
 post_install() {
@@ -41,6 +41,7 @@ dbus-devel_package() {
 
 dbus-libs_package() {
 	short_desc+=" - shared libraries"
+	replaces="dbus-elogind-libs>=0"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 	}
@@ -48,8 +49,27 @@ dbus-libs_package() {
 
 dbus-x11_package() {
 	short_desc+=" - X11 support"
+	replaces="dbus-elogind-x11>=0"
 	pkg_install() {
 		vmove usr/bin/dbus-launch
 		vmove usr/share/man/man1/dbus-launch.1
 	}
 }
+
+dbus-elogind_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	metapackage=yes
+}
+
+dbus-elogind-libs_package() {
+	depends="${sourcepkg}-libs>=${version}_${revision}"
+	short_desc+=" - shared libraries (transitional dummy package)"
+	metapackage=yes
+}
+
+dbus-elogind-x11_package() {
+	depends="${sourcepkg}-x11>=${version}_${revision}"
+	short_desc+=" - X11 support (transitional dummy package)"
+	metapackage=yes
+}
diff --git a/srcpkgs/dnsrecon/template b/srcpkgs/dnsrecon/template
index 3ab8b48e94272e..456bd17b42ae83 100644
--- a/srcpkgs/dnsrecon/template
+++ b/srcpkgs/dnsrecon/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsrecon'
 pkgname=dnsrecon
 version=1.5.3
-revision=1
+revision=2
 build_style=python3-pep517
 make_check_args="-k not(test_zone_transfer)"
 hostmakedepends="python3-setuptools"
@@ -13,9 +13,10 @@ license="GPL-2.0-only"
 homepage="https://github.com/darkoperator/dnsrecon"
 distfiles="https://github.com/darkoperator/dnsrecon/archive/refs/tags/${version}.tar.gz"
 checksum=7ca7593612291ff8f79729462339b082e15c1c1bc75a8e61c0d44afcc8a32ed3
+replaces="python3-dnsrecon>=0"
 
 python3-dnsrecon_package() {
-	depends="${sourcepkg}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	metapackage=yes
 	short_desc+=" (transitional dummy package)"
 }
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index e76fa09323bcaf..7aeb91bb0f642b 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
 version=8.0.9
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils extra-cmake-modules gettext glib-devel
  kf6-kconfig qt6-base qt6-declarative-tools qt6-declarative-private-devel"
@@ -23,6 +23,7 @@ homepage="https://github.com/wwmm/easyeffects"
 changelog="https://raw.githubusercontent.com/wwmm/easyeffects/refs/heads/master/src/contents/docs/community/CHANGELOG.md"
 distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz"
 checksum=23ac1108a7f679903c37e566d39d2aec745823449014170b7eb91758ad5e9a0a
+replaces="pulseeffects>=0"
 
 pulseeffects_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index 3ef11a43b97fe8..abcafc7737fd64 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'element-desktop'
 pkgname=element-desktop
 version=1.12.1
-revision=1
+revision=2
 _electronver=35
 create_wrksrc=yes
 build_helper="rust"
@@ -20,6 +20,7 @@ distfiles="https://github.com/vector-im/element-desktop/archive/v${version}.tar.
  https://github.com/vector-im/element-web/archive/v${version}.tar.gz>element-web-v${version}.tar.gz"
 checksum="9bdf5388686c187ffd1c9583f3b42d2cffcb3619bc7740b27ee07ccc2e456db2
  e1f53f6a186d67b58ed6d6487cdcc33675de12cd3f7bcba5248eb2c14d4f70d4"
+replaces="riot-desktop>=0"
 
 export USE_SYSTEM_APP_BUILDER=true
 
@@ -128,7 +129,7 @@ do_install() {
 }
 
 riot-desktop_package() {
-	depends="element-desktop"
+	depends="element-desktop>=${version}_${revision}"
 	short_desc+=" (transitional dummy package)"
 	metapackage=yes
 }
diff --git a/srcpkgs/enter-tex/template b/srcpkgs/enter-tex/template
index 983aeac7af6de8..fa2a0c3fa3c857 100644
--- a/srcpkgs/enter-tex/template
+++ b/srcpkgs/enter-tex/template
@@ -1,7 +1,7 @@
 # Template file for 'enter-tex'
 pkgname=enter-tex
 version=3.48.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Ddconf_migration=false $(vopt_bool gtk_doc gtk_doc)"
@@ -16,6 +16,7 @@ homepage="https://gitlab.gnome.org/World/gedit/enter-tex"
 changelog="https://gitlab.gnome.org/World/gedit/enter-tex/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/gedit/enter-tex/-/archive/${version}/enter-tex-${version}.tar.gz"
 checksum=78a808d39bf31388afcc7030e509563e3ed23b3dac6d319a69005c36c10d0b8e
+replaces="gnome-latex>=0"
 
 build_options="gtk_doc"
 build_options_default=" "
@@ -35,6 +36,6 @@ pre_build() {
 
 gnome-latex_package() {
 	metapackage=yes
-	short_desc+=" - transitional dummy package"
+	short_desc+=" (transitional dummy package)"
 	depends="${sourcepkg}>=${version}_${revision}"
 }
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
index fbd7d39f3589e3..b4caf3549e38f4 100644
--- a/srcpkgs/ergo/template
+++ b/srcpkgs/ergo/template
@@ -1,7 +1,7 @@
 # Template file for 'ergo'
 pkgname=ergo
 version=2.17.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ergo"
 go_ldflags="-X main.version=$version"
@@ -15,6 +15,7 @@ checksum=bfda2be82aa133ddd7a03c2121d6807c8a1b9f5c055f0bbb90451baa2a249ce4
 system_accounts="_ergo"
 _ergo_homedir="/var/lib/ergo"
 make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+replaces="oragono>=0"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
index 8f5636f3279c44..7c49159a132900 100644
--- a/srcpkgs/espeak-ng/template
+++ b/srcpkgs/espeak-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'espeak-ng'
 pkgname=espeak-ng
 version=1.52.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -14,6 +14,8 @@ homepage="https://github.com/espeak-ng/espeak-ng/"
 changelog="https://raw.githubusercontent.com/espeak-ng/espeak-ng/master/ChangeLog.md"
 distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
 checksum=bb4338102ff3b49a81423da8a1a158b420124b055b60fa76cfb4b18677130a23
+replaces="espeak>=0"
+
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="$CFLAGS"
 
@@ -29,6 +31,7 @@ do_check() {
 
 libespeak-ng_package() {
 	short_desc+=" - runtime libraries"
+	replaces="libespeak>=0"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
 		vmove usr/share/espeak-ng-data
@@ -37,6 +40,7 @@ libespeak-ng_package() {
 
 libespeak-ng-devel_package() {
 	depends="libespeak-ng>=${version}_${revision}"
+	replaces="libespeak-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index 4b0ab4c69473be..73884f41b76a16 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
 # Template file for 'eza'
 pkgname=eza
 version=0.23.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-1.9-devel"
@@ -14,6 +14,7 @@ distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.ta
  https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
 checksum="9fbcad518b8a2095206ac385329ca62d216bf9fdc652dde2d082fcb37c309635
  afcf804979ba03df7545e8b02d41576ab5e15bd090dfc51a052f41df3a65b264"
+replaces="exa>=0"
 
 skip_extraction="man-${version}.tar.gz"
 
@@ -37,7 +38,7 @@ post_install() {
 
 exa_package() {
 	depends="eza>=${version}_${revision}"
-	short_desc+=" - transitional dummy package"
+	short_desc+=" (transitional dummy package)"
 	pkg_install() {
 		vmove usr/bin/exa
 	}
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index bdb6d7c6cbc3df..a6f7d0061bc886 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -15,7 +15,7 @@
 # XXX: KEEP IN SYNC WITH rpi5-kernel
 pkgname=rpi-kernel
 version=6.12.67
-revision=1
+revision=2
 _githash=619bd3498567e9db963e3d4cc2988b513d6cd841
 archs="aarch64* armv6l* armv7l*"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz pahole
@@ -63,9 +63,10 @@ fi
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
 		provides="rpi-kernel-${version}_${revision}"
-		replaces="rpi5-kernel>=0"
+		replaces="rpi5-kernel>=0 rpi3-kernel>=0 rpi4-kernel>=0"
 		;;
-	armv[67]*)
+	armv7l*)
+		replaces="rpi2-kernel>=0"
 		;;
 	*)
 		broken="No Raspberry Pi exists for this arch"
@@ -303,7 +304,10 @@ rpi-kernel-headers_package() {
 	case "$XBPS_TARGET_MACHINE" in
 		aarch64*)
 			provides="rpi-kernel-headers-${version}_${revision}"
-			replaces="rpi5-kernel-headers>=0"
+			replaces="rpi5-kernel-headers>=0 rpi3-kernel-headers>=0 rpi4-kernel-headers>=0"
+			;;
+		armv7l*)
+			replaces="rpi2-kernel-headers>=0"
 			;;
 	esac
 	pkg_install() {