commit: 0bc26d0779f0c933a5c1b5a93cde15a0a9e051bc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 13 10:31:53 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jan 13 13:16:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc26d07
Move {dev-util → dev-build}/samurai Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/34779 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-alternatives/ninja/metadata.xml | 2 +- app-alternatives/ninja/ninja-1.ebuild | 2 +- {dev-util => dev-build}/samurai/Manifest | 0 .../samurai/files/samurai-1.2-null_pointer_fix.patch | 0 {dev-util => dev-build}/samurai/metadata.xml | 0 {dev-util => dev-build}/samurai/samurai-1.2-r2.ebuild | 0 {dev-util => dev-build}/samurai/samurai-9999.ebuild | 0 profiles/arch/alpha/package.use.mask | 2 +- profiles/arch/hppa/package.use.mask | 2 +- profiles/arch/ia64/package.use.mask | 2 +- profiles/arch/loong/package.use.mask | 2 +- profiles/arch/m68k/package.use.mask | 2 +- profiles/arch/mips/package.use.mask | 2 +- profiles/arch/s390/package.use.mask | 2 +- profiles/arch/sparc/package.use.mask | 2 +- profiles/updates/1Q-2024 | 1 + 16 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app-alternatives/ninja/metadata.xml b/app-alternatives/ninja/metadata.xml index 39c673e29649..c55e08897525 100644 --- a/app-alternatives/ninja/metadata.xml +++ b/app-alternatives/ninja/metadata.xml @@ -11,6 +11,6 @@ </maintainer> <use> <flag name="reference">Symlink to dev-build/ninja.</flag> - <flag name="samurai">Symlink to dev-util/samurai.</flag> + <flag name="samurai">Symlink to dev-build/samurai.</flag> </use> </pkgmetadata> diff --git a/app-alternatives/ninja/ninja-1.ebuild b/app-alternatives/ninja/ninja-1.ebuild index 786716eb506a..4107b5569b71 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 7dff65e5cba2..6099f2df38d5 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro <matoro_gen...@matoro.tk> (2023-06-29) diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 39ed32f14633..db4ce9e90e09 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Ionen Wolkens <io...@gentoo.org> (2023-10-09) diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index daed8ca56645..cf2c7474c9fb 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean <chutz...@gentoo.org> (2023-10-03) diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index def60658c249..a80faf224e94 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James <s...@gentoo.org> (2023-10-08) diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask index 090a12840d35..84c7e1c2367a 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James <s...@gentoo.org> (2023-06-18) diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask index 52eb3ff1932f..08776de3d673 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro <matoro_gen...@matoro.tk> (2023-06-18) diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask index cc653abdeb60..dd06dd907f21 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean <chutz...@gentoo.org> (2023-10-03) diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index 691574997f60..eb1f8de33578 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 <vimpro...@inventati.org> (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Andreas Sturmlechner <ast...@gentoo.org> (2023-10-08) diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index d27be1ff1406..0265907781c0 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