fix after S rework

dynamic-layers/meta-qt6/recipes-qt/adwaita-qt/adwaita-qt_1.4.2.bb

@@ -11,7 +11,6 @@ EXTRA_OECMAKE += "-DUSE_QT6=ON"
 
 SRC_URI = "git://github.com/FedoraQt/adwaita-qt.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 SRCREV = "3807292acee096459a73732f663544916d9eb0e5"
 
 FILES:${PN} += "${libdir}/plugins/styles/adwaita.so"

dynamic-layers/meta-qt6/recipes-qt/btrfs-assistant/btrfs-assistant_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bf7e2ce7c2a6b6b42b34714d917ee2c7"
 SRC_URI = "git://gitlab.com/btrfs-assistant/btrfs-assistant.git;protocol=https;nobranch=1"
 SRCREV = "a8267fade8e9d7dcea83dc944ab7930a21793c14"
 PV = "2.1.1"
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtbase-native qttools-native  qtwayland qtwayland-native btrfs-tools"
 RRECOMMENDS:${PN} = "snapper qadwaitadecorations"

dynamic-layers/meta-qt6/recipes-qt/hyprland-qt-support/hyprland-qt-support_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 SRC_URI = "git://github.com/hyprwm/hyprland-qt-support.git;protocol=https;branch=main"
 
 SRCREV = "767e884cda77bea293982c2116333308930d7800"
-S = "${WORKDIR}/git"
 PV = "0.1.0"
 
 DEPENDS = "qtbase qtquick3d qttools-native qtwayland qtwayland-native hyprlang"

dynamic-layers/meta-qt6/recipes-qt/hyprland-qtutils/hyprland-qtutils_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 SRC_URI = "git://github.com/hyprwm/hyprland-qtutils.git;protocol=https;branch=main"
 
 SRCREV = "4be1d324faf8d6e82c2be9f8510d299984dfdd2e"
-S = "${WORKDIR}/git"
 PV = "0.1.4"
 
 DEPENDS = "qtbase qtquick3d qttools-native qtwayland qtwayland-native hyprutils"

dynamic-layers/meta-qt6/recipes-qt/hyprland-welcome/hyprland-welcome_git.bb

@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/hyprwm/hyprland-welcome.git;protocol=https;branch=ma
 
 PV = "0.0.1"
 SRCREV = "51561c00288775ad7afc20f47783bb068093ca5a"
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase"
 RDEPENDS:${PN} = "qtwayland"

dynamic-layers/meta-qt6/recipes-qt/hyprpolkitagent/hyprpolkitagent_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 SRC_URI = "git://github.com/hyprwm/hyprpolkitagent.git;protocol=https;branch=main"
 
 SRCREV = "0f0d412d4f8479c6f67f39bd6941b2f07343ff66"
-S = "${WORKDIR}/git"
 PV = "0.1.2"
 
 DEPENDS = "qtbase qtquick3d qttools-native qtwayland qtwayland-native polkit polkit-qt hyprutils"

dynamic-layers/meta-qt6/recipes-qt/hyprsysteminfo/hyprsysteminfo_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 SRC_URI = "git://github.com/hyprwm/hyprsysteminfo.git;protocol=https;branch=main"
 
 SRCREV = "17f041e2d539bd63ec116a77236ea37a17c6b3e6"
-S = "${WORKDIR}/git"
 PV = "0.1.3"
 
 DEPENDS = "qtbase qtquick3d qttools-native hyprutils qtwayland qtwayland-native"

dynamic-layers/meta-qt6/recipes-qt/qAdwaitaDecorations/qadwaitadecorations_0.1.6.bb

@@ -16,7 +16,6 @@ EXTRA_OECMAKE += "-DUSE_QT6=ON"
 
 SRC_URI = "git://github.com/FedoraQt/QAdwaitaDecorations.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 SRCREV = "d70c24a745e2f2195222400f901cb3a9296f28b5"
 
 FILES:${PN} += "${libdir}"

dynamic-layers/meta-qt6/recipes-qt/qgnomeplatform/qgnomeplatform_0.9.2.bb

