From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- dev-util/meson/Manifest | 6 ++-- dev-util/meson/files/0.48.0-test-u.patch | 28 +++++++++++++++++ dev-util/meson/files/test-llvm.patch | 26 ++++++++++++++++ dev-util/meson/meson-0.48.0-r1.ebuild | 43 -------------------------- dev-util/meson/meson-0.48.0-r2.ebuild | 52 ++++++++++++++++++++++++++++++++ dev-util/meson/meson-9999.ebuild | 15 +++++++-- 6 files changed, 123 insertions(+), 47 deletions(-) create mode 100644 dev-util/meson/files/0.48.0-test-u.patch create mode 100644 dev-util/meson/files/test-llvm.patch delete mode 100644 dev-util/meson/meson-0.48.0-r1.ebuild create mode 100644 dev-util/meson/meson-0.48.0-r2.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 7306d0777470..cd879f0785ff 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,9 +1,11 @@ AUX 0.48.0-multilib.patch 2180 BLAKE2B 8201fe0c2e495671129653ae9fb9ff9135d28d4c49a02d97f0a5d78031272ce34733e95d48cb8b70bd933c939b96b068ab2189856c1281f4c606e9fce419988f SHA512 75facb5b8d668175c75313299ee570028dab266d1e0ce0e7d2d21cec3df1e2308b80008e2af801bfd63b931bf3a8fbc6a70f02dc1f5d371dddaea6365dca0daf +AUX 0.48.0-test-u.patch 927 BLAKE2B 620c4a1a74f562259e3ca48e409ba7be973e487479bcc14b5e354fda9122bb4d4eca0711f9385b93d4b1b68ee6a890c3948b34d1d43bd2d8768cdfe3cfa86bf0 SHA512 85645439625174469529cccb34b1198c07975141900d63dad40a4ff678c3abbcca44e270ba05f6a9d0e9fa4fa92515f77f56545ca3a3794c9d02dd198d6847a5 +AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da790600537e623e6c95be03b73ac48dae0d206cd2b91d8226f857f13c2545f9250c64e3917e729d75 SHA512 dbfa0596751a117f428aff29fc0879b8ca37fcefff96dc2815164bde5cd60ff9f722359a6204bc509e4548ec11a69d9ccd1e1ac99175202434c41c183f045f2d 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 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a -EBUILD meson-0.48.0-r1.ebuild 989 BLAKE2B 6f114e3eb92f9012dbf302dde1c555c29aa89674e93198aa039a76509ec60f917547884beda3e635dc4e3c6c07c0694a919f1fb408d3dc8fb37e2d7688d01fa5 SHA512 811e92a31c00d6500130efc8f4abee4b91fed903b55d559e1226e00e0b5750270bd485f36274de4a3841f9e3580a5d74bc4372ecf48fdabe150e24ab12620c2c -EBUILD meson-9999.ebuild 939 BLAKE2B df8ab6f647468ad3451e69eee5cf84ab98191a124e459ac1a65b37e5813c752a9899114c8722eeabcc9b78d8aea3885bfc11c78d20db7df2c52f89ac11c0c9ce SHA512 243878f66c0eb2009e6e79bdd13cf9e1b87d0a58a3c8b008c62229282f9166fb1b8d73e30e5c55d5a566eec8a67b72d27562e6ba7139b11d1a2f6acebab544c9 +EBUILD meson-0.48.0-r2.ebuild 1196 BLAKE2B 1e36c78920fa7897f72e497dc68c76e127cffc0d5491fc4ff7a23aa6c1e2a67543683ef753ea1b55957b526ac7c206e64c8f4abd83fc32993573d3cf280e8473 SHA512 f7a6f2ceb491a429a2d03e814bc746c318c766aca488a578bb2424999e56c4f5b9b1afa4734af6f88868eb7863c69a3b5f34a6c9535bc6a1772968aa6be23151 +EBUILD meson-9999.ebuild 1124 BLAKE2B 38282459eddadc22bf10e3ba29373f06003b72930f60d74546aba436c164cdb26394f450b3fa85ec972465e2c171682d7cc2b0cf436ff7249bed50c20e9b82fa SHA512 80a17e57a3547bcf5e2f90ca20924d56beb825c57daf5a180196301bd11d1437439742f720bef8e4325f2517bdad8accc862f7b5fe362629b822281c6179ba0c MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467 diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch new file mode 100644 index 000000000000..099d4686b963 --- /dev/null +++ b/dev-util/meson/files/0.48.0-test-u.patch @@ -0,0 +1,28 @@ +From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001 +From: Masanori Kakura +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 new file mode 100644 index 000000000000..af7b9834bf33 --- /dev/null +++ b/dev-util/meson/files/test-llvm.patch @@ -0,0 +1,26 @@ +From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +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.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r1.ebuild deleted file mode 100644 index d0fbb01b4722..000000000000 --- a/dev-util/meson/meson-0.48.0-r1.ebuild +++ /dev/null @@ -1,43 +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="" -RESTRICT="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="" - -PATCHES=( - "${FILESDIR}"/0.48.0-multilib.patch -) - -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 new file mode 100644 index 000000000000..653033f818b0 --- /dev/null +++ b/dev-util/meson/meson-0.48.0-r2.ebuild @@ -0,0 +1,52 @@ +# 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="" + +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-9999.ebuild b/dev-util/meson/meson-9999.ebuild index aace7f3caa4f..0d5b9b4711c3 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -20,13 +20,24 @@ HOMEPAGE="http://mesonbuild.com/" LICENSE="Apache-2.0" SLOT="0" IUSE="" -RESTRICT="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="" +PATCHES=( + "${FILESDIR}"/test-llvm.patch +) + python_test() { - ${EPYTHON} run_tests.py || die + ( + # 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() { -- cgit v1.2.3