From d675ecba3326f93883fef07d3abfa3fb06db5faa Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Wed, 21 May 2025 13:59:20 +0200
Subject: [PATCH] builtin: use absolute imports again

---
 .../repos/spack_repo/builtin/packages/abyss/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/akantu/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/amdblis/package.py  | 4 ++--
 .../repos/spack_repo/builtin/packages/amdfftw/package.py  | 4 ++--
 .../spack_repo/builtin/packages/amdlibflame/package.py    | 3 +--
 .../spack_repo/builtin/packages/amdscalapack/package.py   | 4 ++--
 .../repos/spack_repo/builtin/packages/amp/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/aocc/package.py     | 3 +--
 .../spack_repo/builtin/packages/aoflagger/package.py      | 3 +--
 .../spack_repo/builtin/packages/apple_clang/package.py    | 3 +--
 .../spack_repo/builtin/packages/apple_glu/package.py      | 4 ++--
 .../spack_repo/builtin/packages/apptainer/package.py      | 4 ++--
 .../repos/spack_repo/builtin/packages/augustus/package.py | 3 +--
 .../spack_repo/builtin/packages/automaded/package.py      | 3 +--
 .../spack_repo/builtin/packages/bcl2fastq2/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/bohrium/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/branson/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/cabana/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/caffe/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/cantera/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/care/package.py     | 3 +--
 .../spack_repo/builtin/packages/cbtf_argonavis/package.py | 3 +--
 .../builtin/packages/cbtf_argonavis_gui/package.py        | 3 +--
 .../repos/spack_repo/builtin/packages/chai/package.py     | 3 +--
 .../spack_repo/builtin/packages/channelflow/package.py    | 3 +--
 .../spack_repo/builtin/packages/cleverleaf/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/clfft/package.py    | 3 +--
 .../builtin/packages/clingo_bootstrap/package.py          | 4 ++--
 .../repos/spack_repo/builtin/packages/cntk/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/coin3d/package.py   | 3 +--
 .../spack_repo/builtin/packages/cray_mpich/package.py     | 3 +--
 .../spack_repo/builtin/packages/cray_mvapich2/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/dakota/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/dbow2/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/dealii/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/dssp/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/ecflow/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/ethminer/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/exaca/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/extrae/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/fenics/package.py   | 3 +--
 .../spack_repo/builtin/packages/foam_extend/package.py    | 8 ++++++--
 .../spack_repo/builtin/packages/foundationdb/package.py   | 3 +--
 .../spack_repo/builtin/packages/fujitsu_fftw/package.py   | 4 ++--
 .../builtin/packages/fujitsu_frontistr/package.py         | 4 ++--
 .../repos/spack_repo/builtin/packages/gnuradio/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/gource/package.py   | 3 +--
 .../spack_repo/builtin/packages/graphblast/package.py     | 3 +--
 .../builtin/packages/gromacs_chain_coordinate/package.py  | 6 +++---
 .../spack_repo/builtin/packages/gromacs_swaxs/package.py  | 6 +++---
 .../repos/spack_repo/builtin/packages/gunrock/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/helics/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/herwigpp/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/highfive/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/hisea/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/hpx/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/hssp/package.py     | 3 +--
 .../spack_repo/builtin/packages/hybrid_lambda/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/ibmisc/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/imp/package.py      | 3 +--
 .../builtin/packages/intel_oneapi_runtime/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/jali/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/kea/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/kicad/package.py    | 3 +--
 .../builtin/packages/lammps_example_plugin/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/libcudf/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/libfive/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/libint/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/libkml/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/libmesh/package.py  | 3 +--
 .../spack_repo/builtin/packages/libpulsar/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/librom/package.py   | 3 +--
 .../spack_repo/builtin/packages/llvm_amdgpu/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/lordec/package.py   | 3 +--
 .../spack_repo/builtin/packages/lua_luajit/package.py     | 4 ++--
 .../builtin/packages/lua_luajit_openresty/package.py      | 4 ++--
 .../repos/spack_repo/builtin/packages/mallocmc/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/mapnik/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/mariadb/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/masurca/package.py  | 3 +--
 .../spack_repo/builtin/packages/meraculous/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/metabat/package.py  | 3 +--
 .../spack_repo/builtin/packages/metacarpa/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/metall/package.py   | 3 +--
 .../spack_repo/builtin/packages/miopen_hip/package.py     | 3 +--
 .../spack_repo/builtin/packages/miopen_opencl/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/mira/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/mrnet/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/mvapich/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/mvapich2/package.py | 3 +--
 .../spack_repo/builtin/packages/mvapich2_gdr/package.py   | 3 +--
 .../spack_repo/builtin/packages/mvapich2x/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/mysql/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/n2p2/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/nix/package.py      | 3 +--
 .../spack_repo/builtin/packages/of_precice/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/openfoam/package.py | 3 +--
 .../spack_repo/builtin/packages/openfoam_org/package.py   | 7 +++----
 .../spack_repo/builtin/packages/openspeedshop/package.py  | 3 +--
 .../builtin/packages/openspeedshop_utils/package.py       | 3 +--
 .../repos/spack_repo/builtin/packages/pagmo/package.py    | 3 +--
 .../spack_repo/builtin/packages/paradiseo/package.py      | 3 +--
 .../spack_repo/builtin/packages/parquet_cpp/package.py    | 3 +--
 .../spack_repo/builtin/packages/parsplice/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/pcl/package.py      | 3 +--
 .../builtin/packages/pdiplugin_decl_hdf5/package.py       | 3 +--
 .../builtin/packages/pdiplugin_decl_netcdf/package.py     | 3 +--
 .../spack_repo/builtin/packages/pdiplugin_mpi/package.py  | 3 +--
 .../builtin/packages/pdiplugin_pycall/package.py          | 3 +--
 .../builtin/packages/pdiplugin_serialize/package.py       | 3 +--
 .../builtin/packages/pdiplugin_set_value/package.py       | 3 +--
 .../builtin/packages/pdiplugin_trace/package.py           | 3 +--
 .../builtin/packages/pdiplugin_user_code/package.py       | 3 +--
 .../repos/spack_repo/builtin/packages/percept/package.py  | 3 +--
 .../spack_repo/builtin/packages/percona_server/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/piranha/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/pktools/package.py  | 3 +--
 .../repos/spack_repo/builtin/packages/polymake/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/povray/package.py   | 3 +--
 .../spack_repo/builtin/packages/py_espresso/package.py    | 3 +--
 .../spack_repo/builtin/packages/py_fluidsim/package.py    | 3 +--
 .../spack_repo/builtin/packages/py_pillow_simd/package.py | 4 ++--
 .../spack_repo/builtin/packages/py_pycuda/package.py      | 3 +--
 .../builtin/packages/py_python_mapnik/package.py          | 3 +--
 .../repos/spack_repo/builtin/packages/py_quast/package.py | 3 +--
 .../spack_repo/builtin/packages/qt_5compat/package.py     | 4 ++--
 .../spack_repo/builtin/packages/qt_declarative/package.py | 4 ++--
 .../spack_repo/builtin/packages/qt_quick3d/package.py     | 4 ++--
 .../builtin/packages/qt_quicktimeline/package.py          | 4 ++--
 .../spack_repo/builtin/packages/qt_shadertools/package.py | 4 ++--
 .../repos/spack_repo/builtin/packages/qt_svg/package.py   | 4 ++--
 .../repos/spack_repo/builtin/packages/qt_tools/package.py | 4 ++--
 .../builtin/packages/r_phantompeakqualtools/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/raja/package.py     | 3 +--
 .../spack_repo/builtin/packages/raja_perf/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/revbayes/package.py | 3 +--
 .../spack_repo/builtin/packages/rocm_tensile/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/rose/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/rpp/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/sailfish/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/samrai/package.py   | 3 +--
 .../spack_repo/builtin/packages/scantailor/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/sgpp/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/shark/package.py    | 3 +--
 .../spack_repo/builtin/packages/singularity/package.py    | 4 ++--
 .../repos/spack_repo/builtin/packages/spot/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/stat/package.py     | 3 +--
 .../spack_repo/builtin/packages/symengine/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/sympol/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/trilinos/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/umpire/package.py   | 3 +--
 .../repos/spack_repo/builtin/packages/vigra/package.py    | 3 +--
 .../builtin/packages/votca_csg_tutorials/package.py       | 3 +--
 .../repos/spack_repo/builtin/packages/vtk/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/wcs/package.py      | 3 +--
 .../repos/spack_repo/builtin/packages/wonton/package.py   | 3 +--
 var/spack/repos/spack_repo/builtin/packages/wt/package.py | 3 +--
 .../repos/spack_repo/builtin/packages/xdmf3/package.py    | 3 +--
 .../repos/spack_repo/builtin/packages/xios/package.py     | 3 +--
 .../repos/spack_repo/builtin/packages/yaml_cpp/package.py | 3 +--
 160 files changed, 190 insertions(+), 324 deletions(-)