@@ -23,7 +23,6 @@ EXTRA_OECMAKE += "-DUSE_QT6=ON"
 
 SRC_URI = "git://github.com/FedoraQt/QGnomePlatform.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 SRCREV = "71f1fe577b5b665bc19c7ab3736ffe8387fa52ee"
 
 FILES:${PN} += "${libdir} ${datadir}"

dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/hyprland-share-picker.bb

@@ -14,6 +14,6 @@ inherit qt6-cmake features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl wayland"
 
-S = "${WORKDIR}/git/hyprland-share-picker"
+S = "${UNPACKDIR}/${BP}/hyprland-share-picker"
 
 

dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb

@@ -29,7 +29,6 @@ RCONFLICTS:${PN} = "xdg-desktop-portal-wlr xdg-desktop-portal-gnome"
 inherit meson pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "opengl wayland"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"

recipes-core/elogind/elogind_git.bb

@@ -20,7 +20,6 @@ DEPENDS += " \
 "
 
 
-S = "${WORKDIR}/git"
 PV = "255.5"
 SRCREV = "a5d0503e56596e4495407e6bbdd89ec2cf1fbe98"
 

recipes-devtools/python/python-xlib_git.bb

@@ -19,7 +19,6 @@ RDEPENDS:${PN} = " \
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.31"
 SRCREV = "a734526ed33fe446396e32649e8895dde679f52c"
 

recipes-devtools/python/python3-chevron_git.bb

@@ -6,7 +6,6 @@ SRC_URI = "git://github.com/noahmorrison/chevron;protocol=https;branch=main"
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.13.1"
 SRCREV = "d7f6bd54a296620068570fb83b91a43958ee5e37"
 

recipes-devtools/python/python3-colorthief_git.bb

@@ -10,7 +10,6 @@ RDEPENDS:${PN} = "python3-pillow"
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.2.1"
 SRCREV = "3e96a52abfa34323c798a691b2970c6df3059fda"
 

recipes-devtools/python/python3-geopy_git.bb

@@ -12,7 +12,6 @@ RDEPENDS:${PN} = " \
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "2.4.1"
 SRCREV = "f495974c32a7a7b1eb433e7b8c87166e96375c32"
 

recipes-devtools/python/python3-imageio-ffmpeg_git.bb

@@ -6,7 +6,6 @@ SRC_URI = "git://github.com/imageio/imageio-ffmpeg.git;protocol=https;branch=mai
 
 inherit python_setuptools_build_meta
 
-S = "${WORKDIR}/git"
 PV = "0.6.0"
 SRCREV = "ae47d8028c237ca5507ceef1b843ee427b442887"
 

recipes-devtools/python/pywayfire_git.bb

@@ -8,4 +8,3 @@ SRC_URI = "git://github.com/WayfireWM/pywayfire.git;protocol=https;branch=main"
 SRCREV = "af2d7a187c8479c114102d6c9413ad25316b199a"
 PV = "0.3"
 
-S = "${WORKDIR}/git"

recipes-devtools/stb/stb_git.bb

@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fb994481c55623ef338885280e676f3b"
 
 SRC_URI = "git://github.com/nothings/stb.git;protocol=https;branch=master"
 SRCREV = "013ac3beddff3dbffafd5177e7972067cd2b5083"
