commit: 418feef19a1a3027c12ec552909ee0f9cf49ff87 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Jan 26 17:38:56 2019 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Jan 26 17:41:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418feef1
dev-util/meson: remove old versions Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> dev-util/meson/Manifest | 4 --- dev-util/meson/files/0.48.0-multilib.patch | 48 --------------------------- dev-util/meson/files/0.48.0-test-u.patch | 28 ---------------- dev-util/meson/files/test-llvm.patch | 26 --------------- dev-util/meson/meson-0.46.1.ebuild | 39 ---------------------- dev-util/meson/meson-0.47.1.ebuild | 39 ---------------------- dev-util/meson/meson-0.48.0-r2.ebuild | 52 ------------------------------ dev-util/meson/meson-0.48.1.ebuild | 50 ---------------------------- 8 files changed, 286 deletions(-) diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 36ecd30f910..caeb19cb6c6 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,7 +1,3 @@ -DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98 -DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b -DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b -DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b DIST meson-0.49.1.tar.gz 1340585 BLAKE2B 7df52f68948c74d4d713d57406a7b496e33740e43ea069b5cb6474a80b94800f8af7983413f3154eb2e6b7f0ea8df51e7359b8b7c6661f454dbb9a21ccf9bdc6 SHA512 cc955509d2c82b12d347f7a670a0e2abf5f6a4455dda3d53ec4abb0930b5f1c4a0ff996223ba5a5333bfec66e5d3fb3448a8187d4640e4b65397fc3e0e43dc72 diff --git a/dev-util/meson/files/0.48.0-multilib.patch b/dev-util/meson/files/0.48.0-multilib.patch deleted file mode 100644 index 0b488f50cd5..00000000000 --- a/dev-util/meson/files/0.48.0-multilib.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3bb300a76ed4d7a614c4a83ddefe86425040ec13 Mon Sep 17 00:00:00 2001 -From: Dylan Baker <[email protected]> -Date: Mon, 24 Sep 2018 11:08:19 -0700 -Subject: [PATCH] backends: allow running host arch binaries on compatible - build machines - -Meson 0.48.0 some validation for using compiled binaries in custom -targets and generators, which is nice. It didn't take into account -though that as long as the OS is the same, some architectures support -running a related architecture natively (x86_64 can run x86 natively, -for example). - -Fortunately we already have a method for covering this case available -through the Environment class. - -Fixes #4254 ---- - mesonbuild/backend/backends.py | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index 0e7e8e0fe3..ccbbe173fd 100644 ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -13,6 +13,7 @@ - # limitations under the License. - - import os, pickle, re -+import textwrap - from .. import build - from .. import dependencies - from .. import mesonlib -@@ -731,10 +732,11 @@ def get_regen_filelist(self): - def exe_object_to_cmd_array(self, exe): - if self.environment.is_cross_build() and \ - isinstance(exe, build.BuildTarget) and exe.is_cross: -- if self.environment.exe_wrapper is None: -- s = 'Can not use target %s as a generator because it is cross-built\n' -- s += 'and no exe wrapper is defined. You might want to set it to native instead.' -- s = s % exe.name -+ if self.environment.exe_wrapper is None and self.environment.cross_info.need_exe_wrapper(): -+ s = textwrap.dedent(''' -+ Can not use target {} as a generator because it is cross-built -+ and no exe wrapper is defined or needs_exe_wrapper is true. -+ You might want to set it to native instead.'''.format(exe.name)) - raise MesonException(s) - if isinstance(exe, build.BuildTarget): - exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))] diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch deleted file mode 100644 index 099d4686b96..00000000000 --- a/dev-util/meson/files/0.48.0-test-u.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001 -From: Masanori Kakura <[email protected]> -Date: Tue, 25 Sep 2018 18:04:06 +0900 -Subject: [PATCH] environment: Use os.path.basename() when checking - mesonlib.meson_command - -Without this, when one of Meson's parent directories contains -"python", unexpected option "-u" will be passed to Meson. ---- - mesonbuild/environment.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 7a44f2fd..a0c2fda4 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -375,7 +375,7 @@ class Environment: - - def get_build_command(self, unbuffered=False): - cmd = mesonlib.meson_command[:] -- if unbuffered and 'python' in cmd[0]: -+ if unbuffered and 'python' in os.path.basename(cmd[0]): - cmd.insert(1, '-u') - return cmd - --- -2.19.0 - diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch deleted file mode 100644 index af7b9834bf3..00000000000 --- a/dev-util/meson/files/test-llvm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sat, 6 Oct 2018 21:11:36 -0400 -Subject: [PATCH] Disable testing of static llvm linkage - -Gentoo doesn't provide static libs for llvm. ---- - test cases/frameworks/15 llvm/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build -index e05fddd2..9b38a454 100644 ---- a/test cases/frameworks/15 llvm/meson.build -+++ b/test cases/frameworks/15 llvm/meson.build -@@ -20,7 +20,7 @@ if not dep_tinfo.found() - dep_tinfo = cpp.find_library('tinfo', required: false) - endif - --foreach static : [true, false] -+foreach static : [false] - llvm_dep = dependency( - 'llvm', - modules : ['bitwriter', 'asmprinter', 'executionengine', 'target', --- -2.19.0 - diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild deleted file mode 100644 index cabc6b2b4e6..00000000000 --- a/dev-util/meson/meson-0.46.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson"; - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris" -fi - -inherit distutils-r1 - -DESCRIPTION="Open source build system" -HOMEPAGE="http://mesonbuild.com/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -RESTRICT="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -python_test() { - ${EPYTHON} run_tests.py || die -} - -python_install_all() { - distutils-r1_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 -} diff --git a/dev-util/meson/meson-0.47.1.ebuild b/dev-util/meson/meson-0.47.1.ebuild deleted file mode 100644 index 6a61d5bc666..00000000000 --- a/dev-util/meson/meson-0.47.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson"; - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris" -fi - -inherit distutils-r1 - -DESCRIPTION="Open source build system" -HOMEPAGE="http://mesonbuild.com/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -RESTRICT="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -python_test() { - ${EPYTHON} run_tests.py || die -} - -python_install_all() { - distutils-r1_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 -} diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild deleted file mode 100644 index e7fe15297da..00000000000 --- a/dev-util/meson/meson-0.48.0-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson"; - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris" -fi - -inherit distutils-r1 - -DESCRIPTION="Open source build system" -HOMEPAGE="http://mesonbuild.com/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/test-llvm.patch - "${FILESDIR}"/0.48.0-multilib.patch - "${FILESDIR}"/0.48.0-test-u.patch -) - -python_test() { - ( - # test_meson_installed - unset PYTHONDONTWRITEBYTECODE - - # test_cross_file_system_paths - unset XDG_DATA_HOME - - ${EPYTHON} -u run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_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 -} diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild deleted file mode 100644 index 882072a2fad..00000000000 --- a/dev-util/meson/meson-0.48.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson"; - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris" -fi - -inherit distutils-r1 - -DESCRIPTION="Open source build system" -HOMEPAGE="http://mesonbuild.com/"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/0.48.0-multilib.patch -) - -python_test() { - ( - # test_meson_installed - unset PYTHONDONTWRITEBYTECODE - - # test_cross_file_system_paths - unset XDG_DATA_HOME - - ${EPYTHON} -u run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_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 -}