diff --git a/var/spack/repos/spack_repo/builtin/packages/abyss/package.py b/var/spack/repos/spack_repo/builtin/packages/abyss/package.py
index 8e55d811bc1..8f5554b373d 100644
--- a/var/spack/repos/spack_repo/builtin/packages/abyss/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/abyss/package.py
@@ -5,11 +5,10 @@
 import numbers
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 def is_multiple_32(x):
     """multiple of 32"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/akantu/package.py b/var/spack/repos/spack_repo/builtin/packages/akantu/package.py
index df15f9557fc..394c54125b7 100644
--- a/var/spack/repos/spack_repo/builtin/packages/akantu/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/akantu/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Akantu(CMakePackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/amdblis/package.py b/var/spack/repos/spack_repo/builtin/packages/amdblis/package.py
index 5c22dad483d..88be9e2eb2e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/amdblis/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/amdblis/package.py
@@ -4,9 +4,9 @@
 
 import os
 
-from spack.package import *
+from spack_repo.builtin.packages.blis.package import BlisBase
 
-from ..blis.package import BlisBase
+from spack.package import *
 
 
 class Amdblis(BlisBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py b/var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py
index cb280319614..da51539e163 100644
--- a/var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/amdfftw/package.py
@@ -4,9 +4,9 @@
 
 import os
 
-from spack.package import *
+from spack_repo.builtin.packages.fftw.package import FftwBase
 
-from ..fftw.package import FftwBase
+from spack.package import *
 
 
 class Amdfftw(FftwBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py b/var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py
index 1e66b5df83b..0e8eb62a3e4 100644
--- a/var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/amdlibflame/package.py
@@ -5,11 +5,10 @@
 
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
+from spack_repo.builtin.packages.libflame.package import LibflameBase
 
 from spack.package import *
 
-from ..libflame.package import LibflameBase
-
 
 class Amdlibflame(CMakePackage, LibflameBase):
     """libFLAME (AMD Optimized version) is a portable library for
diff --git a/var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py b/var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py
index 15a39ac35b8..8906538343e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/amdscalapack/package.py
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack.package import *
+from spack_repo.builtin.packages.netlib_scalapack.package import ScalapackBase
 