-S = "${WORKDIR}/git"
 
 do_install() {
 	install -d ${D}${includedir}/stb

recipes-extended/autotiling/autotiling-rs_git.bb

@@ -63,7 +63,6 @@ SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001
 
 inherit rust cargo
 
-S = "${WORKDIR}/git"
 PV = "0.1.3"
 SRCREV = "1f7a08c6a87b06f13744962f757e6bdcc6e3fc89"
 

recipes-extended/autotiling/autotiling_git.bb

@@ -12,7 +12,6 @@ RDEPENDS:${PN} = "python-i3ipc"
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "1.9.3"
 SRCREV = "b6a8b9af52892a04d75118f79d2aad4edc3df963"
 

recipes-extended/callaudiod/callaudiod_git.bb

@@ -10,7 +10,6 @@ inherit meson pkgconfig
 
 SRC_URI = "git://gitlab.com/mobian1/callaudiod.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "0.1.10"
 SRCREV = "56831297817afb6b30062b7cee3e40225ac39cac"
 

recipes-extended/date/date_git.bb

@@ -9,7 +9,6 @@ SRC_URI = " \
 	file://pkgconfig.patch \
 "
 
-S = "${WORKDIR}/git"
 PV = "3.0.1"
 SRCREV = "22ceabf205d8d678710a43154da5a06b701c5830"
 

recipes-extended/ddcutil/ddcutil_git.bb

@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/rockowitz/ddcutil.git;protocol=https;branch=master"
 
 DEPENDS = "i2c-tools glib-2.0 kmod jansson"
 
-S = "${WORKDIR}/git"
 PV = "2.1.4"
 SRCREV = "ca610f91d5483e19bfdae88bb0094973cc81fc95"
 

recipes-extended/fcft/fcft_git.bb

@@ -19,7 +19,6 @@ SRC_URI = " \
 	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "
 
-S = "${WORKDIR}/git"
 PV = "3.3.1"
 SRCREV = "ccd1afaad891d77c040bad04120e9f602438fc33"
 

recipes-extended/feedbackd/feedbackd_git.bb

@@ -19,7 +19,6 @@ inherit meson pkgconfig features_check gobject-introspection vala
 
 SRC_URI = "gitsm://source.puri.sm/Librem5/feedbackd.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "0.4.0"
 SRCREV = "09396c7d64ee047849e65eb7ce1b7aa88763a902"
 

recipes-extended/font-awesome/font-awesome-otf_git.bb

@@ -10,7 +10,6 @@ SRC_URI = " \
 	git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
 "
 
-S = "${WORKDIR}/git"
 PV = "6.6.0"
 SRCREV = "37eff7fa00de26db41183a3ad8ed0e9119fbc44b"
 

recipes-extended/glaze/glaze_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4d29875d83fbbf50485c846dbbbed8"
 SRC_URI = "git://github.com/stephenberry/glaze.git;protocol=https;nobranch=1"
 SRCREV = "dfdb2ea5e878e8eff9f863b50728d860f663764f"
 PV = "4.2.3"
-S = "${WORKDIR}/git"
 
 DEPENDS += "gcc-sanitizers libeigen"
 inherit cmake

recipes-extended/gmobile/gmobile_git.bb

@@ -7,7 +7,6 @@ inherit meson pkgconfig gobject-introspection
 DEPENDS = "glib-2.0 json-glib"
 
 SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
 SRCREV = "ca8db41bb39a3117461614ae4558a3e3019a19be"
 PV = "0.2.1"
 

recipes-extended/libcall-ui/libcall-ui_git.bb

@@ -12,7 +12,6 @@ SRC_URI = " \
 	file://0001-build-as-package.patch \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.1.4"
 SRCREV = "5bb3fc2d662285681a54ce4b5bc2ed29a47c8c74"
 

recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb

@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=mast
 
 DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
 
-S = "${WORKDIR}/git"
 PV = "16.0.4"
 SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"

recipes-extended/libdbusmenu/libdbusmenu-gtk_git.bb

@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=mast
 DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native libxslt-native"
 RDEPENDS:${PN} = "libdbusmenu-glib"
 
-S = "${WORKDIR}/git"
 PV = "16.0.4"
 SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 

recipes-extended/libliftoff/libliftoff_git.bb

@@ -7,7 +7,6 @@ SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=master;pr
 
 DEPENDS = "libdrm"
 
-S = "${WORKDIR}/git"
 PV = "0.5.0"
 SRCREV = "8b08dc1c14fd019cc90ddabe34ad16596b0691f4"
 

recipes-extended/libsfdo/libsfdo_git.bb

@@ -7,7 +7,6 @@ inherit meson pkgconfig
 
 SRC_URI = "git://gitlab.freedesktop.org/vyivel/libsfdo.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "0.1.3"
 SRCREV = "b3936ed9826375334dbbaa999e7216d1b36b445b"
 

recipes-extended/libvarlink/libvarlink_git.bb

@@ -10,7 +10,6 @@ SRC_URI = " \
 
 inherit meson
 
-S = "${WORKDIR}/git"
 PV = "23"
 SRCREV = "d377218338b706ce3ff517a80fc0f1b1cfd8fe80"
 

recipes-extended/light/light_git.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "git://gitlab.com/dpeukert/light;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 PV = "1.2.2"
 SRCREV = "2a54078cbe3814105ee4f565f451b1b5947fbde0"
 

recipes-extended/pamixer/pamixer_git.bb

@@ -9,7 +9,6 @@ SRC_URI = " \
 
 DEPENDS = "pulseaudio cxxopts"
 
-S = "${WORKDIR}/git"
 PV = "1.6"
 SRCREV = "af5e13eafdb00ba342625d7d2131bec4729d2bc3"
 

recipes-extended/sofia-sip/sofia-sip_git.bb

@@ -7,7 +7,6 @@ DEPENDS = "glib-2.0 dbus-glib openssl"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc"
 
-S = "${WORKDIR}/git"
 SRCREV = "6198851a610b7889c17e2d98fb84617bc1dd7aec"
 PV = "1.13.17"
 

recipes-extended/tllist/tllist_git.bb

@@ -10,7 +10,6 @@ SRC_URI = " \
 	git://codeberg.org/dnkl/tllist.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 PV = "1.1.0"
 SRCREV = "8dcb0725c73eee9e350f41a921faf0bcd2ab9920"
 

recipes-extended/utf8proc/utf8proc_git.bb

@@ -9,7 +9,6 @@ SRC_URI = " \
 	git://github.com/JuliaStrings/utf8proc.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 PV = "2.8.0"
 SRCREV = "1cb28a66ca79a0845e99433fd1056257456cef8b"
 

recipes-extended/uwsm/uwsm_git.bb

@@ -14,7 +14,6 @@ SRC_URI = " \
 SRCREV = "7bb627b78c69c890417146150733f9728b227c67"
 PV = "0.20.5"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native"

recipes-extended/xcur2png/xcur2png_git.bb

@@ -10,7 +10,6 @@ SRC_URI = " \
 	file://0001-fix-wrong-math.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "f582d648f37a9ed2de0c8650947487af8a54d3ad"
 PV = "0.7.1"
 

recipes-graphics/aalib/aalib_1.4.0.bb

@@ -7,7 +7,7 @@ DEPENDS = "ncurses"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-S = "${WORKDIR}/aalib-1.4.0"
+S = "${UNPACKDIR}/aalib-1.4.0"
 
 SRC_URI = " \
 	${SOURCEFORGE_MIRROR}/aa-project/aalib-1.4rc5.tar.gz \

recipes-graphics/mpvpaper/mpvpaper_git.bb

@@ -12,7 +12,6 @@ DEPENDS = " \
 	wayland-protocols \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "7342c53343bed06b22456eb45182e40e0f80ea83"
 PV = "1.8"
 

recipes-gtk/calls/calls_git.bb

@@ -27,7 +27,6 @@ DEPENDS = " \
 
 SRC_URI = "gitsm://gitlab.gnome.org/GNOME/calls.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 SRCREV = "11ce0eae72f6f6eeb1c1de2cfe71046087368121"
 PV = "47.0"
 

recipes-gtk/eww/eww_git.bb

@@ -22,7 +22,6 @@ SRC_URI += "git://github.com/elkowar/eww.git;protocol=https;nobranch=1"
 
 PV = "0.6.0+git"
 SRCREV = "0e409d4a52bd3d37d0aa0ad4e2d7f3b9a8adcdb7"
-S = "${WORKDIR}/git"
 
 inherit cargo rust cargo-update-recipe-crates pkgconfig
 

recipes-gtk/gbar/gbar_git.bb

@@ -7,7 +7,6 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = "git://github.com/scorpion-26/gBar.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 SRCREV = "b1e2c2ed26a62058c502db3a03ac615f2567942e"
 
 DEPENDS += " \

recipes-gtk/granite/granite6_git.bb

@@ -14,7 +14,6 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
 SRC_URI = "git://github.com/elementary/granite.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "6.2.0"
 SRCREV = "4ab145c28bb3db6372fe519e8bd79c645edfcda3"
 

recipes-gtk/granite/granite_git.bb

@@ -15,7 +15,6 @@ REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
 SRC_URI = "git://github.com/elementary/granite.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "7.4.0"
 SRCREV = "949703f8649013695c6d32eb84a6b541ac0da4db"
 

recipes-gtk/gtk-layer-shell/gtk-layer-shell_git.bb

@@ -19,7 +19,6 @@ SRC_URI = " \
 	git://github.com/wmww/gtk-layer-shell.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.9.0"
 SRCREV = "984dbbfc1d64c763e15a56dff662af267b551f68"
 

recipes-gtk/gtk-layer-shell/gtk4-layer-shell_git.bb

@@ -19,7 +19,6 @@ SRC_URI = " \
 	git://github.com/wmww/gtk4-layer-shell.git;protocol=https;branch=main \
 "
 
-S = "${WORKDIR}/git"
 PV = "1.0.4"
 SRCREV = "536ff516ed68b9bb34afc4c07f942a54b2b4b03f"
 

recipes-gtk/gtklock/gtk-session-lock_git.bb

@@ -18,7 +18,6 @@ DEPENDS = " \
 
 SRC_URI = "git://github.com/Cu3PO42/gtk-session-lock.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "0.2.0"
 SRCREV = "b3544f361498d716b1ceef1ad6ac9bdf024bf782"
 

recipes-gtk/gtklock/gtklock_git.bb

@@ -20,7 +20,6 @@ DEPENDS = " \
 
 SRC_URI = "git://github.com/jovanlanik/gtklock.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "4.0.0"
 SRCREV = "66321fb2bf0d5869d779e7ac6b4d8d9c272ea707"
 

recipes-gtk/iwgtk/iwgtk_git.bb

@@ -13,7 +13,6 @@ inherit meson gtk-icon-cache pkgconfig
 
 SRC_URI = "git://github.com/J-Lentz/iwgtk.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "0.9"
 SRCREV = "9542ea7cb209c6692c83be95e8ab2826f5560289"
 

recipes-gtk/libgnome-volume-control/libgnome-volume-control_git.bb

@@ -16,7 +16,6 @@ SRC_URI = " \
 	file://0001-build-as-package.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6"
 
 do_install:append() {

recipes-gtk/nwg-shell/azote-palettes_git.bb

@@ -15,7 +15,6 @@ RDEPENDS:${PN} = " \
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "1.0.2"
 SRCREV = "a4116c840db361890737cb0eb5ebbe378f03e9c1"
 

recipes-gtk/nwg-shell/azote_git.bb

@@ -23,7 +23,6 @@ RDEPENDS:${PN} = " \
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "1.16.0"
 SRCREV = "2ae47b79b555c9c1152683efff8cbc7a7fac7d6e"
 

recipes-gtk/nwg-shell/ddcpopup_git.bb

@@ -15,8 +15,7 @@ GO_IMPORT = "github.com/nwg-piotr/ddcpopup.git"
 SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 PV = "0.1"
 SRCREV = "8fab5132e49e08a1eeaa7a0dd3350d06f4399200"
-S = "${WORKDIR}/sources"
+S = "${UNPACKDIR}/${BP}"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/gopsuinfo_git.bb

@@ -7,8 +7,7 @@ GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
 SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
 PV = "0.1.5"
 SRCREV = "60e4f83b6c4d84955e0a07f7bdc63d8089b4ba1e"
-S = "${WORKDIR}/sources"
+S = "${UNPACKDIR}/${BP}"
-UNPACKDIR = "${S}"
 
 inherit go go-mod
 

recipes-gtk/nwg-shell/nwg-bar_git.bb

@@ -11,12 +11,10 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-bar.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.1.6"
 SRCREV = "c4da7d817747ad2f8cfda332d95bd4fc55eb6b34"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/nwg-displays_git.bb

@@ -16,7 +16,6 @@ RDEPENDS:${PN} = "\
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.3.25"
 SRCREV = "e2fdb413dbfccecf795039209a092c321636a419"
 

recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb

@@ -10,12 +10,10 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.4.7"
 SRCREV = "ff1b4794255ed7501065982b067b3dbea0ae46ff"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/nwg-dock_git.bb

@@ -10,12 +10,10 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-dock.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.4.1"
 SRCREV = "3f010171ab8596552efdc2f03d5f09c0042bbb64"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/nwg-drawer_git.bb

@@ -11,12 +11,10 @@ RDEPENDS:${PN} = "go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-drawer.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.7.0"
 SRCREV = "a1c6c9e9782c6ce503bab453aeb91f67110d0741"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/nwg-hello_git.bb

@@ -15,7 +15,6 @@ RRECOMMENDS:${PN} = "gnome-themes-extra"
 
 inherit setuptools3 useradd
 
-S = "${WORKDIR}/git"
 PV = "0.2.0"
 SRCREV = "aa6a9e4a9024dba8ebaa98af53df82b3c19d379a"
 

recipes-gtk/nwg-shell/nwg-icon-picker_git.bb

@@ -13,7 +13,6 @@ RDEPENDS:${PN} = " \
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.0.1"
 SRCREV = "cd32e72ffb3c2fb41a3f7189981376cdad6af976"
 

recipes-gtk/nwg-shell/nwg-launchers_git.bb

@@ -28,7 +28,6 @@ PACKAGECONFIG ?= " \
 SRC_URI = "git://github.com/nwg-piotr/nwg-launchers.git;protocol=https;branch=master"
 SRCREV = "c4d8d369782d32becfe8a8105abec9b61119a629"
 PV = "0.7.1.1"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 

recipes-gtk/nwg-shell/nwg-look_git.bb

@@ -7,11 +7,9 @@ RDEPENDS:${PN} = "xcur2png go-runtime"
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-look"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "1282e6422491ea912ac22c5f532277eb011cc5bb"
 PV = "1.0.6"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig gtk-icon-cache
 

recipes-gtk/nwg-shell/nwg-menu_git.bb

@@ -15,12 +15,10 @@ RRECOMMENDS:${PN} = " \
 
 GO_IMPORT = "github.com/nwg-piotr/nwg-menu.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 PV = "0.1.7"
 SRCREV = "5806a1bb8b916478a5b25aec2a0c3cdcb071de0b"
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 

recipes-gtk/nwg-shell/nwg-panel_git.bb

@@ -19,7 +19,6 @@ RDEPENDS:${PN} = "\
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.10.0"
 SRCREV = "a879acb59f737837ce3be62a0922a9ea651cab54"
 

recipes-gtk/nwg-shell/nwg-shell-config_git.bb

@@ -16,7 +16,6 @@ RDEPENDS:${PN} = "\
 
 inherit setuptools3
 
-S = "${WORKDIR}/git"
 PV = "0.5.58"
 SRCREV = "145bee8aa853331c63b12c7e486cce72973b7f30"
 

recipes-gtk/nwg-shell/nwg-shell-wallpapers_git.bb

@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032"
 
 SRC_URI = "git://github.com/nwg-piotr/nwg-shell-wallpapers.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "1.5"
 SRCREV = "a20ad99467e9d1a9427efd5dccfd58d440db96c2"
 

recipes-gtk/nwg-shell/nwg-wrapper_git.bb

@@ -11,7 +11,6 @@ RDEPENDS:${PN} = "python3-pygobject"
 
 inherit setuptools3 gobject-introspection
 
-S = "${WORKDIR}/git"
 PV = "0.1.2"
 SRCREV = "9c1b0669dd894b6209a3130169956c755154b055"
 

recipes-gtk/nwg-shell/nwgocc_git.bb

@@ -17,8 +17,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.0.1"
 SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
-S = "${WORKDIR}/sources"
+S = "${UNPACKDIR}/${BP}"
-UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig gtk-icon-cache
 

recipes-gtk/phosh/phosh_git.bb

@@ -55,7 +55,6 @@ SRC_URI = " \
     file://0001-meson-build-without-subproject-wrap.patch \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.45.0"
 SRCREV = "2ac03f70f8d42b729def38e282f5b600286655fb"
 

recipes-gtk/sirula/sirula_git.bb

@@ -214,5 +214,4 @@ DEPENDS = " \
 inherit cargo pkgconfig
 
 SRCREV = "70b5ce1936c819f4e5c8674e90145e5e7badcfa8"
-S = "${WORKDIR}/git"
 PV = "1.0.1"

recipes-gtk/squeekboard/squeekboard_git.bb

@@ -30,7 +30,6 @@ SRC_URI += "\
 
 PV = "1.43.1"
 SRCREV = "15569da021824b6da5c337ba9875c5002158f43e"
-S = "${WORKDIR}/git"
 
 inherit cargo meson rust pkgconfig cargo-update-recipe-crates
 

recipes-gtk/srain/srain_git.bb

@@ -22,7 +22,6 @@ inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspec
 
 SRC_URI = "git://github.com/SrainApp/srain.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "1.8.1"
 SRCREV = "693c81b11052b6e287b5a734352dd813ef2b71aa"
 

recipes-gtk/swappy/swappy_git.bb

@@ -17,7 +17,6 @@ SRC_URI = " \
     git://github.com/jtheoof/swappy.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 PV = "1.5.1"
 SRCREV = "a996b2cec65aadd04ded780f141b02c5bdfbeb32"
 

recipes-gtk/swaync/swaync_git.bb

@@ -19,7 +19,6 @@ SRC_URI = " \
 	git://github.com/ErikReider/SwayNotificationCenter.git;protocol=https;nobranch=1 \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.10.1"
 SRCREV = "4275fa3915c12ad2731ff78027188b4b7ceaad64"
 

recipes-gtk/swayosd/swayosd_git.bb

@@ -158,7 +158,6 @@ SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5c
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 
-S = "${WORKDIR}/git"
 PV = "0.1"
 SRCREV = "d0d70720a1af3dfa6c4298c8db2807a37f143056"
 

recipes-gtk/swaysettings/swaysettings_git.bb

@@ -20,7 +20,6 @@ DEPENDS = " \
 
 SRC_URI = "git://github.com/ErikReider/SwaySettings.git;protocol=https;nobranch=1"
 
-S = "${WORKDIR}/git"
 PV = "0.4.0"
 SRCREV = "8fb6210ad123654f3988cb8f3f59ab629bb0a747"
 

recipes-gtk/waybar/waybar_git.bb

@@ -13,7 +13,6 @@ SRC_URI = " \
 	git://github.com/Alexays/Waybar.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.12.0"
 SRCREV = "8490a1d9b9a5c8770dd63e9faca0a5e01acedcae"
 

recipes-gtk/waypaper/waypaper_git.bb

@@ -6,7 +6,6 @@ SRC_URI = "git://github.com/anufrievroman/waypaper.git;protocol=https;branch=mai
 
 inherit python_setuptools_build_meta
 
-S = "${WORKDIR}/git"
 PV = "2.5"
 SRCREV = "3ce8658745917588711d6f1df4f183c34628b76b"
 

recipes-support/asciinema/asciinema_git.bb

@@ -13,6 +13,5 @@ RDEPENDS:${PN} = " \
 
 inherit python_setuptools_build_meta
 
-S = "${WORKDIR}/git"
 PV = "2.3.0"
 SRCREV = "791916d87d06b25ded09fefde33288d5c069c96d"

recipes-support/clipboard/clipboard_git.bb

@@ -13,7 +13,6 @@ DEPENDS += " \
 
 SRC_URI = "git://github.com/Slackadays/Clipboard.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 PV = "0.10.1"
 SRCREV = "cf596b0b2403d1d184d509a2c7ddd0f3c11040b9"
 

recipes-support/dmenu/dmenu-wayland_git.bb

@@ -15,7 +15,6 @@ DEPENDS = " \
 	libxkbcommon \
 "
 
-S = "${WORKDIR}/git"
 PV = "0.1+${SRCREV}"
 SRCREV = "304c8e917651ee02b16ebf0b7097a5c53fa2236b"
 

recipes-support/fnott/fnott_git.bb

@@ -26,7 +26,6 @@ DEPENDS = " \
 
 inherit meson pkgconfig features_check
 
-S = "${WORKDIR}/git"
 PV = "1.7.1"
 SRCREV = "27a6fcac306836340e08592eeb6b6d0a912926f7"
 

recipes-support/foot/foot_git.bb

@@ -23,7 +23,6 @@ SRC_URI = " \
 	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "
 
-S = "${WORKDIR}/git"
 PV = "1.22.3"
 SRCREV = "85c81042d2b16094677ccb383dd527a0df52e755"
 

recipes-support/fuzzel/fuzzel_git.bb

@@ -23,7 +23,6 @@ DEPENDS = " \
 	wayland-protocols \
 "
 
-S = "${WORKDIR}/git"
 PV = "1.11.1"
 SRCREV = "942a33ea1c831f38d2a01d555bd00a8ba1e6ada1"
 

recipes-support/greetd/agreety_git.bb

@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 SRC_URI += "git://git.sr.ht/~kennylevinsen/greetd;protocol=https;nobranch=1"
 SRCREV = "d70030962341a3ae7a88ecf2f7af748a5a6296d1"
-S = "${WORKDIR}/git"
 PV = "0.8.0"
 
 inherit cargo

recipes-support/greetd/greetd_git.bb

@@ -8,7 +8,6 @@ SRC_URI += " \
     file://greetd.pam \
 "
 SRCREV = "08efe60feceea8c81f9571c666880ff1e1c2e3ff"
-S = "${WORKDIR}/git"
 PV = "0.10.3"
 
 DEPENDS = "libpam"

recipes-support/greetd/gtkgreet_git.bb

@@ -15,7 +15,6 @@ inherit meson pkgconfig
 
 SRC_URI = "git://git.sr.ht/~kennylevinsen/gtkgreet;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "0.8"
 SRCREV = "7202ba6ec2334d64e1449e5f8310a63bd818d448"
 

recipes-support/greetd/regreet_git.bb

@@ -413,7 +413,6 @@ DEPENDS = "glib-2.0 gtk4 cairo graphene gdk-pixbuf"
 inherit cargo pkgconfig
 
 SRCREV = "1b3b53278d9df5b9d48d7a9f467e199856b8c313"
-S = "${WORKDIR}/git"
 PV = "0.1.1"
 
 RDEPENDS:${PN} = "cage greetd"

recipes-support/greetd/tuigreet_git.bb

@@ -451,6 +451,5 @@ SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea5
 inherit cargo rust
 
 SRCREV = "4ca29169e56d428d0f936ce7dbead7c02cedf9ab"
-S = "${WORKDIR}/git"
 PV = "0.9.1"
 

recipes-support/greetd/wlgreet_git.bb

@@ -10,7 +10,6 @@ inherit cargo pkgconfig
 
 SRC_URI = "git://git.sr.ht/~kennylevinsen/wlgreet;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "0.5.0"
 SRCREV = "e4a7d1ff7f91bc28794e2420c7651a8e296c6509"
 

recipes-support/grim/grim_git.bb

@@ -20,7 +20,6 @@ DEPENDS += " \
 
 SRC_URI = "git://git.sr.ht/~emersion/grim;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 PV = "1.4.1"
 SRCREV = "7ba46364ab95141c79e0e18093aa66597256182c"
 

recipes-support/hyprland/aquamarine/aquamarine_git.bb

@@ -24,7 +24,6 @@ DEPENDS = " \
 SRC_URI = "git://github.com/hyprwm/aquamarine.git;protocol=https;branch=main"
 SRC_URI += "file://0001-CMakeLists.txt-fix-linking-with-opengl.patch"
 
-S = "${WORKDIR}/git"
 SRCREV = "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3"
 PV = "0.8.0"
 

recipes-support/hyprland/hyprcursor/hyprcursor_git.bb

@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/hyprwm/hyprcursor.git;protocol=https;branch=main"
 
 DEPENDS = "cairo librsvg libzip hyprlang tomlplusplus"
 
-S = "${WORKDIR}/git"
 SRCREV = "028bedbc63bf87937ce8f61f2a125fcc4929a98a"
 PV = "0.1.12"
 

recipes-support/hyprland/hyprgraphics/hyprgraphics_git.bb

@@ -8,7 +8,6 @@ DEPENDS = "pixman cairo jpeg hyprutils libwebp libjxl libpng file"
 
 SRC_URI = "git://github.com/hyprwm/hyprgraphics.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 SRCREV = "c7225d73755a6c4c7c72f4d4f3925ea426e325a8"
 PV = "0.1.3"
 inherit cmake pkgconfig