diff --git a/app-admin/sudo-1.9.17_p2/sudo.pam b/app-admin/sudo/sudo.pam
similarity index 100%
rename from app-admin/sudo-1.9.17_p2/sudo.pam
rename to app-admin/sudo/sudo.pam
diff --git a/app-misc/fastfetch-2.56.1/fastfetch-2.56.1-leaf.patch b/app-misc/fastfetch/fastfetch-2.56.1-leaf.patch
similarity index 100%
rename from app-misc/fastfetch-2.56.1/fastfetch-2.56.1-leaf.patch
rename to app-misc/fastfetch/fastfetch-2.56.1-leaf.patch
diff --git a/app-misc/jq-1.8.1/jq-1.6-r3-never-bundle-oniguruma.patch b/app-misc/jq/jq-1.6-r3-never-bundle-oniguruma.patch
similarity index 100%
rename from app-misc/jq-1.8.1/jq-1.6-r3-never-bundle-oniguruma.patch
rename to app-misc/jq/jq-1.6-r3-never-bundle-oniguruma.patch
diff --git a/app-misc/make-ca-1.16.1/pythoncerts.sh b/app-misc/make-ca/pythoncerts.sh
similarity index 100%
rename from app-misc/make-ca-1.16.1/pythoncerts.sh
rename to app-misc/make-ca/pythoncerts.sh
diff --git a/dev-cpp/eigen-3.4.0/eigen-3.4.0-cxxstandard.patch b/dev-cpp/eigen/eigen-3.4.0-cxxstandard.patch
similarity index 100%
rename from dev-cpp/eigen-3.4.0/eigen-3.4.0-cxxstandard.patch
rename to dev-cpp/eigen/eigen-3.4.0-cxxstandard.patch
diff --git a/dev-lang/python-3.13.7/pythondocs.sh b/dev-lang/python/pythondocs.sh
similarity index 100%
rename from dev-lang/python-3.13.7/pythondocs.sh
rename to dev-lang/python/pythondocs.sh
diff --git a/dev-lang/yasm-1.3.0/yasm-1.3.0-fix-modern-c.patch b/dev-lang/yasm/yasm-1.3.0-fix-modern-c.patch
similarity index 100%
rename from dev-lang/yasm-1.3.0/yasm-1.3.0-fix-modern-c.patch
rename to dev-lang/yasm/yasm-1.3.0-fix-modern-c.patch
diff --git a/dev-libs/appstream-1.0.6/appstream-1.0.0-disable-Werror-flags.patch b/dev-libs/appstream/appstream-1.0.0-disable-Werror-flags.patch
similarity index 100%
rename from dev-libs/appstream-1.0.6/appstream-1.0.0-disable-Werror-flags.patch
rename to dev-libs/appstream/appstream-1.0.0-disable-Werror-flags.patch
diff --git a/dev-libs/check-0.15.2/check-0.14.0-r2-disable-automagic-dep.patch b/dev-libs/check/check-0.14.0-r2-disable-automagic-dep.patch
similarity index 100%
rename from dev-libs/check-0.15.2/check-0.14.0-r2-disable-automagic-dep.patch
rename to dev-libs/check/check-0.14.0-r2-disable-automagic-dep.patch
diff --git a/dev-libs/check-0.15.2/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch b/dev-libs/check/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
similarity index 100%
rename from dev-libs/check-0.15.2/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
rename to dev-libs/check/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
diff --git a/dev-libs/check-0.15.2/check-0.15.2-avoid-static-lib.patch b/dev-libs/check/check-0.15.2-avoid-static-lib.patch
similarity index 100%
rename from dev-libs/check-0.15.2/check-0.15.2-avoid-static-lib.patch
rename to dev-libs/check/check-0.15.2-avoid-static-lib.patch
diff --git a/dev-libs/date-3.0.3/date-3.0.3_remove-failing-tests.patch b/dev-libs/date/date-3.0.3_remove-failing-tests.patch
similarity index 100%
rename from dev-libs/date-3.0.3/date-3.0.3_remove-failing-tests.patch
rename to dev-libs/date/date-3.0.3_remove-failing-tests.patch
diff --git a/dev-libs/glib-2.84.4/gio-querymodules.HOOK b/dev-libs/glib/gio-querymodules.HOOK
similarity index 100%
rename from dev-libs/glib-2.84.4/gio-querymodules.HOOK
rename to dev-libs/glib/gio-querymodules.HOOK
diff --git a/dev-libs/glib-2.84.4/glib-compile-schemas.HOOK b/dev-libs/glib/glib-compile-schemas.HOOK
similarity index 100%
rename from dev-libs/glib-2.84.4/glib-compile-schemas.HOOK
rename to dev-libs/glib/glib-compile-schemas.HOOK
diff --git a/dev-libs/libdbusmenu-16.04.0/libdbusmenu-16.04.0-configure-fix.patch b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-configure-fix.patch
similarity index 100%
rename from dev-libs/libdbusmenu-16.04.0/libdbusmenu-16.04.0-configure-fix.patch
rename to dev-libs/libdbusmenu/libdbusmenu-16.04.0-configure-fix.patch
diff --git a/dev-libs/libdbusmenu-16.04.0/libdbusmenu-16.04.0-werror.patch b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-werror.patch
similarity index 100%
rename from dev-libs/libdbusmenu-16.04.0/libdbusmenu-16.04.0-werror.patch
rename to dev-libs/libdbusmenu/libdbusmenu-16.04.0-werror.patch
diff --git a/dev-libs/libevent-2.1.12/libevent-2.1.12-openssl-compat.patch b/dev-libs/libevent/libevent-2.1.12-openssl-compat.patch
similarity index 100%
rename from dev-libs/libevent-2.1.12/libevent-2.1.12-openssl-compat.patch
rename to dev-libs/libevent/libevent-2.1.12-openssl-compat.patch
diff --git a/dev-libs/libzip-1.11.4/libzip-1.11.4-mbedtls-3.patch b/dev-libs/libzip/libzip-1.11.4-mbedtls-3.patch
similarity index 100%
rename from dev-libs/libzip-1.11.4/libzip-1.11.4-mbedtls-3.patch
rename to dev-libs/libzip/libzip-1.11.4-mbedtls-3.patch
diff --git a/dev-libs/protobuf-31.1/FindJsonCpp.cmake b/dev-libs/protobuf/FindJsonCpp.cmake
similarity index 100%
rename from dev-libs/protobuf-31.1/FindJsonCpp.cmake
rename to dev-libs/protobuf/FindJsonCpp.cmake
diff --git a/dev-libs/protobuf-31.1/protobuf-30.0-findJsonCpp.patch b/dev-libs/protobuf/protobuf-30.0-findJsonCpp.patch
similarity index 100%
rename from dev-libs/protobuf-31.1/protobuf-30.0-findJsonCpp.patch
rename to dev-libs/protobuf/protobuf-30.0-findJsonCpp.patch
diff --git a/dev-libs/snowball-stemmer-2.2.0/snowball-stemmer-2.2.0-shared-library.patch b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0-shared-library.patch
similarity index 100%
rename from dev-libs/snowball-stemmer-2.2.0/snowball-stemmer-2.2.0-shared-library.patch
rename to dev-libs/snowball-stemmer/snowball-stemmer-2.2.0-shared-library.patch
diff --git a/dev-libs/spdlog-1.15.3/spdlog-force_external_fmt.patch b/dev-libs/spdlog/spdlog-force_external_fmt.patch
similarity index 100%
rename from dev-libs/spdlog-1.15.3/spdlog-force_external_fmt.patch
rename to dev-libs/spdlog/spdlog-force_external_fmt.patch
diff --git a/dev-libs/udis86-1.7.2/udis86-1.7.2-docdir.patch b/dev-libs/udis86/udis86-1.7.2-docdir.patch
similarity index 100%
rename from dev-libs/udis86-1.7.2/udis86-1.7.2-docdir.patch
rename to dev-libs/udis86/udis86-1.7.2-docdir.patch
diff --git a/dev-libs/udis86-1.7.2/udis86-1.7.2-python3.patch b/dev-libs/udis86/udis86-1.7.2-python3.patch
similarity index 100%
rename from dev-libs/udis86-1.7.2/udis86-1.7.2-python3.patch
rename to dev-libs/udis86/udis86-1.7.2-python3.patch
diff --git a/dev-libs/udis86-1.7.2/udis86-1.7.2-uninitialized-variable.patch b/dev-libs/udis86/udis86-1.7.2-uninitialized-variable.patch
similarity index 100%
rename from dev-libs/udis86-1.7.2/udis86-1.7.2-uninitialized-variable.patch
rename to dev-libs/udis86/udis86-1.7.2-uninitialized-variable.patch
diff --git a/dev-util/desktop-file-utils-0.28/update-desktop-database.HOOK b/dev-util/desktop-file-utils/update-desktop-database.HOOK
similarity index 100%
rename from dev-util/desktop-file-utils-0.28/update-desktop-database.HOOK
rename to dev-util/desktop-file-utils/update-desktop-database.HOOK
diff --git a/dev-util/gtk-update-icon-cache-3.24.42/gtk-update-icon-cache.HOOK b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache.HOOK
similarity index 100%
rename from dev-util/gtk-update-icon-cache-3.24.42/gtk-update-icon-cache.HOOK
rename to dev-util/gtk-update-icon-cache/gtk-update-icon-cache.HOOK
diff --git a/dev-util/itstool-2.0.7/itstool-2.0.7-raw-string-testrunner.patch b/dev-util/itstool/itstool-2.0.7-raw-string-testrunner.patch
similarity index 100%
rename from dev-util/itstool-2.0.7/itstool-2.0.7-raw-string-testrunner.patch
rename to dev-util/itstool/itstool-2.0.7-raw-string-testrunner.patch
diff --git a/dev-util/rocm-smi-7.1.0/rocm-smi-5.7.1-remove-example.patch b/dev-util/rocm-smi/rocm-smi-5.7.1-remove-example.patch
similarity index 100%
rename from dev-util/rocm-smi-7.1.0/rocm-smi-5.7.1-remove-example.patch
rename to dev-util/rocm-smi/rocm-smi-5.7.1-remove-example.patch
diff --git a/gnome-base/librsvg-2.61.0/librsvg-2.60.0-libxml2-2.15.0-tests.patch b/gnome-base/librsvg/librsvg-2.60.0-libxml2-2.15.0-tests.patch
similarity index 100%
rename from gnome-base/librsvg-2.61.0/librsvg-2.60.0-libxml2-2.15.0-tests.patch
rename to gnome-base/librsvg/librsvg-2.60.0-libxml2-2.15.0-tests.patch
diff --git a/gui-libs/gtk-4.18.6/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_ge_4.18.5.patch b/gui-libs/gtk/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_ge_4.18.5.patch
similarity index 100%
rename from gui-libs/gtk-4.18.6/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_ge_4.18.5.patch
rename to gui-libs/gtk/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_ge_4.18.5.patch
diff --git a/gui-libs/gtk-4.18.6/gtk4-querymodules.HOOK b/gui-libs/gtk/gtk4-querymodules.HOOK
similarity index 100%
rename from gui-libs/gtk-4.18.6/gtk4-querymodules.HOOK
rename to gui-libs/gtk/gtk4-querymodules.HOOK
diff --git a/lfs/glibc-2.42/ld.so.conf b/lfs/glibc/ld.so.conf
similarity index 100%
rename from lfs/glibc-2.42/ld.so.conf
rename to lfs/glibc/ld.so.conf
diff --git a/lfs/glibc-2.42/nsswitch.conf b/lfs/glibc/nsswitch.conf
similarity index 100%
rename from lfs/glibc-2.42/nsswitch.conf
rename to lfs/glibc/nsswitch.conf
diff --git a/lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK b/lfs/systemd/30-systemd-daemon-reload-system.HOOK
similarity index 100%
rename from lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK
rename to lfs/systemd/30-systemd-daemon-reload-system.HOOK
diff --git a/lfs/systemd-257.8/30-systemd-daemon-reload-user.HOOK b/lfs/systemd/30-systemd-daemon-reload-user.HOOK
similarity index 100%
rename from lfs/systemd-257.8/30-systemd-daemon-reload-user.HOOK
rename to lfs/systemd/30-systemd-daemon-reload-user.HOOK
diff --git a/media-fonts/noto-cjk-20190416/70-noto-cjk.conf b/media-fonts/noto-cjk/70-noto-cjk.conf
similarity index 100%
rename from media-fonts/noto-cjk-20190416/70-noto-cjk.conf
rename to media-fonts/noto-cjk/70-noto-cjk.conf
diff --git a/media-fonts/noto-emoji-20250912/75-noto-emoji-fallback.conf b/media-fonts/noto-emoji/75-noto-emoji-fallback.conf
similarity index 100%
rename from media-fonts/noto-emoji-20250912/75-noto-emoji-fallback.conf
rename to media-fonts/noto-emoji/75-noto-emoji-fallback.conf
diff --git a/media-fonts/noto-20251101/66-noto-mono.conf b/media-fonts/noto/66-noto-mono.conf
similarity index 100%
rename from media-fonts/noto-20251101/66-noto-mono.conf
rename to media-fonts/noto/66-noto-mono.conf
diff --git a/media-fonts/noto-20251101/66-noto-sans.conf b/media-fonts/noto/66-noto-sans.conf
similarity index 100%
rename from media-fonts/noto-20251101/66-noto-sans.conf
rename to media-fonts/noto/66-noto-sans.conf
diff --git a/media-fonts/noto-20251101/66-noto-serif.conf b/media-fonts/noto/66-noto-serif.conf
similarity index 100%
rename from media-fonts/noto-20251101/66-noto-serif.conf
rename to media-fonts/noto/66-noto-serif.conf
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-cmake-files-libdir.patch b/media-gfx/graphite2/graphite2-1.3.14-fix-cmake-files-libdir.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-cmake-files-libdir.patch
rename to media-gfx/graphite2/graphite2-1.3.14-fix-cmake-files-libdir.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-nodefaultlibs-deux.patch b/media-gfx/graphite2/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
rename to media-gfx/graphite2/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/graphite2-1.3.14-fix-nodefaultlibs.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14-fix-nodefaultlibs.patch
rename to media-gfx/graphite2/graphite2-1.3.14-fix-nodefaultlibs.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14-gcc15.patch b/media-gfx/graphite2/graphite2-1.3.14-gcc15.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14-gcc15.patch
rename to media-gfx/graphite2/graphite2-1.3.14-gcc15.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14-no-libtool-file.patch b/media-gfx/graphite2/graphite2-1.3.14-no-libtool-file.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14-no-libtool-file.patch
rename to media-gfx/graphite2/graphite2-1.3.14-no-libtool-file.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake-findpython3.patch b/media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake-findpython3.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake-findpython3.patch
rename to media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake-findpython3.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake-minreqver-3.16.patch b/media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake-minreqver-3.16.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake-minreqver-3.16.patch
rename to media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake-minreqver-3.16.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake4.patch b/media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake4.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.14_p20210810-cmake4.patch
rename to media-gfx/graphite2/graphite2-1.3.14_p20210810-cmake4.patch
diff --git a/media-gfx/graphite2-1.3.14/graphite2-1.3.5-fix-gcc-linking.patch b/media-gfx/graphite2/graphite2-1.3.5-fix-gcc-linking.patch
similarity index 100%
rename from media-gfx/graphite2-1.3.14/graphite2-1.3.5-fix-gcc-linking.patch
rename to media-gfx/graphite2/graphite2-1.3.5-fix-gcc-linking.patch
diff --git a/media-gfx/imv-5.0.1/imv-5.0.0-nsgif-version.patch b/media-gfx/imv/imv-5.0.0-nsgif-version.patch
similarity index 100%
rename from media-gfx/imv-5.0.1/imv-5.0.0-nsgif-version.patch
rename to media-gfx/imv/imv-5.0.0-nsgif-version.patch
diff --git a/media-libs/alsa-lib-1.2.14/alsa-lib-1.1.6-missing_files.patch b/media-libs/alsa-lib/alsa-lib-1.1.6-missing_files.patch
similarity index 100%
rename from media-libs/alsa-lib-1.2.14/alsa-lib-1.1.6-missing_files.patch
rename to media-libs/alsa-lib/alsa-lib-1.1.6-missing_files.patch
diff --git a/media-libs/fontconfig-2.17.1/40-fontconfig-config.HOOK b/media-libs/fontconfig/40-fontconfig-config.HOOK
similarity index 100%
rename from media-libs/fontconfig-2.17.1/40-fontconfig-config.HOOK
rename to media-libs/fontconfig/40-fontconfig-config.HOOK
diff --git a/media-libs/fontconfig-2.17.1/fontconfig-2.14.0-latin-update.patch b/media-libs/fontconfig/fontconfig-2.14.0-latin-update.patch
similarity index 100%
rename from media-libs/fontconfig-2.17.1/fontconfig-2.14.0-latin-update.patch
rename to media-libs/fontconfig/fontconfig-2.14.0-latin-update.patch
diff --git a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-macro-preprocess.patch b/media-libs/fontconfig/fontconfig-2.17.0-macro-preprocess.patch
similarity index 100%
rename from media-libs/fontconfig-2.17.1/fontconfig-2.17.0-macro-preprocess.patch
rename to media-libs/fontconfig/fontconfig-2.17.0-macro-preprocess.patch
diff --git a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-network-test.patch b/media-libs/fontconfig/fontconfig-2.17.0-network-test.patch
similarity index 100%
rename from media-libs/fontconfig-2.17.1/fontconfig-2.17.0-network-test.patch
rename to media-libs/fontconfig/fontconfig-2.17.0-network-test.patch
diff --git a/media-libs/fontconfig-2.17.1/fontconfig-2.17.0-skip-bubblewrap-tests.patch b/media-libs/fontconfig/fontconfig-2.17.0-skip-bubblewrap-tests.patch
similarity index 100%
rename from media-libs/fontconfig-2.17.1/fontconfig-2.17.0-skip-bubblewrap-tests.patch
rename to media-libs/fontconfig/fontconfig-2.17.0-skip-bubblewrap-tests.patch
diff --git a/media-libs/libnsgif-1.0.0/libnsgif-1.0.0-make-test-failures-fatal.patch b/media-libs/libnsgif/libnsgif-1.0.0-make-test-failures-fatal.patch
similarity index 100%
rename from media-libs/libnsgif-1.0.0/libnsgif-1.0.0-make-test-failures-fatal.patch
rename to media-libs/libnsgif/libnsgif-1.0.0-make-test-failures-fatal.patch
diff --git a/media-libs/libplacebo-7.351.0/libplacebo-7.351.0-vulkan-python-xml.patch b/media-libs/libplacebo/libplacebo-7.351.0-vulkan-python-xml.patch
similarity index 100%
rename from media-libs/libplacebo-7.351.0/libplacebo-7.351.0-vulkan-python-xml.patch
rename to media-libs/libplacebo/libplacebo-7.351.0-vulkan-python-xml.patch
diff --git a/media-libs/libpulse-17.0/pulseaudio-17.0-backport-pr807.patch b/media-libs/libpulse/pulseaudio-17.0-backport-pr807.patch
similarity index 100%
rename from media-libs/libpulse-17.0/pulseaudio-17.0-backport-pr807.patch
rename to media-libs/libpulse/pulseaudio-17.0-backport-pr807.patch
diff --git a/media-libs/libvorbis-1.3.7/libvorbis-1.3.7-macro-wstrict-prototypes.patch b/media-libs/libvorbis/libvorbis-1.3.7-macro-wstrict-prototypes.patch
similarity index 100%
rename from media-libs/libvorbis-1.3.7/libvorbis-1.3.7-macro-wstrict-prototypes.patch
rename to media-libs/libvorbis/libvorbis-1.3.7-macro-wstrict-prototypes.patch
diff --git a/media-libs/libvorbis-1.3.7/libvorbis-1.3.7-mismatched-free.patch b/media-libs/libvorbis/libvorbis-1.3.7-mismatched-free.patch
similarity index 100%
rename from media-libs/libvorbis-1.3.7/libvorbis-1.3.7-mismatched-free.patch
rename to media-libs/libvorbis/libvorbis-1.3.7-mismatched-free.patch
diff --git a/media-libs/libvorbis-1.3.7/libvorbis-1.3.7-psy-bounds.patch b/media-libs/libvorbis/libvorbis-1.3.7-psy-bounds.patch
similarity index 100%
rename from media-libs/libvorbis-1.3.7/libvorbis-1.3.7-psy-bounds.patch
rename to media-libs/libvorbis/libvorbis-1.3.7-psy-bounds.patch
diff --git a/media-libs/libvorbis-1.3.7/libvorbis-1.3.7-ubsan-shift.patch b/media-libs/libvorbis/libvorbis-1.3.7-ubsan-shift.patch
similarity index 100%
rename from media-libs/libvorbis-1.3.7/libvorbis-1.3.7-ubsan-shift.patch
rename to media-libs/libvorbis/libvorbis-1.3.7-ubsan-shift.patch
diff --git a/media-libs/libwebp-1.6.0/libwebp-1.2.3-libpng-pkg-config.patch b/media-libs/libwebp/libwebp-1.2.3-libpng-pkg-config.patch
similarity index 100%
rename from media-libs/libwebp-1.6.0/libwebp-1.2.3-libpng-pkg-config.patch
rename to media-libs/libwebp/libwebp-1.2.3-libpng-pkg-config.patch
diff --git a/media-libs/libwebp-1.6.0/libwebp-1.6.0-configure-typo.patch b/media-libs/libwebp/libwebp-1.6.0-configure-typo.patch
similarity index 100%
rename from media-libs/libwebp-1.6.0/libwebp-1.6.0-configure-typo.patch
rename to media-libs/libwebp/libwebp-1.6.0-configure-typo.patch
diff --git a/media-libs/shaderc-2025.4/shaderc-2020.4-fix-build.patch b/media-libs/shaderc/shaderc-2020.4-fix-build.patch
similarity index 100%
rename from media-libs/shaderc-2025.4/shaderc-2020.4-fix-build.patch
rename to media-libs/shaderc/shaderc-2020.4-fix-build.patch
diff --git a/media-libs/x265-3.6/x265-3.5-r5-cpp-std.patch b/media-libs/x265/x265-3.5-r5-cpp-std.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.5-r5-cpp-std.patch
rename to media-libs/x265/x265-3.5-r5-cpp-std.patch
diff --git a/media-libs/x265-3.6/x265-3.5-r5-gcc15.patch b/media-libs/x265/x265-3.5-r5-gcc15.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.5-r5-gcc15.patch
rename to media-libs/x265/x265-3.5-r5-gcc15.patch
diff --git a/media-libs/x265-3.6/x265-3.6-cmake-cleanup.patch b/media-libs/x265/x265-3.6-cmake-cleanup.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.6-cmake-cleanup.patch
rename to media-libs/x265/x265-3.6-cmake-cleanup.patch
diff --git a/media-libs/x265-3.6/x265-3.6-code-cleanup.patch b/media-libs/x265/x265-3.6-code-cleanup.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.6-code-cleanup.patch
rename to media-libs/x265/x265-3.6-code-cleanup.patch
diff --git a/media-libs/x265-3.6/x265-3.6-code-cleanup_2.patch b/media-libs/x265/x265-3.6-code-cleanup_2.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.6-code-cleanup_2.patch
rename to media-libs/x265/x265-3.6-code-cleanup_2.patch
diff --git a/media-libs/x265-3.6/x265-3.6-code-cleanup_3.patch b/media-libs/x265/x265-3.6-code-cleanup_3.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.6-code-cleanup_3.patch
rename to media-libs/x265/x265-3.6-code-cleanup_3.patch
diff --git a/media-libs/x265-3.6/x265-3.6-code-cleanup_4.patch b/media-libs/x265/x265-3.6-code-cleanup_4.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-3.6-code-cleanup_4.patch
rename to media-libs/x265/x265-3.6-code-cleanup_4.patch
diff --git a/media-libs/x265-3.6/x265-cmake-min-version-3.28.patch b/media-libs/x265/x265-cmake-min-version-3.28.patch
similarity index 100%
rename from media-libs/x265-3.6/x265-cmake-min-version-3.28.patch
rename to media-libs/x265/x265-cmake-min-version-3.28.patch
diff --git a/media-sound/lame-3.100/lame-3.100-pkgconfig.patch b/media-sound/lame/lame-3.100-pkgconfig.patch
similarity index 100%
rename from media-sound/lame-3.100/lame-3.100-pkgconfig.patch
rename to media-sound/lame/lame-3.100-pkgconfig.patch
diff --git a/media-sound/lame-3.100/lame-3.100-symbols.patch b/media-sound/lame/lame-3.100-symbols.patch
similarity index 100%
rename from media-sound/lame-3.100/lame-3.100-symbols.patch
rename to media-sound/lame/lame-3.100-symbols.patch
diff --git a/media-sound/lame-3.100/lame-3.98-gtk-path.patch b/media-sound/lame/lame-3.98-gtk-path.patch
similarity index 100%
rename from media-sound/lame-3.100/lame-3.98-gtk-path.patch
rename to media-sound/lame/lame-3.98-gtk-path.patch
diff --git a/media-sound/lame-3.100/lame-3.99.5-msse.patch b/media-sound/lame/lame-3.99.5-msse.patch
similarity index 100%
rename from media-sound/lame-3.100/lame-3.99.5-msse.patch
rename to media-sound/lame/lame-3.99.5-msse.patch
diff --git a/media-sound/lame-3.100/lame-3.99.5-tinfo.patch b/media-sound/lame/lame-3.99.5-tinfo.patch
similarity index 100%
rename from media-sound/lame-3.100/lame-3.99.5-tinfo.patch
rename to media-sound/lame/lame-3.99.5-tinfo.patch
diff --git a/media-video/pipewire-1.4.9/99-pipewire-default-hook.conf b/media-video/pipewire/99-pipewire-default-hook.conf
similarity index 100%
rename from media-video/pipewire-1.4.9/99-pipewire-default-hook.conf
rename to media-video/pipewire/99-pipewire-default-hook.conf
diff --git a/media-video/pipewire-1.4.9/acct-group-pipewire.conf b/media-video/pipewire/acct-group-pipewire.conf
similarity index 100%
rename from media-video/pipewire-1.4.9/acct-group-pipewire.conf
rename to media-video/pipewire/acct-group-pipewire.conf
diff --git a/media-video/pipewire-1.4.9/pipewire-0.3.25-enable-failed-mlock-warning.patch b/media-video/pipewire/pipewire-0.3.25-enable-failed-mlock-warning.patch
similarity index 100%
rename from media-video/pipewire-1.4.9/pipewire-0.3.25-enable-failed-mlock-warning.patch
rename to media-video/pipewire/pipewire-0.3.25-enable-failed-mlock-warning.patch
diff --git a/media-video/pipewire-1.4.9/pipewire-1.4.6-no-automagic-ebur128.patch b/media-video/pipewire/pipewire-1.4.6-no-automagic-ebur128.patch
similarity index 100%
rename from media-video/pipewire-1.4.9/pipewire-1.4.6-no-automagic-ebur128.patch
rename to media-video/pipewire/pipewire-1.4.6-no-automagic-ebur128.patch
diff --git a/media-video/pipewire-1.4.9/pipewire-1.4.6-no-automagic-fftw.patch b/media-video/pipewire/pipewire-1.4.6-no-automagic-fftw.patch
similarity index 100%
rename from media-video/pipewire-1.4.9/pipewire-1.4.6-no-automagic-fftw.patch
rename to media-video/pipewire/pipewire-1.4.6-no-automagic-fftw.patch
diff --git a/media-video/wireplumber-0.5.12/wireplumber-0.5.6-config-disable-sound-server-parts.patch b/media-video/wireplumber/wireplumber-0.5.6-config-disable-sound-server-parts.patch
similarity index 100%
rename from media-video/wireplumber-0.5.12/wireplumber-0.5.6-config-disable-sound-server-parts.patch
rename to media-video/wireplumber/wireplumber-0.5.6-config-disable-sound-server-parts.patch
diff --git a/net-misc/rsync-3.4.1/rsyncd.conf b/net-misc/rsync/rsyncd.conf
similarity index 100%
rename from net-misc/rsync-3.4.1/rsyncd.conf
rename to net-misc/rsync/rsyncd.conf
diff --git a/sci-libs/fftw-3.3.10/fftw-3.3.10-fixup-cmake-optional.patch b/sci-libs/fftw/fftw-3.3.10-fixup-cmake-optional.patch
similarity index 100%
rename from sci-libs/fftw-3.3.10/fftw-3.3.10-fixup-cmake-optional.patch
rename to sci-libs/fftw/fftw-3.3.10-fixup-cmake-optional.patch
diff --git a/sys-apps/dbus-1.16.2/dbus-reload.HOOK b/sys-apps/dbus/dbus-reload.HOOK
similarity index 100%
rename from sys-apps/dbus-1.16.2/dbus-reload.HOOK
rename to sys-apps/dbus/dbus-reload.HOOK
diff --git a/sys-apps/help2man-1.49.3/help2man-1.46.1-linguas.patch b/sys-apps/help2man/help2man-1.46.1-linguas.patch
similarity index 100%
rename from sys-apps/help2man-1.49.3/help2man-1.46.1-linguas.patch
rename to sys-apps/help2man/help2man-1.46.1-linguas.patch
diff --git a/sys-apps/shadow-4.18.0/pam.d-include/chpasswd b/sys-apps/shadow/pam.d-include/chpasswd
similarity index 100%
rename from sys-apps/shadow-4.18.0/pam.d-include/chpasswd
rename to sys-apps/shadow/pam.d-include/chpasswd
diff --git a/sys-apps/shadow-4.18.0/pam.d-include/passwd b/sys-apps/shadow/pam.d-include/passwd
similarity index 100%
rename from sys-apps/shadow-4.18.0/pam.d-include/passwd
rename to sys-apps/shadow/pam.d-include/passwd
diff --git a/sys-apps/shadow-4.18.0/pam.d-include/shadow b/sys-apps/shadow/pam.d-include/shadow
similarity index 100%
rename from sys-apps/shadow-4.18.0/pam.d-include/shadow
rename to sys-apps/shadow/pam.d-include/shadow
diff --git a/sys-apps/shadow-4.18.0/pam.d-include/shadow-r1 b/sys-apps/shadow/pam.d-include/shadow-r1
similarity index 100%
rename from sys-apps/shadow-4.18.0/pam.d-include/shadow-r1
rename to sys-apps/shadow/pam.d-include/shadow-r1
diff --git a/sys-apps/shadow-4.18.0/useradd b/sys-apps/shadow/useradd
similarity index 100%
rename from sys-apps/shadow-4.18.0/useradd
rename to sys-apps/shadow/useradd
diff --git a/sys-apps/systemd-257.8/20-systemd-sysusers.HOOK b/sys-apps/systemd/20-systemd-sysusers.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/20-systemd-sysusers.HOOK
rename to sys-apps/systemd/20-systemd-sysusers.HOOK
diff --git a/sys-apps/systemd-257.8/21-systemd-tmpfiles.HOOK b/sys-apps/systemd/21-systemd-tmpfiles.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/21-systemd-tmpfiles.HOOK
rename to sys-apps/systemd/21-systemd-tmpfiles.HOOK
diff --git a/sys-apps/systemd-257.8/25-systemd-binfmt.HOOK b/sys-apps/systemd/25-systemd-binfmt.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/25-systemd-binfmt.HOOK
rename to sys-apps/systemd/25-systemd-binfmt.HOOK
diff --git a/sys-apps/systemd-257.8/25-systemd-catalog.HOOK b/sys-apps/systemd/25-systemd-catalog.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/25-systemd-catalog.HOOK
rename to sys-apps/systemd/25-systemd-catalog.HOOK
diff --git a/sys-apps/systemd-257.8/25-systemd-hwdb.HOOK b/sys-apps/systemd/25-systemd-hwdb.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/25-systemd-hwdb.HOOK
rename to sys-apps/systemd/25-systemd-hwdb.HOOK
diff --git a/sys-apps/systemd-257.8/30-systemd-daemon-reload-system.HOOK b/sys-apps/systemd/30-systemd-daemon-reload-system.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/30-systemd-daemon-reload-system.HOOK
rename to sys-apps/systemd/30-systemd-daemon-reload-system.HOOK
diff --git a/sys-apps/systemd-257.8/30-systemd-daemon-reload-user.HOOK b/sys-apps/systemd/30-systemd-daemon-reload-user.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/30-systemd-daemon-reload-user.HOOK
rename to sys-apps/systemd/30-systemd-daemon-reload-user.HOOK
diff --git a/sys-apps/systemd-257.8/35-systemd-udev-reload.HOOK b/sys-apps/systemd/35-systemd-udev-reload.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/35-systemd-udev-reload.HOOK
rename to sys-apps/systemd/35-systemd-udev-reload.HOOK
diff --git a/sys-apps/systemd-257.8/35-systemd-update.HOOK b/sys-apps/systemd/35-systemd-update.HOOK
similarity index 100%
rename from sys-apps/systemd-257.8/35-systemd-update.HOOK
rename to sys-apps/systemd/35-systemd-update.HOOK
diff --git a/sys-apps/xdg-desktop-portal-1.20.3/xdg-desktop-portal-1.20.0-optional-gstreamer.patch b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
similarity index 100%
rename from sys-apps/xdg-desktop-portal-1.20.3/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
rename to sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.20.0-optional-gstreamer.patch
diff --git a/sys-auth/polkit-126/sysuser-polkit.conf b/sys-auth/polkit/sysuser-polkit.conf
similarity index 100%
rename from sys-auth/polkit-126/sysuser-polkit.conf
rename to sys-auth/polkit/sysuser-polkit.conf
diff --git a/sys-auth/seatd-0.9.1/sysuser.conf b/sys-auth/seatd/sysuser.conf
similarity index 100%
rename from sys-auth/seatd-0.9.1/sysuser.conf
rename to sys-auth/seatd/sysuser.conf
diff --git a/sys-kernel/linux-firmware-20250808/linux-firmware-copy-firmware-r9.patch b/sys-kernel/linux-firmware/linux-firmware-copy-firmware-r9.patch
similarity index 100%
rename from sys-kernel/linux-firmware-20250808/linux-firmware-copy-firmware-r9.patch
rename to sys-kernel/linux-firmware/linux-firmware-copy-firmware-r9.patch
diff --git a/sys-libs/libseccomp-2.6.0/libseccomp-2.5.3-skip-valgrind.patch b/sys-libs/libseccomp/libseccomp-2.5.3-skip-valgrind.patch
similarity index 100%
rename from sys-libs/libseccomp-2.6.0/libseccomp-2.5.3-skip-valgrind.patch
rename to sys-libs/libseccomp/libseccomp-2.5.3-skip-valgrind.patch
diff --git a/sys-libs/pam-1.7.1-r1/login b/sys-libs/pam/login
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/login
rename to sys-libs/pam/login
diff --git a/sys-libs/pam-1.7.1-r1/other b/sys-libs/pam/other
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/other
rename to sys-libs/pam/other
diff --git a/sys-libs/pam-1.7.1-r1/passwd b/sys-libs/pam/passwd
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/passwd
rename to sys-libs/pam/passwd
diff --git a/sys-libs/pam-1.7.1-r1/su b/sys-libs/pam/su
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/su
rename to sys-libs/pam/su
diff --git a/sys-libs/pam-1.7.1-r1/system-auth b/sys-libs/pam/system-auth
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/system-auth
rename to sys-libs/pam/system-auth
diff --git a/sys-libs/pam-1.7.1-r1/system-local-login b/sys-libs/pam/system-local-login
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/system-local-login
rename to sys-libs/pam/system-local-login
diff --git a/sys-libs/pam-1.7.1-r1/system-login b/sys-libs/pam/system-login
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/system-login
rename to sys-libs/pam/system-login
diff --git a/sys-libs/pam-1.7.1-r1/system-remote-login b/sys-libs/pam/system-remote-login
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/system-remote-login
rename to sys-libs/pam/system-remote-login
diff --git a/sys-libs/pam-1.7.1-r1/system-services b/sys-libs/pam/system-services
similarity index 100%
rename from sys-libs/pam-1.7.1-r1/system-services
rename to sys-libs/pam/system-services
diff --git a/sys-process/btop-1.4.6/cattpuccin-mocha-tokyo.theme b/sys-process/btop/cattpuccin-mocha-tokyo.theme
similarity index 100%
rename from sys-process/btop-1.4.6/cattpuccin-mocha-tokyo.theme
rename to sys-process/btop/cattpuccin-mocha-tokyo.theme
diff --git a/test/just-hook-2.0/test.HOOK b/test/just-hook/test.HOOK
similarity index 100%
rename from test/just-hook-2.0/test.HOOK
rename to test/just-hook/test.HOOK
diff --git a/x11-libs/gdk-pixbuf-2.42.12/gdk-pixbuf-query-loaders.HOOK b/x11-libs/gdk-pixbuf/gdk-pixbuf-query-loaders.HOOK
similarity index 100%
rename from x11-libs/gdk-pixbuf-2.42.12/gdk-pixbuf-query-loaders.HOOK
rename to x11-libs/gdk-pixbuf/gdk-pixbuf-query-loaders.HOOK
diff --git a/x11-libs/gtk+-3.24.51/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch b/x11-libs/gtk+/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
similarity index 100%
rename from x11-libs/gtk+-3.24.51/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
rename to x11-libs/gtk+/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
diff --git a/x11-libs/gtk+-3.24.51/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/gtk+-3.24.36-update-icon-cache.patch
similarity index 100%
rename from x11-libs/gtk+-3.24.51/gtk+-3.24.36-update-icon-cache.patch
rename to x11-libs/gtk+/gtk+-3.24.36-update-icon-cache.patch
diff --git a/x11-libs/gtk+-3.24.51/gtk-query-immodules-3.0.HOOK b/x11-libs/gtk+/gtk-query-immodules-3.0.HOOK
similarity index 100%
rename from x11-libs/gtk+-3.24.51/gtk-query-immodules-3.0.HOOK
rename to x11-libs/gtk+/gtk-query-immodules-3.0.HOOK
diff --git a/x11-misc/shared-mime-info-2.4/update-mime-database.HOOK b/x11-misc/shared-mime-info/update-mime-database.HOOK
similarity index 100%
rename from x11-misc/shared-mime-info-2.4/update-mime-database.HOOK
rename to x11-misc/shared-mime-info/update-mime-database.HOOK
diff --git a/x11-misc/xdg-utils-1.2.1/xdg-utils-1.2.1-qtpaths.patch b/x11-misc/xdg-utils/xdg-utils-1.2.1-qtpaths.patch
similarity index 100%
rename from x11-misc/xdg-utils-1.2.1/xdg-utils-1.2.1-qtpaths.patch
rename to x11-misc/xdg-utils/xdg-utils-1.2.1-qtpaths.patch
diff --git a/x11-misc/xdg-utils-1.2.1/xdg-utils-1.2.1-xdg-mime-default.patch b/x11-misc/xdg-utils/xdg-utils-1.2.1-xdg-mime-default.patch
similarity index 100%
rename from x11-misc/xdg-utils-1.2.1/xdg-utils-1.2.1-xdg-mime-default.patch
rename to x11-misc/xdg-utils/xdg-utils-1.2.1-xdg-mime-default.patch
diff --git a/x11-themes/Meow-catppuccin-icon-theme-20250210/Meow-catppuccin.tar.gz b/x11-themes/Meow-catppuccin-icon-theme/Meow-catppuccin.tar.gz
similarity index 100%
rename from x11-themes/Meow-catppuccin-icon-theme-20250210/Meow-catppuccin.tar.gz
rename to x11-themes/Meow-catppuccin-icon-theme/Meow-catppuccin.tar.gz
diff --git a/x11-themes/gnome-themes-standard-3.28/gnome-themes-standard-3.22.2-exclude-engine.patch b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2-exclude-engine.patch
similarity index 100%
rename from x11-themes/gnome-themes-standard-3.28/gnome-themes-standard-3.22.2-exclude-engine.patch
rename to x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2-exclude-engine.patch