-from ..netlib_scalapack.package import ScalapackBase
+from spack.package import *
 
 
 class Amdscalapack(ScalapackBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/amp/package.py b/var/spack/repos/spack_repo/builtin/packages/amp/package.py
index 14f50128f3f..a0ac9aa449f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/amp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/amp/package.py
@@ -2,11 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Amp(CMakePackage):
     """The Advanced Multi-Physics (AMP) package.
diff --git a/var/spack/repos/spack_repo/builtin/packages/aocc/package.py b/var/spack/repos/spack_repo/builtin/packages/aocc/package.py
index 2ba1a9af0a6..1f07fde1849 100644
--- a/var/spack/repos/spack_repo/builtin/packages/aocc/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/aocc/package.py
@@ -5,11 +5,10 @@
 
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
-from ..llvm.package import LlvmDetection
-
 
 class Aocc(Package, LlvmDetection, CompilerPackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py b/var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py
index 83c15bd7d6b..0a125973ac2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/aoflagger/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Aoflagger(CMakePackage):
     """RFI detector and quality analysis
diff --git a/var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py b/var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py
index cc111b48c6d..d190bc8bbbd 100644
--- a/var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/apple_clang/package.py
@@ -5,11 +5,10 @@
 
 from spack_repo.builtin.build_systems.bundle import BundlePackage
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
+from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
-from ..llvm.package import LlvmDetection
-
 
 class AppleClang(BundlePackage, LlvmDetection, CompilerPackage):
     """Apple's Clang compiler"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py b/var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py
index 2735d4f213c..76371d1f5a2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/apple_glu/package.py
@@ -1,9 +1,9 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack.package import *
+from spack_repo.builtin.packages.apple_gl.package import AppleGlBase
 
-from ..apple_gl.package import AppleGlBase
+from spack.package import *
 
 
 class AppleGlu(AppleGlBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/apptainer/package.py b/var/spack/repos/spack_repo/builtin/packages/apptainer/package.py
index f774b3ec856..3dc7672a626 100644
--- a/var/spack/repos/spack_repo/builtin/packages/apptainer/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/apptainer/package.py
@@ -6,9 +6,9 @@
 from glob import glob
 from os.path import basename
 
-from spack.package import *
+from spack_repo.builtin.packages.singularityce.package import SingularityBase
 
-from ..singularityce.package import SingularityBase
+from spack.package import *
 
 
 # Apptainer is the new name of Singularity, piggy-back on the original package
diff --git a/var/spack/repos/spack_repo/builtin/packages/augustus/package.py b/var/spack/repos/spack_repo/builtin/packages/augustus/package.py
index 5f7d117e4c9..13ea99c0f1b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/augustus/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/augustus/package.py
@@ -5,11 +5,10 @@
 import glob
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Augustus(MakefilePackage):
     """AUGUSTUS is a program that predicts genes in eukaryotic
diff --git a/var/spack/repos/spack_repo/builtin/packages/automaded/package.py b/var/spack/repos/spack_repo/builtin/packages/automaded/package.py
index 646ee0eb9c8..19e08e07cff 100644
--- a/var/spack/repos/spack_repo/builtin/packages/automaded/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/automaded/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Automaded(CMakePackage):
     """AutomaDeD (Automata-based Debugging for Dissimilar parallel
diff --git a/var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py
index e6700f3333e..a65bf8614c5 100644
--- a/var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/bcl2fastq2/package.py
@@ -6,11 +6,10 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 # This application uses cmake to build, but they wrap it with a
 # configure script that performs dark magic.  This package does it
diff --git a/var/spack/repos/spack_repo/builtin/packages/bohrium/package.py b/var/spack/repos/spack_repo/builtin/packages/bohrium/package.py
index 981c5b23bbc..e7dec011472 100644
--- a/var/spack/repos/spack_repo/builtin/packages/bohrium/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/bohrium/package.py
@@ -6,12 +6,11 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 from spack.package_test import compare_output
 
-from ..boost.package import Boost
-
 
 class Bohrium(CMakePackage, CudaPackage):
     """Library for automatic acceleration of array operations"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/branson/package.py b/var/spack/repos/spack_repo/builtin/packages/branson/package.py
index 7df17f9a560..215915bdfdb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/branson/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/branson/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Branson(CMakePackage):
     """Branson's purpose is to study different algorithms for parallel Monte
diff --git a/var/spack/repos/spack_repo/builtin/packages/cabana/package.py b/var/spack/repos/spack_repo/builtin/packages/cabana/package.py
index 657a4a3ebc4..27c0d8f27ce 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cabana/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cabana/package.py
@@ -5,11 +5,10 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
-from ..kokkos.package import Kokkos
-
 
 class Cabana(CMakePackage, CudaPackage, ROCmPackage):
     """The Exascale Co-Design Center for Particle Applications Toolkit"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/caffe/package.py b/var/spack/repos/spack_repo/builtin/packages/caffe/package.py
index 86ada049e46..3effbd5170a 100644
--- a/var/spack/repos/spack_repo/builtin/packages/caffe/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/caffe/package.py
@@ -4,11 +4,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Caffe(CMakePackage, CudaPackage):
     """Caffe is a deep learning framework made with expression, speed, and
diff --git a/var/spack/repos/spack_repo/builtin/packages/cantera/package.py b/var/spack/repos/spack_repo/builtin/packages/cantera/package.py
index 9ef2356aa72..2fc1a94b24c 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cantera/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cantera/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.scons import SConsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Cantera(SConsPackage):
     """Cantera is a suite of object-oriented software tools for problems
diff --git a/var/spack/repos/spack_repo/builtin/packages/care/package.py b/var/spack/repos/spack_repo/builtin/packages/care/package.py
index b341587ffab..68ff9076446 100644
--- a/var/spack/repos/spack_repo/builtin/packages/care/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/care/package.py
@@ -12,11 +12,10 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
-from ..blt.package import llnl_link_helpers
-
 
 class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py b/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py
index ed72ecc1904..d84c04f0d3d 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class CbtfArgonavis(CMakePackage):
     """CBTF Argo Navis project contains the CUDA collector and supporting
diff --git a/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py b/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py
index 5f0f1b34e9b..e1162f4a56e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cbtf_argonavis_gui/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.qmake import QMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class CbtfArgonavisGui(QMakePackage):
     """CBTF Argo Navis GUI project contains the GUI that views OpenSpeedShop
diff --git a/var/spack/repos/spack_repo/builtin/packages/chai/package.py b/var/spack/repos/spack_repo/builtin/packages/chai/package.py
index 3642c510110..140581b5000 100644
--- a/var/spack/repos/spack_repo/builtin/packages/chai/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/chai/package.py
@@ -12,11 +12,10 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
-from ..blt.package import llnl_link_helpers
-
 
 class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/channelflow/package.py b/var/spack/repos/spack_repo/builtin/packages/channelflow/package.py
index 9d16e33e2aa..b9a52ecfbeb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/channelflow/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/channelflow/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Channelflow(CMakePackage):
     """Channelflow is a software system for numerical analysis of the
diff --git a/var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py b/var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py
index 14e112a5cea..9ff88f1a996 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cleverleaf/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Cleverleaf(CMakePackage):
     """CleverLeaf is a hydrodynamics mini-app that extends CloverLeaf with
diff --git a/var/spack/repos/spack_repo/builtin/packages/clfft/package.py b/var/spack/repos/spack_repo/builtin/packages/clfft/package.py
index 528ab804e89..d75862deb27 100644
--- a/var/spack/repos/spack_repo/builtin/packages/clfft/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/clfft/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Clfft(CMakePackage):
     """a software library containing FFT functions written in OpenCL"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py b/var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py
index 5b7bd77b99e..185baf93943 100644
--- a/var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/clingo_bootstrap/package.py
@@ -4,12 +4,12 @@
 import glob
 import os
 
+from spack_repo.builtin.packages.clingo.package import Clingo
+
 import spack.paths
 import spack.user_environment
 from spack.package import *
 
-from ..clingo.package import Clingo
-
 
 class ClingoBootstrap(Clingo):
     """Clingo with some options used for bootstrapping"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/cntk/package.py b/var/spack/repos/spack_repo/builtin/packages/cntk/package.py
index 168e8466ec8..378d3cc29ca 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cntk/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cntk/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Cntk(Package):
     """The Microsoft Cognitive Toolkit is a unified deep-learning toolkit
diff --git a/var/spack/repos/spack_repo/builtin/packages/coin3d/package.py b/var/spack/repos/spack_repo/builtin/packages/coin3d/package.py
index f46b1923549..00c88b0081b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/coin3d/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/coin3d/package.py
@@ -5,11 +5,10 @@
 from spack_repo.builtin.build_systems import autotools, cmake
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Coin3d(AutotoolsPackage, CMakePackage):
     """Coin is an OpenGL-based, 3D graphics library that has its roots in the
diff --git a/var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py b/var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py
index 10e7b71e602..a16ee124d77 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cray_mpich/package.py
@@ -7,12 +7,11 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 from spack.util.module_cmd import get_path_args_from_module_line, module
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class CrayMpich(MpichEnvironmentModifications, Package, CudaPackage, ROCmPackage):
     """Cray's MPICH is a high performance and widely portable implementation of
diff --git a/var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py b/var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py
index 2f6252b43f5..a2eb1b290b5 100644
--- a/var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/cray_mvapich2/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class CrayMvapich2(MpichEnvironmentModifications, Package):
     """Cray/HPE packaging of MVAPICH2 for HPE Apollo systems"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/dakota/package.py b/var/spack/repos/spack_repo/builtin/packages/dakota/package.py
index 842d44e5f17..30ee8eb9b74 100644
--- a/var/spack/repos/spack_repo/builtin/packages/dakota/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/dakota/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 def submodules(package):
     submodules = []
diff --git a/var/spack/repos/spack_repo/builtin/packages/dbow2/package.py b/var/spack/repos/spack_repo/builtin/packages/dbow2/package.py
index 65b0480205d..c784fd1281a 100644
--- a/var/spack/repos/spack_repo/builtin/packages/dbow2/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/dbow2/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Dbow2(CMakePackage):
     """DBoW2 is an improved version of the DBow library, an open source C++
diff --git a/var/spack/repos/spack_repo/builtin/packages/dealii/package.py b/var/spack/repos/spack_repo/builtin/packages/dealii/package.py
index dd1eccb5a1f..41d726157a8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/dealii/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/dealii/package.py
@@ -6,11 +6,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Dealii(CMakePackage, CudaPackage):
     """C++ software library providing well-documented tools to build finite
diff --git a/var/spack/repos/spack_repo/builtin/packages/dssp/package.py b/var/spack/repos/spack_repo/builtin/packages/dssp/package.py
index e496a8b5154..3d70de268c8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/dssp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/dssp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Dssp(AutotoolsPackage):
     """'mkdssp' utility. (dictionary of protein secondary structure)"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/ecflow/package.py b/var/spack/repos/spack_repo/builtin/packages/ecflow/package.py
index 7c941ba242b..3d0efd5bec7 100644
--- a/var/spack/repos/spack_repo/builtin/packages/ecflow/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/ecflow/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Ecflow(CMakePackage):
     """ecFlow is a work flow package that enables users to run a large number
diff --git a/var/spack/repos/spack_repo/builtin/packages/ethminer/package.py b/var/spack/repos/spack_repo/builtin/packages/ethminer/package.py
index 7a155a3c336..a2468944f62 100644
--- a/var/spack/repos/spack_repo/builtin/packages/ethminer/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/ethminer/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Ethminer(CMakePackage):
     """The ethminer is an Ethereum GPU mining worker."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/exaca/package.py b/var/spack/repos/spack_repo/builtin/packages/exaca/package.py
index ef0a7ce7af9..f20294e8ed2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/exaca/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/exaca/package.py
@@ -5,11 +5,10 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.package import *
 
-from ..kokkos.package import Kokkos
-
 
 class Exaca(CMakePackage, CudaPackage, ROCmPackage):
     """ExaCA: an exascale cellular automata application for alloy solidification modeling"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/extrae/package.py b/var/spack/repos/spack_repo/builtin/packages/extrae/package.py
index 027a3bc701b..52f9bb44e43 100644
--- a/var/spack/repos/spack_repo/builtin/packages/extrae/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/extrae/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 # typical working line with extrae 3.0.1
 # ./configure
 #   --prefix=/usr/local
diff --git a/var/spack/repos/spack_repo/builtin/packages/fenics/package.py b/var/spack/repos/spack_repo/builtin/packages/fenics/package.py
index ccb08927a46..160c416bf5b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/fenics/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/fenics/package.py
@@ -4,11 +4,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.python import PythonPipBuilder
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Fenics(CMakePackage):
     """FEniCS is organized as a collection of interoperable components
diff --git a/var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py b/var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py
index 92a9259d590..315b44890f5 100644
--- a/var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/foam_extend/package.py
@@ -33,11 +33,15 @@
 import re
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.openfoam.package import (
+    OpenfoamArch,
+    add_extra_files,
+    rewrite_environ_files,
+    write_environ,
+)
 
 from spack.package import *
 
-from ..openfoam.package import OpenfoamArch, add_extra_files, rewrite_environ_files, write_environ
-
 
 class FoamExtend(Package):
     """The Extend Project is a fork of the OpenFOAM opensource library
diff --git a/var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py b/var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py
index 2d250b27d8c..f4e6f9ba3f2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/foundationdb/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Foundationdb(CMakePackage):
     """FoundationDB is a distributed database designed to handle large
diff --git a/var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py b/var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py
index f9c79634608..6a9954c91d1 100644
--- a/var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/fujitsu_fftw/package.py
@@ -1,9 +1,9 @@
 # Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack.package import *
+from spack_repo.builtin.packages.fftw.package import FftwBase
 
-from ..fftw.package import FftwBase
+from spack.package import *
 
 
 class FujitsuFftw(FftwBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py b/var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py
index 7b4eef91c71..7fb3e3323a6 100644
--- a/var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/fujitsu_frontistr/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.frontistr.package import FrontistrBase
 
-from ..frontistr.package import FrontistrBase
+from spack.package import *
 
 
 class FujitsuFrontistr(FrontistrBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py b/var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py
index 50c1415db92..4c8ec598bf3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/gnuradio/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Gnuradio(CMakePackage):
     """GNU Radio is a free & open-source software development toolkit
diff --git a/var/spack/repos/spack_repo/builtin/packages/gource/package.py b/var/spack/repos/spack_repo/builtin/packages/gource/package.py
index 9cc729d7e28..153dd93ccf2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/gource/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/gource/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Gource(AutotoolsPackage):
     """Software version control visualization."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/graphblast/package.py b/var/spack/repos/spack_repo/builtin/packages/graphblast/package.py
index d6ccffb7674..eec448aef67 100644
--- a/var/spack/repos/spack_repo/builtin/packages/graphblast/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/graphblast/package.py
@@ -4,11 +4,10 @@
 
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Graphblast(MakefilePackage, CudaPackage):
     """High-Performance Linear Algebra-based Graph Primitives on GPUs"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py b/var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py
index bb3c51778f6..b1f1e6a7c63 100644
--- a/var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/gromacs_chain_coordinate/package.py
@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack.package import *
+from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from spack_repo.builtin.packages.gromacs.package import Gromacs
 
-from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from ..gromacs.package import Gromacs
+from spack.package import *
 
 
 class GromacsChainCoordinate(Gromacs):
diff --git a/var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py b/var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py
index 40b0c75b328..905abd632a9 100644
--- a/var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/gromacs_swaxs/package.py
@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack.package import *
+from spack_repo.builtin.packages.gromacs.package import CMakeBuilder as GromacsCMakeBuilder
+from spack_repo.builtin.packages.gromacs.package import Gromacs
 
-from ..gromacs.package import CMakeBuilder as GromacsCMakeBuilder
-from ..gromacs.package import Gromacs
+from spack.package import *
 
 
 class GromacsSwaxs(Gromacs):
diff --git a/var/spack/repos/spack_repo/builtin/packages/gunrock/package.py b/var/spack/repos/spack_repo/builtin/packages/gunrock/package.py
index 7901be2ba3a..221781e483f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/gunrock/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/gunrock/package.py
@@ -4,11 +4,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Gunrock(CMakePackage, CudaPackage):
     """High-Performance Graph Primitives on GPUs"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/helics/package.py b/var/spack/repos/spack_repo/builtin/packages/helics/package.py
index 2e063759454..1dfa94819c9 100644
--- a/var/spack/repos/spack_repo/builtin/packages/helics/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/helics/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Helics(CMakePackage):
     """HELICS is a general-purpose, modular, highly-scalable co-simulation
diff --git a/var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py b/var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py
index dc26e74adc2..f4c28d8f4cb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/herwigpp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Herwigpp(AutotoolsPackage):
     """Herwig is a multi-purpose particle physics event generator.
diff --git a/var/spack/repos/spack_repo/builtin/packages/highfive/package.py b/var/spack/repos/spack_repo/builtin/packages/highfive/package.py
index f442636b14d..2580e02c190 100644
--- a/var/spack/repos/spack_repo/builtin/packages/highfive/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/highfive/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Highfive(CMakePackage):
     """HighFive - Header only C++ HDF5 interface"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/hisea/package.py b/var/spack/repos/spack_repo/builtin/packages/hisea/package.py
index bd0c2953722..8c60719573a 100644
--- a/var/spack/repos/spack_repo/builtin/packages/hisea/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/hisea/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Hisea(MakefilePackage):
     """HISEA is an efficient all-vs-all long read aligner for SMRT sequencing
diff --git a/var/spack/repos/spack_repo/builtin/packages/hpx/package.py b/var/spack/repos/spack_repo/builtin/packages/hpx/package.py
index 626fa782c34..d8181220d98 100644
--- a/var/spack/repos/spack_repo/builtin/packages/hpx/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/hpx/package.py
@@ -8,11 +8,10 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Hpx(CMakePackage, CudaPackage, ROCmPackage):
     """C++ runtime system for parallel and distributed applications."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/hssp/package.py b/var/spack/repos/spack_repo/builtin/packages/hssp/package.py
index a05a4e738e6..39fcd1b119f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/hssp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/hssp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Hssp(AutotoolsPackage):
     """The source code for building the mkhssp and hsspconv programs is bundled
diff --git a/var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py b/var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py
index 4a68abfad47..70647d202b4 100644
--- a/var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/hybrid_lambda/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class HybridLambda(AutotoolsPackage):
     """Hybrid-Lambda is a software package that can simulate gene trees
diff --git a/var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py b/var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py
index 38bf74416bd..ddd52f4efa1 100644
--- a/var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/ibmisc/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Ibmisc(CMakePackage):
     """Misc. reusable utilities used by IceBin."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/imp/package.py b/var/spack/repos/spack_repo/builtin/packages/imp/package.py
index 33a4394a887..078d1985954 100644
--- a/var/spack/repos/spack_repo/builtin/packages/imp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/imp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Imp(CMakePackage):
     """IMP, the Integrative Modeling Platform."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py b/var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py
index a171d28e82c..0c894312e78 100644
--- a/var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/intel_oneapi_runtime/package.py
@@ -5,11 +5,10 @@
 
 from spack_repo.builtin.build_systems.generic import Package
 from spack_repo.builtin.build_systems.oneapi import IntelOneApiPackage
+from spack_repo.builtin.packages.gcc_runtime.package import get_elf_libraries
 
 from spack.package import *
 
-from ..gcc_runtime.package import get_elf_libraries
-
 
 @IntelOneApiPackage.update_description
 class IntelOneapiRuntime(Package):
diff --git a/var/spack/repos/spack_repo/builtin/packages/jali/package.py b/var/spack/repos/spack_repo/builtin/packages/jali/package.py
index 7c46ac7ebf9..24ae747d3e1 100644
--- a/var/spack/repos/spack_repo/builtin/packages/jali/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/jali/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Jali(CMakePackage):
     """Jali is a parallel, unstructured mesh infrastructure library designed
diff --git a/var/spack/repos/spack_repo/builtin/packages/kea/package.py b/var/spack/repos/spack_repo/builtin/packages/kea/package.py
index 30bd5845d6a..f218af0b107 100644
--- a/var/spack/repos/spack_repo/builtin/packages/kea/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/kea/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Kea(AutotoolsPackage):
     """Modern, open source DHCPv4 & DHCPv6 server."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/kicad/package.py b/var/spack/repos/spack_repo/builtin/packages/kicad/package.py
index 51eb268ef2f..609a4ae5607 100644
--- a/var/spack/repos/spack_repo/builtin/packages/kicad/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/kicad/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Kicad(CMakePackage):
     """KiCad is an open source software suite for Electronic Design
diff --git a/var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py b/var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py
index 2e8a2025bd9..e05278643eb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/lammps_example_plugin/package.py
@@ -5,11 +5,10 @@
 import datetime as dt
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.lammps.package import Lammps
 
 from spack.package import *
 
-from ..lammps.package import Lammps
-
 
 class LammpsExamplePlugin(CMakePackage):
     """LAMMPS Example Plugin"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/libcudf/package.py b/var/spack/repos/spack_repo/builtin/packages/libcudf/package.py
index 17158312081..b56d8b5d002 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libcudf/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libcudf/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Libcudf(CMakePackage):
     """Built based on the Apache Arrow columnar memory format,
diff --git a/var/spack/repos/spack_repo/builtin/packages/libfive/package.py b/var/spack/repos/spack_repo/builtin/packages/libfive/package.py
index 03bea1f6520..59645a3ba32 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libfive/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libfive/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Libfive(CMakePackage):
     """libfive is a software library and set of tools for solid modeling."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/libint/package.py b/var/spack/repos/spack_repo/builtin/packages/libint/package.py
index 7d1bd6d3f0e..fc2415f6f96 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libint/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libint/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 TUNE_VARIANTS = (
     "none",
     "cp2k-lmax-4",
diff --git a/var/spack/repos/spack_repo/builtin/packages/libkml/package.py b/var/spack/repos/spack_repo/builtin/packages/libkml/package.py
index 223265e594c..422668caa49 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libkml/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libkml/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Libkml(CMakePackage):
     """Reference implementation of OGC KML 2.2."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/libmesh/package.py b/var/spack/repos/spack_repo/builtin/packages/libmesh/package.py
index 53058eb30d8..c6670fa8e75 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libmesh/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libmesh/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Libmesh(AutotoolsPackage):
     """The libMesh library provides a framework for the numerical simulation of
diff --git a/var/spack/repos/spack_repo/builtin/packages/libpulsar/package.py b/var/spack/repos/spack_repo/builtin/packages/libpulsar/package.py
index 8d179105131..8e64b2b964f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/libpulsar/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/libpulsar/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Libpulsar(CMakePackage):
     """libpulsar is a C/C++ client library implementation of the Apache Pulsar
diff --git a/var/spack/repos/spack_repo/builtin/packages/librom/package.py b/var/spack/repos/spack_repo/builtin/packages/librom/package.py
index 8bda42005d8..92cdb5b3ebf 100644
--- a/var/spack/repos/spack_repo/builtin/packages/librom/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/librom/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Librom(AutotoolsPackage):
     """libROM: library for computing large-scale reduced order models"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py b/var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py
index 376203e2083..54d8dd3281e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py
@@ -7,11 +7,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
 from spack_repo.builtin.build_systems.compiler import CompilerPackage
+from spack_repo.builtin.packages.llvm.package import LlvmDetection
 
 from spack.package import *
 
-from ..llvm.package import LlvmDetection
-
 
 class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage):
     """Toolkit for the construction of highly optimized compilers,
diff --git a/var/spack/repos/spack_repo/builtin/packages/lordec/package.py b/var/spack/repos/spack_repo/builtin/packages/lordec/package.py
index 6cf37e11312..59f0821b899 100644
--- a/var/spack/repos/spack_repo/builtin/packages/lordec/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/lordec/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Lordec(MakefilePackage):
     """LoRDEC is a program to correct sequencing errors in long reads from
diff --git a/var/spack/repos/spack_repo/builtin/packages/lua_luajit/package.py b/var/spack/repos/spack_repo/builtin/packages/lua_luajit/package.py
index 4db969c2206..1e98ac933d8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/lua_luajit/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/lua_luajit/package.py
@@ -4,9 +4,9 @@
 
 import os
 
-from spack.package import *
+from spack_repo.builtin.packages.lua.package import LuaImplPackage
 
-from ..lua.package import LuaImplPackage
+from spack.package import *
 
 
 class LuaLuajit(LuaImplPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/lua_luajit_openresty/package.py b/var/spack/repos/spack_repo/builtin/packages/lua_luajit_openresty/package.py
index cc13dcf35ed..f9b28115061 100644
--- a/var/spack/repos/spack_repo/builtin/packages/lua_luajit_openresty/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/lua_luajit_openresty/package.py
@@ -4,9 +4,9 @@
 
 import os
 
-from spack.package import *
+from spack_repo.builtin.packages.lua.package import LuaImplPackage
 
-from ..lua.package import LuaImplPackage
+from spack.package import *
 
 
 class LuaLuajitOpenresty(LuaImplPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/mallocmc/package.py b/var/spack/repos/spack_repo/builtin/packages/mallocmc/package.py
index 2558711736f..3040e0436a7 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mallocmc/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mallocmc/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mallocmc(CMakePackage):
     """mallocMC: Memory Allocator for Many Core Architectures.
diff --git a/var/spack/repos/spack_repo/builtin/packages/mapnik/package.py b/var/spack/repos/spack_repo/builtin/packages/mapnik/package.py
index 66e540ba916..172ae6d9319 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mapnik/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mapnik/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mapnik(AutotoolsPackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/mariadb/package.py b/var/spack/repos/spack_repo/builtin/packages/mariadb/package.py
index 35cbad1e470..faf98d05b9e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mariadb/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mariadb/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mariadb(CMakePackage):
     """MariaDB Server is one of the most popular database servers
diff --git a/var/spack/repos/spack_repo/builtin/packages/masurca/package.py b/var/spack/repos/spack_repo/builtin/packages/masurca/package.py
index 7d271c252b6..e7abdf11734 100644
--- a/var/spack/repos/spack_repo/builtin/packages/masurca/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/masurca/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Masurca(Package):
     """MaSuRCA is whole genome assembly software. It combines the efficiency
diff --git a/var/spack/repos/spack_repo/builtin/packages/meraculous/package.py b/var/spack/repos/spack_repo/builtin/packages/meraculous/package.py
index 71bb4c0f760..285701fd76d 100644
--- a/var/spack/repos/spack_repo/builtin/packages/meraculous/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/meraculous/package.py
@@ -4,11 +4,10 @@
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.sourceforge import SourceforgePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Meraculous(CMakePackage, SourceforgePackage):
     """Meraculous is a while genome assembler for Next Generation Sequencing
diff --git a/var/spack/repos/spack_repo/builtin/packages/metabat/package.py b/var/spack/repos/spack_repo/builtin/packages/metabat/package.py
index b5986ffcce5..4cc979e7c4d 100644
--- a/var/spack/repos/spack_repo/builtin/packages/metabat/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/metabat/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Metabat(CMakePackage):
     """MetaBAT, an efficient tool for accurately reconstructing single
diff --git a/var/spack/repos/spack_repo/builtin/packages/metacarpa/package.py b/var/spack/repos/spack_repo/builtin/packages/metacarpa/package.py
index 41fa7defeab..33b27515225 100644
--- a/var/spack/repos/spack_repo/builtin/packages/metacarpa/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/metacarpa/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Metacarpa(MakefilePackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/metall/package.py b/var/spack/repos/spack_repo/builtin/packages/metall/package.py
index 8fc7af63651..131adf9b469 100644
--- a/var/spack/repos/spack_repo/builtin/packages/metall/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/metall/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Metall(CMakePackage):
     """A Persistent Memory Allocator For Data-Centric Analytics"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py b/var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py
index 1cef9bbeeea..8344c3ee2cd 100644
--- a/var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py
@@ -5,11 +5,10 @@
 import re
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class MiopenHip(CMakePackage):
     """AMD's library for high performance machine learning primitives."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/miopen_opencl/package.py b/var/spack/repos/spack_repo/builtin/packages/miopen_opencl/package.py
index 7b96491ed32..46c93220ff8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/miopen_opencl/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/miopen_opencl/package.py
@@ -5,11 +5,10 @@
 import re
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class MiopenOpencl(CMakePackage):
     """AMD's library for high performance machine learning primitives."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/mira/package.py b/var/spack/repos/spack_repo/builtin/packages/mira/package.py
index b2373a1213a..203611ddbca 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mira/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mira/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mira(AutotoolsPackage):
     """MIRA is a multi-pass DNA sequence data assembler/mapper for whole genome
diff --git a/var/spack/repos/spack_repo/builtin/packages/mrnet/package.py b/var/spack/repos/spack_repo/builtin/packages/mrnet/package.py
index 843dc9cfebb..9fb1b4d8005 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mrnet/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mrnet/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mrnet(AutotoolsPackage):
     """The MRNet Multi-Cast Reduction Network."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/mvapich/package.py b/var/spack/repos/spack_repo/builtin/packages/mvapich/package.py
index 4f9eba263f3..f6699806a2a 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mvapich/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mvapich/package.py
@@ -7,11 +7,10 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class Mvapich(MpichEnvironmentModifications, AutotoolsPackage):
     """Mvapich is a High-Performance MPI Library for clusters with diverse
diff --git a/var/spack/repos/spack_repo/builtin/packages/mvapich2/package.py b/var/spack/repos/spack_repo/builtin/packages/mvapich2/package.py
index a181f0f2781..1985c654c15 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mvapich2/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mvapich2/package.py
@@ -7,12 +7,11 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 import spack.compilers.config
 from spack.package import *
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class Mvapich2(MpichEnvironmentModifications, AutotoolsPackage):
     """Mvapich2 is a High-Performance MPI Library for clusters with diverse
diff --git a/var/spack/repos/spack_repo/builtin/packages/mvapich2_gdr/package.py b/var/spack/repos/spack_repo/builtin/packages/mvapich2_gdr/package.py
index ac323d9ab10..9dc7130dc9f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mvapich2_gdr/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mvapich2_gdr/package.py
@@ -5,11 +5,10 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class Mvapich2Gdr(MpichEnvironmentModifications, AutotoolsPackage):
     """MVAPICH2-GDR is an optimized version of the MVAPICH2 MPI library for
diff --git a/var/spack/repos/spack_repo/builtin/packages/mvapich2x/package.py b/var/spack/repos/spack_repo/builtin/packages/mvapich2x/package.py
index 5fa8b4361b2..1f6fbf02004 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mvapich2x/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mvapich2x/package.py
@@ -5,11 +5,10 @@
 import sys
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.mpich.package import MpichEnvironmentModifications
 
 from spack.package import *
 
-from ..mpich.package import MpichEnvironmentModifications
-
 
 class Mvapich2x(MpichEnvironmentModifications, AutotoolsPackage):
     """MVAPICH2-X is the advanced version of the MVAPICH2 MPI library with
diff --git a/var/spack/repos/spack_repo/builtin/packages/mysql/package.py b/var/spack/repos/spack_repo/builtin/packages/mysql/package.py
index 0c61322f34d..1c33cf52a1a 100644
--- a/var/spack/repos/spack_repo/builtin/packages/mysql/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/mysql/package.py
@@ -6,11 +6,10 @@
 import tempfile
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Mysql(CMakePackage):
     """MySQL is an open source relational database management system."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/n2p2/package.py b/var/spack/repos/spack_repo/builtin/packages/n2p2/package.py
index 141d696a66a..3b6790a12bb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/n2p2/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/n2p2/package.py
@@ -4,11 +4,10 @@
 import os
 
 from spack_repo.builtin.build_systems.makefile import MakefilePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class N2p2(MakefilePackage):
     """N2p2 (The neural network potential package) provides ready-to-use
diff --git a/var/spack/repos/spack_repo/builtin/packages/nix/package.py b/var/spack/repos/spack_repo/builtin/packages/nix/package.py
index 092b8c1249a..eb66a734f7b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/nix/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/nix/package.py
@@ -7,11 +7,10 @@
 import tempfile
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Nix(AutotoolsPackage):
     """Nix, the purely functional package manager"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/of_precice/package.py b/var/spack/repos/spack_repo/builtin/packages/of_precice/package.py
index cb5678931c9..ec116b4f743 100644
--- a/var/spack/repos/spack_repo/builtin/packages/of_precice/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/of_precice/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.openfoam.package import add_extra_files
 
 from spack.package import *
 
-from ..openfoam.package import add_extra_files
-
 
 class OfPrecice(Package):
     """preCICE adapter for OpenFOAM"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/openfoam/package.py b/var/spack/repos/spack_repo/builtin/packages/openfoam/package.py
index f0d99e75bc9..911d097f71e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/openfoam/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/openfoam/package.py
@@ -44,11 +44,10 @@
 import re
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 # Not the nice way of doing things, but is a start for refactoring
 __all__ = [
     "add_extra_files",
diff --git a/var/spack/repos/spack_repo/builtin/packages/openfoam_org/package.py b/var/spack/repos/spack_repo/builtin/packages/openfoam_org/package.py
index ca57ed535c5..0e45cd075dd 100644
--- a/var/spack/repos/spack_repo/builtin/packages/openfoam_org/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/openfoam_org/package.py
@@ -39,10 +39,7 @@
 import re
 
 from spack_repo.builtin.build_systems.generic import Package
-
-from spack.package import *
-
-from ..openfoam.package import (
+from spack_repo.builtin.packages.openfoam.package import (
     OpenfoamArch,
     add_extra_files,
     mplib_content,
@@ -50,6 +47,8 @@
     write_environ,
 )
 
+from spack.package import *
+
 
 class OpenfoamOrg(Package):
     """OpenFOAM is a GPL-opensource C++ CFD-toolbox.
diff --git a/var/spack/repos/spack_repo/builtin/packages/openspeedshop/package.py b/var/spack/repos/spack_repo/builtin/packages/openspeedshop/package.py
index 6a63f542029..200bd80ea34 100644
--- a/var/spack/repos/spack_repo/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/openspeedshop/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Openspeedshop(CMakePackage):
     """OpenSpeedShop is a community effort led by Trenza, Inc.
diff --git a/var/spack/repos/spack_repo/builtin/packages/openspeedshop_utils/package.py b/var/spack/repos/spack_repo/builtin/packages/openspeedshop_utils/package.py
index 8f6f96b16de..5701f5943cb 100644
--- a/var/spack/repos/spack_repo/builtin/packages/openspeedshop_utils/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/openspeedshop_utils/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class OpenspeedshopUtils(CMakePackage):
     """OpenSpeedShop is a community effort led by Trenza, Inc.
diff --git a/var/spack/repos/spack_repo/builtin/packages/pagmo/package.py b/var/spack/repos/spack_repo/builtin/packages/pagmo/package.py
index 0dd3868baf2..4e4f098f1c3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pagmo/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pagmo/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Pagmo(CMakePackage):
     """Parallel Global Multiobjective Optimizer (and its Python alter ego
diff --git a/var/spack/repos/spack_repo/builtin/packages/paradiseo/package.py b/var/spack/repos/spack_repo/builtin/packages/paradiseo/package.py
index 89f3739ca8d..37296b7ffe3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/paradiseo/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/paradiseo/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Paradiseo(CMakePackage):
     """A C++ white-box object-oriented framework dedicated to the reusable
diff --git a/var/spack/repos/spack_repo/builtin/packages/parquet_cpp/package.py b/var/spack/repos/spack_repo/builtin/packages/parquet_cpp/package.py
index 6f2f3f7ae1a..16d82a40a94 100644
--- a/var/spack/repos/spack_repo/builtin/packages/parquet_cpp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/parquet_cpp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class ParquetCpp(CMakePackage):
     """C++ bindings for the Apache Parquet columnar data format."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/parsplice/package.py b/var/spack/repos/spack_repo/builtin/packages/parsplice/package.py
index 954345dce2d..b3f30793526 100644
--- a/var/spack/repos/spack_repo/builtin/packages/parsplice/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/parsplice/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Parsplice(CMakePackage):
     """ParSplice code implements the Parallel Trajectory Splicing algorithm"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/pcl/package.py b/var/spack/repos/spack_repo/builtin/packages/pcl/package.py
index 54cacddc04a..fcd2753b034 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pcl/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pcl/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Pcl(CMakePackage):
     """The Point Cloud Library (PCL) is a standalone, large scale,
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_hdf5/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_hdf5/package.py
index 2b494be6a19..fa552f4cb97 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_hdf5/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_hdf5/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginDeclHdf5(CMakePackage):
     """Decl'HDF5 plugin enables one to read and write data from HDF5 files in a
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_netcdf/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_netcdf/package.py
index 2fd5343ec24..5683a0a0076 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_netcdf/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_decl_netcdf/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginDeclNetcdf(CMakePackage):
     """The trace plugin is intended to generate a trace of  what happens in PDI
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_mpi/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_mpi/package.py
index 94ffd0e7599..035b8a56b82 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_mpi/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_mpi/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginMpi(CMakePackage):
     """MPI plugin for the PDI library"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_pycall/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_pycall/package.py
index 7efd92bb343..5293868ddbe 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_pycall/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_pycall/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginPycall(CMakePackage):
     """pycall plugin for the PDI library"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_serialize/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_serialize/package.py
index d1efc8a2b0a..7d928274ab7 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_serialize/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_serialize/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginSerialize(CMakePackage):
     """The trace plugin is intended to generate a trace of  what happens in PDI
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_set_value/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_set_value/package.py
index 1209bd1a74f..1b0058b38e2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_set_value/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_set_value/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginSetValue(CMakePackage):
     """The trace plugin is intended to generate a trace of  what happens in PDI
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_trace/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_trace/package.py
index a591788f181..7d370950b00 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_trace/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_trace/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginTrace(CMakePackage):
     """The trace plugin is intended to generate a trace of  what happens in PDI
diff --git a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_user_code/package.py b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_user_code/package.py
index 25384507ed6..5b2603ca87f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pdiplugin_user_code/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pdiplugin_user_code/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.pdi.package import Pdi
 
 from spack.package import *
 
-from ..pdi.package import Pdi
-
 
 class PdipluginUserCode(CMakePackage):
     """The user-code plugin for the PDI librarie enables one to call a
diff --git a/var/spack/repos/spack_repo/builtin/packages/percept/package.py b/var/spack/repos/spack_repo/builtin/packages/percept/package.py
index 2053f669ac4..60c0b323aa7 100644
--- a/var/spack/repos/spack_repo/builtin/packages/percept/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/percept/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Percept(CMakePackage):
     """Parallel mesh refinement and adaptivity tools for the finite
diff --git a/var/spack/repos/spack_repo/builtin/packages/percona_server/package.py b/var/spack/repos/spack_repo/builtin/packages/percona_server/package.py
index de0962d0aae..441b6a9a450 100644
--- a/var/spack/repos/spack_repo/builtin/packages/percona_server/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/percona_server/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class PerconaServer(CMakePackage):
     """Percona Server is a branch of MySQL 8.0 bringing higher performance,
diff --git a/var/spack/repos/spack_repo/builtin/packages/piranha/package.py b/var/spack/repos/spack_repo/builtin/packages/piranha/package.py
index 99f73e08391..0a7048df199 100644
--- a/var/spack/repos/spack_repo/builtin/packages/piranha/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/piranha/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Piranha(CMakePackage):
     """Piranha is a computer-algebra library for the symbolic manipulation of
diff --git a/var/spack/repos/spack_repo/builtin/packages/pktools/package.py b/var/spack/repos/spack_repo/builtin/packages/pktools/package.py
index 6aa82a9c788..151d2000bfa 100644
--- a/var/spack/repos/spack_repo/builtin/packages/pktools/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/pktools/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Pktools(CMakePackage):
     """Processing Kernel for geospatial data"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/polymake/package.py b/var/spack/repos/spack_repo/builtin/packages/polymake/package.py
index 880ee98f90f..e25844c337c 100644
--- a/var/spack/repos/spack_repo/builtin/packages/polymake/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/polymake/package.py
@@ -2,11 +2,10 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Polymake(Package):
     """polymake is open source software for research in polyhedral geometry"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/povray/package.py b/var/spack/repos/spack_repo/builtin/packages/povray/package.py
index 3d9f1af6799..cfe4d86b547 100644
--- a/var/spack/repos/spack_repo/builtin/packages/povray/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/povray/package.py
@@ -9,11 +9,10 @@
 import socket
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Povray(AutotoolsPackage):
     """The Persistence of Vision Raytracer creates three-dimensional,
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_espresso/package.py b/var/spack/repos/spack_repo/builtin/packages/py_espresso/package.py
index cbc7a22bcb9..4ceb7b625d2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_espresso/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_espresso/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class PyEspresso(CMakePackage):
     """ESPResSo is a highly versatile software package for performing and
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_fluidsim/package.py b/var/spack/repos/spack_repo/builtin/packages/py_fluidsim/package.py
index 01a72d9f253..7ca21f49681 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_fluidsim/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_fluidsim/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.python import PythonPackage
+from spack_repo.builtin.packages.py_fluidsim_core.package import PyFluidsimCore
 
 from spack.package import *
 
-from ..py_fluidsim_core.package import PyFluidsimCore
-
 
 class PyFluidsim(PythonPackage):
     """Framework for studying fluid dynamics with simulations."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_pillow_simd/package.py b/var/spack/repos/spack_repo/builtin/packages/py_pillow_simd/package.py
index 96f3dbd75bf..4e9415c139e 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_pillow_simd/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_pillow_simd/package.py
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack.package import *
+from spack_repo.builtin.packages.py_pillow.package import PyPillowBase
 
-from ..py_pillow.package import PyPillowBase
+from spack.package import *
 
 
 class PyPillowSimd(PyPillowBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_pycuda/package.py b/var/spack/repos/spack_repo/builtin/packages/py_pycuda/package.py
index 76fb56fc1a6..156f7e821fc 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_pycuda/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_pycuda/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.python import PythonPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class PyPycuda(PythonPackage):
     """PyCUDA gives you easy, Pythonic access to Nvidia's CUDA parallel
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_python_mapnik/package.py b/var/spack/repos/spack_repo/builtin/packages/py_python_mapnik/package.py
index aacc60458fb..1e24bac2e44 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_python_mapnik/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_python_mapnik/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.python import PythonPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class PyPythonMapnik(PythonPackage):
     """
diff --git a/var/spack/repos/spack_repo/builtin/packages/py_quast/package.py b/var/spack/repos/spack_repo/builtin/packages/py_quast/package.py
index 661ef0e0599..5587378e417 100644
--- a/var/spack/repos/spack_repo/builtin/packages/py_quast/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/py_quast/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.python import PythonPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class PyQuast(PythonPackage):
     """Quality Assessment Tool for Genome Assemblies"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_5compat/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_5compat/package.py
index 4deee46c677..0b3155fa7bc 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_5compat/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_5compat/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class Qt5compat(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_declarative/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_declarative/package.py
index 205b4f11067..0750ea62f31 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_declarative/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_declarative/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtDeclarative(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_quick3d/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_quick3d/package.py
index a256adea7cc..fce5d6fc390 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_quick3d/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_quick3d/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtQuick3d(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_quicktimeline/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_quicktimeline/package.py
index f75edac4b92..4fb2a1837fd 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_quicktimeline/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_quicktimeline/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtQuicktimeline(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_shadertools/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_shadertools/package.py
index 836a4165ca8..965ad537b31 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_shadertools/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_shadertools/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtShadertools(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_svg/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_svg/package.py
index 0ccebcc9735..ef4e0eaf9f8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_svg/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_svg/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtSvg(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/qt_tools/package.py b/var/spack/repos/spack_repo/builtin/packages/qt_tools/package.py
index 4f8901172bf..285f0422e44 100644
--- a/var/spack/repos/spack_repo/builtin/packages/qt_tools/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/qt_tools/package.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
-from spack.package import *
+from spack_repo.builtin.packages.qt_base.package import QtBase, QtPackage
 
-from ..qt_base.package import QtBase, QtPackage
+from spack.package import *
 
 
 class QtTools(QtPackage):
diff --git a/var/spack/repos/spack_repo/builtin/packages/r_phantompeakqualtools/package.py b/var/spack/repos/spack_repo/builtin/packages/r_phantompeakqualtools/package.py
index aa3b07c03a5..aa93e4d9928 100644
--- a/var/spack/repos/spack_repo/builtin/packages/r_phantompeakqualtools/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/r_phantompeakqualtools/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.r import RPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class RPhantompeakqualtools(RPackage):
     """Computes informative enrichment and quality measures for
diff --git a/var/spack/repos/spack_repo/builtin/packages/raja/package.py b/var/spack/repos/spack_repo/builtin/packages/raja/package.py
index f264f1af27e..c9b36bbe213 100644
--- a/var/spack/repos/spack_repo/builtin/packages/raja/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/raja/package.py
@@ -12,11 +12,10 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
-from ..blt.package import llnl_link_helpers
-
 
 # Starting with 2022.03.0, the only submodule we want to fetch is tpl/desul
 # since there is no package for it. Other RAJA submodules are defined as
diff --git a/var/spack/repos/spack_repo/builtin/packages/raja_perf/package.py b/var/spack/repos/spack_repo/builtin/packages/raja_perf/package.py
index b78b5542b63..db4f2dd1f4b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/raja_perf/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/raja_perf/package.py
@@ -12,11 +12,10 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
-from ..blt.package import llnl_link_helpers
-
 
 class RajaPerf(CachedCMakePackage, CudaPackage, ROCmPackage):
     """RAJA Performance Suite."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/revbayes/package.py b/var/spack/repos/spack_repo/builtin/packages/revbayes/package.py
index 139fe9b6ec4..20cb85a0e76 100644
--- a/var/spack/repos/spack_repo/builtin/packages/revbayes/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/revbayes/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Revbayes(CMakePackage):
     """Bayesian phylogenetic inference using probabilistic graphical models
diff --git a/var/spack/repos/spack_repo/builtin/packages/rocm_tensile/package.py b/var/spack/repos/spack_repo/builtin/packages/rocm_tensile/package.py
index 2d26088aecc..34837a415bf 100644
--- a/var/spack/repos/spack_repo/builtin/packages/rocm_tensile/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/rocm_tensile/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class RocmTensile(CMakePackage):
     """Radeon Open Compute Tensile library"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/rose/package.py b/var/spack/repos/spack_repo/builtin/packages/rose/package.py
index 801bfe96229..d6f3b8729a5 100644
--- a/var/spack/repos/spack_repo/builtin/packages/rose/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/rose/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Rose(AutotoolsPackage):
     """A compiler infrastructure to build source-to-source program
diff --git a/var/spack/repos/spack_repo/builtin/packages/rpp/package.py b/var/spack/repos/spack_repo/builtin/packages/rpp/package.py
index 223918a2a3b..7171cf1f6e0 100644
--- a/var/spack/repos/spack_repo/builtin/packages/rpp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/rpp/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Rpp(CMakePackage):
     """Radeon Performance Primitives (RPP) library is a comprehensive high-
diff --git a/var/spack/repos/spack_repo/builtin/packages/sailfish/package.py b/var/spack/repos/spack_repo/builtin/packages/sailfish/package.py
index aac473d382b..3256168dc0b 100644
--- a/var/spack/repos/spack_repo/builtin/packages/sailfish/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/sailfish/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Sailfish(CMakePackage):
     """Sailfish is a tool for transcript quantification from RNA-seq data."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/samrai/package.py b/var/spack/repos/spack_repo/builtin/packages/samrai/package.py
index ef0d97c0ebf..b6f65cb30b3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/samrai/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/samrai/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Samrai(AutotoolsPackage):
     """SAMRAI (Structured Adaptive Mesh Refinement Application Infrastructure)
diff --git a/var/spack/repos/spack_repo/builtin/packages/scantailor/package.py b/var/spack/repos/spack_repo/builtin/packages/scantailor/package.py
index 902db8bb650..d9fa02839e8 100644
--- a/var/spack/repos/spack_repo/builtin/packages/scantailor/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/scantailor/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Scantailor(CMakePackage):
     """Scan Tailor is an interactive post-processing tool for scanned pages. It
diff --git a/var/spack/repos/spack_repo/builtin/packages/sgpp/package.py b/var/spack/repos/spack_repo/builtin/packages/sgpp/package.py
index 4a6a22b3869..02b9e9b9d46 100644
--- a/var/spack/repos/spack_repo/builtin/packages/sgpp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/sgpp/package.py
@@ -6,11 +6,10 @@
 
 from spack_repo.builtin.build_systems.python import PythonPipBuilder
 from spack_repo.builtin.build_systems.scons import SConsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Sgpp(SConsPackage):
     """SGpp is a library and framework for sparse grids in different flavors.
diff --git a/var/spack/repos/spack_repo/builtin/packages/shark/package.py b/var/spack/repos/spack_repo/builtin/packages/shark/package.py
index a5f8702ea61..e4ff1e0c6b3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/shark/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/shark/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Shark(CMakePackage):
     """Shark is a fast, modular, general open-source C++ machine
diff --git a/var/spack/repos/spack_repo/builtin/packages/singularity/package.py b/var/spack/repos/spack_repo/builtin/packages/singularity/package.py
index 48b132b6e2c..191b3ba221d 100644
--- a/var/spack/repos/spack_repo/builtin/packages/singularity/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/singularity/package.py
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from spack.package import *
+from spack_repo.builtin.packages.singularityce.package import SingularityBase
 
-from ..singularityce.package import SingularityBase
+from spack.package import *
 
 
 class Singularity(SingularityBase):
diff --git a/var/spack/repos/spack_repo/builtin/packages/spot/package.py b/var/spack/repos/spack_repo/builtin/packages/spot/package.py
index 195f13573cb..54d4fe0c727 100644
--- a/var/spack/repos/spack_repo/builtin/packages/spot/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/spot/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Spot(AutotoolsPackage):
     """Spot is a C++11 library for omega-automata manipulation and model
diff --git a/var/spack/repos/spack_repo/builtin/packages/stat/package.py b/var/spack/repos/spack_repo/builtin/packages/stat/package.py
index 84d06283cb4..b4ab2e67219 100644
--- a/var/spack/repos/spack_repo/builtin/packages/stat/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/stat/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Stat(AutotoolsPackage):
     """Library to create, manipulate, and export graphs Graphlib."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/symengine/package.py b/var/spack/repos/spack_repo/builtin/packages/symengine/package.py
index c99e75f3bf8..6d0aa3d7648 100644
--- a/var/spack/repos/spack_repo/builtin/packages/symengine/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/symengine/package.py
@@ -5,11 +5,10 @@
 import sys
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Symengine(CMakePackage):
     """SymEngine is a fast symbolic manipulation library, written in C++."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/sympol/package.py b/var/spack/repos/spack_repo/builtin/packages/sympol/package.py
index ce954809302..212f5b0cd92 100644
--- a/var/spack/repos/spack_repo/builtin/packages/sympol/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/sympol/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Sympol(CMakePackage):
     """SymPol is a C++ tool to work with symmetric polyhedra"""
diff --git a/var/spack/repos/spack_repo/builtin/packages/trilinos/package.py b/var/spack/repos/spack_repo/builtin/packages/trilinos/package.py
index 936b6bd0f31..3c91a339a82 100644
--- a/var/spack/repos/spack_repo/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/trilinos/package.py
@@ -10,13 +10,12 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.kokkos.package import Kokkos
 
 from spack.build_environment import dso_suffix
 from spack.operating_systems.mac_os import macos_version
 from spack.package import *
 
-from ..kokkos.package import Kokkos
-
 # Trilinos is complicated to build, as an inspiration a couple of links to
 # other repositories which build it:
 # https://github.com/hpcugent/easybuild-easyblocks/blob/master/easybuild/easyblocks/t/trilinos.py#L111
diff --git a/var/spack/repos/spack_repo/builtin/packages/umpire/package.py b/var/spack/repos/spack_repo/builtin/packages/umpire/package.py
index aa4333840b7..2feaf32dce2 100644
--- a/var/spack/repos/spack_repo/builtin/packages/umpire/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/umpire/package.py
@@ -13,11 +13,10 @@
 )
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
+from spack_repo.builtin.packages.blt.package import llnl_link_helpers
 
 from spack.package import *
 
-from ..blt.package import llnl_link_helpers
-
 
 class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
     """An application-focused API for memory management on NUMA & GPU
diff --git a/var/spack/repos/spack_repo/builtin/packages/vigra/package.py b/var/spack/repos/spack_repo/builtin/packages/vigra/package.py
index 8f0dbf7f027..4556f2c5d0f 100644
--- a/var/spack/repos/spack_repo/builtin/packages/vigra/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/vigra/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Vigra(CMakePackage):
     """VIGRA stands for "Vision with Generic Algorithms". It's an image
diff --git a/var/spack/repos/spack_repo/builtin/packages/votca_csg_tutorials/package.py b/var/spack/repos/spack_repo/builtin/packages/votca_csg_tutorials/package.py
index fec8916077d..5b00bbc0896 100644
--- a/var/spack/repos/spack_repo/builtin/packages/votca_csg_tutorials/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/votca_csg_tutorials/package.py
@@ -4,11 +4,10 @@
 
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class VotcaCsgTutorials(CMakePackage):
     """Versatile Object-oriented Toolkit for Coarse-graining
diff --git a/var/spack/repos/spack_repo/builtin/packages/vtk/package.py b/var/spack/repos/spack_repo/builtin/packages/vtk/package.py
index 6257b63df15..b0492d272b3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/vtk/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/vtk/package.py
@@ -7,11 +7,10 @@
 import os
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Vtk(CMakePackage):
     """The Visualization Toolkit (VTK) is an open-source, freely
diff --git a/var/spack/repos/spack_repo/builtin/packages/wcs/package.py b/var/spack/repos/spack_repo/builtin/packages/wcs/package.py
index d2f51b9d9f9..997d6ecd5ad 100644
--- a/var/spack/repos/spack_repo/builtin/packages/wcs/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/wcs/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Wcs(CMakePackage):
     """Simulates whole cell models using discrete event simulation."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/wonton/package.py b/var/spack/repos/spack_repo/builtin/packages/wonton/package.py
index 7bdd5150b7f..a510d982ef4 100644
--- a/var/spack/repos/spack_repo/builtin/packages/wonton/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/wonton/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Wonton(CMakePackage):
     """Wonton is a support package for the Portage
diff --git a/var/spack/repos/spack_repo/builtin/packages/wt/package.py b/var/spack/repos/spack_repo/builtin/packages/wt/package.py
index af4bee4b908..da600e91154 100644
--- a/var/spack/repos/spack_repo/builtin/packages/wt/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/wt/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Wt(CMakePackage):
     """Wt, C++ Web Toolkit.
diff --git a/var/spack/repos/spack_repo/builtin/packages/xdmf3/package.py b/var/spack/repos/spack_repo/builtin/packages/xdmf3/package.py
index b263e672289..178e1ca89db 100644
--- a/var/spack/repos/spack_repo/builtin/packages/xdmf3/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/xdmf3/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Xdmf3(CMakePackage):
     """XDMF, or eXtensible Data Model and Format (XDMF), is a common data model
diff --git a/var/spack/repos/spack_repo/builtin/packages/xios/package.py b/var/spack/repos/spack_repo/builtin/packages/xios/package.py
index 05121a97c07..4d63c3165e3 100644
--- a/var/spack/repos/spack_repo/builtin/packages/xios/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/xios/package.py
@@ -5,11 +5,10 @@
 import os
 
 from spack_repo.builtin.build_systems.generic import Package
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 
 class Xios(Package):
     """XML-IO-SERVER library for IO management of climate models."""
diff --git a/var/spack/repos/spack_repo/builtin/packages/yaml_cpp/package.py b/var/spack/repos/spack_repo/builtin/packages/yaml_cpp/package.py
index 956b150b007..06691a8a08c 100644
--- a/var/spack/repos/spack_repo/builtin/packages/yaml_cpp/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/yaml_cpp/package.py
@@ -3,11 +3,10 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack_repo.builtin.build_systems.cmake import CMakePackage
+from spack_repo.builtin.packages.boost.package import Boost
 
 from spack.package import *
 
-from ..boost.package import Boost
-
 yaml_cpp_tests_libcxx_error_msg = "yaml-cpp tests incompatible with libc++"