commit: 0212caa6b03ce277e0ac4da287515ea6818c178b
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 17 05:19:38 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Apr 17 17:22:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0212caa6
dev-build/meson: fix DeprecatedInsinto by using dozshcomp
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
dev-build/meson/meson-1.1.1.ebuild | 8 +++-----
dev-build/meson/meson-1.2.3.ebuild | 8 +++-----
dev-build/meson/meson-1.3.2.ebuild | 8 +++-----
dev-build/meson/meson-1.4.2.ebuild | 8 +++-----
dev-build/meson/meson-1.5.2.ebuild | 6 ++----
dev-build/meson/meson-1.6.1.ebuild | 6 ++----
dev-build/meson/meson-1.7.0.ebuild | 6 ++----
dev-build/meson/meson-1.7.1.ebuild | 6 ++----
dev-build/meson/meson-1.7.2.ebuild | 6 ++----
dev-build/meson/meson-9999.ebuild | 6 ++----
10 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/dev-build/meson/meson-1.1.1.ebuild
b/dev-build/meson/meson-1.1.1.ebuild
index 046626dcf1ee..0a8484ef5fd9 100644
--- a/dev-build/meson/meson-1.1.1.ebuild
+++ b/dev-build/meson/meson-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,7 @@ else
fi
fi
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
+inherit shell-completion distutils-r1 toolchain-funcs
DESCRIPTION="Open source build system"
HOMEPAGE="https://mesonbuild.com/";
@@ -122,8 +122,6 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
}
diff --git a/dev-build/meson/meson-1.2.3.ebuild
b/dev-build/meson/meson-1.2.3.ebuild
index e16c6fcdaf03..1f079237894d 100644
--- a/dev-build/meson/meson-1.2.3.ebuild
+++ b/dev-build/meson/meson-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,7 @@ else
fi
fi
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
+inherit shell-completion distutils-r1 toolchain-funcs
DESCRIPTION="Open source build system"
HOMEPAGE="https://mesonbuild.com/";
@@ -122,8 +122,6 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
}
diff --git a/dev-build/meson/meson-1.3.2.ebuild
b/dev-build/meson/meson-1.3.2.ebuild
index 91edc2952ebc..2b63162bf558 100644
--- a/dev-build/meson/meson-1.3.2.ebuild
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,7 +28,7 @@ else
fi
fi
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
+inherit shell-completion distutils-r1 toolchain-funcs
DESCRIPTION="Open source build system"
HOMEPAGE="https://mesonbuild.com/";
@@ -123,8 +123,6 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
}
diff --git a/dev-build/meson/meson-1.4.2.ebuild
b/dev-build/meson/meson-1.4.2.ebuild
index 9fed7743ff77..c8150486a733 100644
--- a/dev-build/meson/meson-1.4.2.ebuild
+++ b/dev-build/meson/meson-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 Gentoo Authors
+# Copyright 2016-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -181,9 +181,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-1.5.2.ebuild
b/dev-build/meson/meson-1.5.2.ebuild
index 7fa68e621475..9459d9c56cfb 100644
--- a/dev-build/meson/meson-1.5.2.ebuild
+++ b/dev-build/meson/meson-1.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -177,9 +177,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-1.6.1.ebuild
b/dev-build/meson/meson-1.6.1.ebuild
index 5d15af9e3c93..fe3f587f749d 100644
--- a/dev-build/meson/meson-1.6.1.ebuild
+++ b/dev-build/meson/meson-1.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -214,9 +214,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-1.7.0.ebuild
b/dev-build/meson/meson-1.7.0.ebuild
index 460fa6edad56..74fc5cee9d8c 100644
--- a/dev-build/meson/meson-1.7.0.ebuild
+++ b/dev-build/meson/meson-1.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -214,9 +214,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-1.7.1.ebuild
b/dev-build/meson/meson-1.7.1.ebuild
index 05aa3dd4f8d0..009a98dca97f 100644
--- a/dev-build/meson/meson-1.7.1.ebuild
+++ b/dev-build/meson/meson-1.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -214,9 +214,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-1.7.2.ebuild
b/dev-build/meson/meson-1.7.2.ebuild
index 1748aeb50ef4..e812183223ea 100644
--- a/dev-build/meson/meson-1.7.2.ebuild
+++ b/dev-build/meson/meson-1.7.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -217,9 +217,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
diff --git a/dev-build/meson/meson-9999.ebuild
b/dev-build/meson/meson-9999.ebuild
index 20a9cf91dd60..3a33c45497ee 100644
--- a/dev-build/meson/meson-9999.ebuild
+++ b/dev-build/meson/meson-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
DISTUTILS_USE_PEP517=setuptools
-inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson";
@@ -217,9 +217,7 @@ python_install_all() {
insinto /usr/share/vim/vimfiles
doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
+ dozshcomp data/shell-completions/zsh/_meson
dobashcomp data/shell-completions/bash/meson
if [[ ${PV} = *9999* ]]; then
