feat: implement category-aware template resolution and cleanup for VUP dependencies

Author: AmarBego

.gitignore

@@ -9,6 +9,8 @@ vup/hostdir/*
 vup/hostdir/*/*
 !vup/hostdir/*/.keep
 dist/
+vup/masterdir-x86_64/
+vup/.xbps*
 
 # IDEs
 .vscode/

PATCHES.md

@@ -0,0 +1,41 @@
+# VUP Patches to void-packages
+
+This document tracks modifications made to the upstream void-packages (xbps-src) codebase.
+
+## common.sh - Category-aware template resolution
+
+**File:** `vup/common/xbps-src/shutils/common.sh`
+
+VUP uses a categorized `srcpkgs/` structure:
+```
+srcpkgs/<category>/<pkgname>/template
+```
+
+Instead of the flat upstream structure:
+```
+srcpkgs/<pkgname>/template
+```
+
+### Changes in `setup_pkg()`:
+
+1. **Early Template Resolution**: Moved template path resolution logic to run *before* sourcing environment setup scripts. This ensures `git.sh` has access to the correct path.
+
+2. **Category-aware path lookup**: Added logic to search `srcpkgs/*/<pkg>/template` if flat path is missing.
+
+3. **Variables Export**:
+   - `_srcpkg_dir`: Full path to the package directory.
+   - `XBPS_PKG_CATEGORY`: The category name (if found).
+
+4. **Updated Variables**: `FILESDIR` and `PATCHESDIR` now use `_srcpkg_dir` instead of hardcoded paths.
+
+## git.sh - Use resolved package directory
+
+**File:** `vup/common/environment/setup/git.sh`
+
+- Updated `SOURCE_DATE_EPOCH` calculation to use `_srcpkg_dir` (if set) to correctly find template files in categorized structure.
+
+## xbps-src - Category-aware triggers
+
+**File:** `vup/xbps-src`
+
+- Updated `XBPS_TRIGGERSDIR` definition to check `srcpkgs/core/xbps-triggers/files` before falling back to flat path, enabling triggers to be found in the categorized structure.

vup/common/environment/setup/git.sh

@@ -14,8 +14,9 @@ elif [ -z "${SOURCE_DATE_EPOCH}" ]; then
 		msg_error "xbps-src's BUG: SOURCE_DATE_EPOCH is undefined\n"
 	fi
 	# check if the template is under version control:
-	if [ -n "$basepkg" -a -z "$($XBPS_GIT_CMD -C ${XBPS_SRCPKGDIR}/${basepkg} ls-files template)" ]; then
-		export SOURCE_DATE_EPOCH="$(stat_mtime ${XBPS_SRCPKGDIR}/${basepkg}/template)"
+	_pkg_dir="${_srcpkg_dir:-${XBPS_SRCPKGDIR}/${basepkg}}"
+	if [ -n "$basepkg" -a -z "$($XBPS_GIT_CMD -C ${_pkg_dir} ls-files template)" ]; then
+		export SOURCE_DATE_EPOCH="$(stat_mtime ${_pkg_dir}/template)"
 	else
 		export SOURCE_DATE_EPOCH=$($XBPS_GIT_CMD -C ${XBPS_DISTDIR} cat-file commit HEAD |
 			sed -n '/^committer /{s/.*> \([0-9][0-9]*\) [-+][0-9].*/\1/p;q;}')

vup/common/xbps-src/shutils/common.sh

@@ -463,6 +463,26 @@ setup_pkg() {
 
     setup_env "$cross"
 
+    # Category-aware template resolution for VUP's categorized srcpkgs structure
+    _template_path="${XBPS_SRCPKGDIR}/${basepkg}/template"
+    if [ ! -f "$_template_path" ]; then
+        # Search in category subdirectories: srcpkgs/<category>/<pkg>/template
+        for _cat_dir in "${XBPS_SRCPKGDIR}"/*/; do
+            if [ -f "${_cat_dir}${basepkg}/template" ]; then
+                _template_path="${_cat_dir}${basepkg}/template"
+                export XBPS_PKG_CATEGORY="${_cat_dir%/}"
+                XBPS_PKG_CATEGORY="${XBPS_PKG_CATEGORY##*/}"
+                break
+            fi
+        done
+    fi
+    if [ ! -f "$_template_path" ]; then
+        msg_error "xbps-src: nonexistent file: ${XBPS_SRCPKGDIR}/${basepkg}/template\n"
+    fi
+
+    # Derive source package dir from resolved template path (supports categories)
+    _srcpkg_dir="${_template_path%/template}"
+
     # Source all sourcepkg environment setup snippets.
     # Source all subpkg environment setup snippets.
     for f in ${XBPS_COMMONDIR}/environment/setup-subpkg/*.sh; do
@@ -472,15 +492,13 @@ setup_pkg() {
         source_file "$f"
     done
 
-    if [ ! -f ${XBPS_SRCPKGDIR}/${basepkg}/template ]; then
-        msg_error "xbps-src: nonexistent file: ${XBPS_SRCPKGDIR}/${basepkg}/template\n"
-    fi
+
     if [ -n "$cross" ]; then
         export CROSS_BUILD="$cross"
-        source_file ${XBPS_SRCPKGDIR}/${basepkg}/template
+        source_file "$_template_path"
     else
         unset CROSS_BUILD
-        source_file ${XBPS_SRCPKGDIR}/${basepkg}/template
+        source_file "$_template_path"
     fi
 
 
@@ -544,8 +562,8 @@ setup_pkg() {
         fi
     done
 
-    FILESDIR=$XBPS_SRCPKGDIR/$sourcepkg/files
-    PATCHESDIR=$XBPS_SRCPKGDIR/$sourcepkg/patches
+    FILESDIR=$_srcpkg_dir/files
+    PATCHESDIR=$_srcpkg_dir/patches
     DESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}/${sourcepkg}-${version}
     PKGDESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+$XBPS_CROSS_TRIPLET/}${pkg}-${version}
 

vup/srcpkgs/programming/v-analyzer/template

@@ -0,0 +1,27 @@
+# Template file for 'v-analyzer'
+pkgname=v-analyzer
+version=0.0.4
+_beta=beta.1
+revision=1
+archs="x86_64"
+hostmakedepends="unzip vlang"
+depends="vlang"
+short_desc="IDE features for V programming language in VS Code, Vim and other editors"
+maintainer="AmarBego <begovicamar@proton.me>"
+license="MIT"
+homepage="https://github.com/vlang/v-analyzer"
+distfiles="https://github.com/vlang/v-analyzer/releases/download/${version}-${_beta}/v-analyzer-linux-x86_64.zip
+ https://raw.githubusercontent.com/vlang/v-analyzer/${version}-${_beta}/LICENSE>LICENSE.txt"
+checksum="25be4134b51ca747f132f16c64cdba49960757933899116f73adcbf764a13125
+ 45571798141f7d5d25302a5ba329de124c65b1cd7ce35ad9d1048891b3b17b1b"
+skip_extraction="LICENSE.txt"
+nopie=yes
+
+do_extract() {
+	unzip -q "${XBPS_SRCDISTDIR}/${pkgname}-${version}/v-analyzer-linux-x86_64.zip" -d "${wrksrc}"
+}
+
+do_install() {
+	vbin v-analyzer
+	vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE.txt" LICENSE
+}

vup/xbps-src

@@ -616,7 +616,11 @@ fi
 readonly XBPS_SRCPKGDIR=$XBPS_DISTDIR/srcpkgs
 readonly XBPS_COMMONDIR=$XBPS_DISTDIR/common
 readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils
-readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
+if [ -d "$XBPS_SRCPKGDIR/core/xbps-triggers/files" ]; then
+    readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/core/xbps-triggers/files
+else
+    readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
+fi
 readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles
 readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build-style
 readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec