| 1 |
commit: 63355397f4fd4701683b666cececfab3aad987fa |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 26 01:41:59 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 26 01:54:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63355397 |
| 7 |
|
| 8 |
dev-util/meson: add 0.62.1 |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/meson/Manifest | 1 + |
| 13 |
dev-util/meson/{meson-9999.ebuild => meson-0.62.1.ebuild} | 9 +++++---- |
| 14 |
dev-util/meson/meson-9999.ebuild | 7 ++++--- |
| 15 |
3 files changed, 10 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest |
| 18 |
index bbf8f6bc17b6..3cf416367b46 100644 |
| 19 |
--- a/dev-util/meson/Manifest |
| 20 |
+++ b/dev-util/meson/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc |
| 23 |
DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195 |
| 24 |
+DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32 |
| 25 |
|
| 26 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-0.62.1.ebuild |
| 27 |
similarity index 90% |
| 28 |
copy from dev-util/meson/meson-9999.ebuild |
| 29 |
copy to dev-util/meson/meson-0.62.1.ebuild |
| 30 |
index 7eb1c4f33e6c..a88263806484 100644 |
| 31 |
--- a/dev-util/meson/meson-9999.ebuild |
| 32 |
+++ b/dev-util/meson/meson-0.62.1.ebuild |
| 33 |
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then |
| 34 |
inherit git-r3 |
| 35 |
else |
| 36 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 37 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 38 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 39 |
fi |
| 40 |
|
| 41 |
inherit bash-completion-r1 distutils-r1 toolchain-funcs |
| 42 |
@@ -52,7 +52,7 @@ python_prepare_all() { |
| 43 |
-e 's/test_python_module/_&/' |
| 44 |
) |
| 45 |
|
| 46 |
- sed -i "${disable_unittests[@]}" run_unittests.py || die |
| 47 |
+ sed -i "${disable_unittests[@]}" unittests/*.py || die |
| 48 |
|
| 49 |
# Broken due to python2 script created by python_wrapper_setup |
| 50 |
rm -r "test cases/frameworks/1 boost" || die |
| 51 |
@@ -65,8 +65,6 @@ src_test() { |
| 52 |
if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then |
| 53 |
ewarn "Found Qt5Core but not Qt5Gui; skipping tests" |
| 54 |
else |
| 55 |
- # https://bugs.gentoo.org/687792 |
| 56 |
- unset PKG_CONFIG |
| 57 |
distutils-r1_src_test |
| 58 |
fi |
| 59 |
} |
| 60 |
@@ -76,6 +74,9 @@ python_test() { |
| 61 |
# test_meson_installed |
| 62 |
unset PYTHONDONTWRITEBYTECODE |
| 63 |
|
| 64 |
+ # https://bugs.gentoo.org/687792 |
| 65 |
+ unset PKG_CONFIG |
| 66 |
+ |
| 67 |
# test_cross_file_system_paths |
| 68 |
unset XDG_DATA_HOME |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild |
| 72 |
index 7eb1c4f33e6c..080d0f136b5d 100644 |
| 73 |
--- a/dev-util/meson/meson-9999.ebuild |
| 74 |
+++ b/dev-util/meson/meson-9999.ebuild |
| 75 |
@@ -52,7 +52,7 @@ python_prepare_all() { |
| 76 |
-e 's/test_python_module/_&/' |
| 77 |
) |
| 78 |
|
| 79 |
- sed -i "${disable_unittests[@]}" run_unittests.py || die |
| 80 |
+ sed -i "${disable_unittests[@]}" unittests/*.py || die |
| 81 |
|
| 82 |
# Broken due to python2 script created by python_wrapper_setup |
| 83 |
rm -r "test cases/frameworks/1 boost" || die |
| 84 |
@@ -65,8 +65,6 @@ src_test() { |
| 85 |
if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then |
| 86 |
ewarn "Found Qt5Core but not Qt5Gui; skipping tests" |
| 87 |
else |
| 88 |
- # https://bugs.gentoo.org/687792 |
| 89 |
- unset PKG_CONFIG |
| 90 |
distutils-r1_src_test |
| 91 |
fi |
| 92 |
} |
| 93 |
@@ -76,6 +74,9 @@ python_test() { |
| 94 |
# test_meson_installed |
| 95 |
unset PYTHONDONTWRITEBYTECODE |
| 96 |
|
| 97 |
+ # https://bugs.gentoo.org/687792 |
| 98 |
+ unset PKG_CONFIG |
| 99 |
+ |
| 100 |
# test_cross_file_system_paths |
| 101 |
unset XDG_DATA_HOME |
Archives