diff --git a/app-alternatives/ninja/metadata.xml b/app-alternatives/ninja/metadata.xml index 39c673e29649c..c55e088975253 100644 --- a/app-alternatives/ninja/metadata.xml +++ b/app-alternatives/ninja/metadata.xml @@ -11,6 +11,6 @@ Symlink to dev-build/ninja. - Symlink to dev-util/samurai. + Symlink to dev-build/samurai. diff --git a/app-alternatives/ninja/ninja-1.ebuild b/app-alternatives/ninja/ninja-1.ebuild index 786716eb506a5..4107b5569b710 100644 --- a/app-alternatives/ninja/ninja-1.ebuild +++ b/app-alternatives/ninja/ninja-1.ebuild @@ -5,7 +5,7 @@ EAPI=8 ALTERNATIVES=( "reference:>=dev-build/ninja-1.11.1-r3" - samurai:dev-util/samurai + samurai:dev-build/samurai ) inherit app-alternatives diff --git a/dev-util/samurai/Manifest b/dev-build/samurai/Manifest similarity index 100% rename from dev-util/samurai/Manifest rename to dev-build/samurai/Manifest diff --git a/dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch b/dev-build/samurai/files/samurai-1.2-null_pointer_fix.patch similarity index 100% rename from dev-util/samurai/files/samurai-1.2-null_pointer_fix.patch rename to dev-build/samurai/files/samurai-1.2-null_pointer_fix.patch diff --git a/dev-util/samurai/metadata.xml b/dev-build/samurai/metadata.xml similarity index 100% rename from dev-util/samurai/metadata.xml rename to dev-build/samurai/metadata.xml diff --git a/dev-util/samurai/samurai-1.2-r2.ebuild b/dev-build/samurai/samurai-1.2-r2.ebuild similarity index 100% rename from dev-util/samurai/samurai-1.2-r2.ebuild rename to dev-build/samurai/samurai-1.2-r2.ebuild diff --git a/dev-util/samurai/samurai-9999.ebuild b/dev-build/samurai/samurai-9999.ebuild similarity index 100% rename from dev-util/samurai/samurai-9999.ebuild rename to dev-build/samurai/samurai-9999.ebuild diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 7dff65e5cba2f..6099f2df38d5e 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -23,7 +23,7 @@ app-text/doxygen gui dev-util/cmake gui # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro (2023-06-29) diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 39ed32f14633e..db4ce9e90e09e 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -21,7 +21,7 @@ media-libs/libv4l bpf media-video/ffmpeg glslang shaderc vulkan # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Ionen Wolkens (2023-10-09) diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index daed8ca566456..cf2c7474c9fba 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -26,7 +26,7 @@ media-libs/libv4l bpf media-video/ffmpeg glslang shaderc vulkan # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean (2023-10-03) diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index def60658c2498..a80faf224e94f 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -18,7 +18,7 @@ media-libs/libplacebo -shaderc app-arch/rpm -sequoia # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James (2023-10-08) diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask index 090a12840d359..84c7e1c2367a1 100644 --- a/profiles/arch/m68k/package.use.mask +++ b/profiles/arch/m68k/package.use.mask @@ -6,7 +6,7 @@ media-libs/libv4l bpf # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James (2023-06-18) diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask index 52eb3ff1932fa..08776de3d673c 100644 --- a/profiles/arch/mips/package.use.mask +++ b/profiles/arch/mips/package.use.mask @@ -56,7 +56,7 @@ x11-misc/xscreensaver new-login app-i18n/ibus gtk4 # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro (2023-06-18) diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask index cc653abdeb607..dd06dd907f213 100644 --- a/profiles/arch/s390/package.use.mask +++ b/profiles/arch/s390/package.use.mask @@ -24,7 +24,7 @@ dev-python/nbclient test dev-python/nbconvert test # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean (2023-10-03) diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 691574997f603..eb1f8de335780 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -48,7 +48,7 @@ dev-python/nbclient test dev-python/nbconvert test # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Andreas Sturmlechner (2023-10-08) diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index d27be1ff14064..0265907781c07 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -11,3 +11,4 @@ move sys-devel/gdb-apple dev-debug/gdb-apple move dev-util/lldb dev-debug/lldb move dev-util/cgdb dev-debug/cgdb move dev-util/ninja dev-build/ninja +move dev-util/samurai dev-build/samurai