diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
| commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
| tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /dev-ada/libadalang | |
| parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) | |
gentoo resync : 15.12.2017
Diffstat (limited to 'dev-ada/libadalang')
| -rw-r--r-- | dev-ada/libadalang/Manifest | 5 | ||||
| -rw-r--r-- | dev-ada/libadalang/files/libadalang-2017-gentoo.patch | 12 | ||||
| -rw-r--r-- | dev-ada/libadalang/libadalang-2017.ebuild | 8 |
3 files changed, 16 insertions, 9 deletions
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest index dd4a7816ebfc..cf307b5ec7e3 100644 --- a/dev-ada/libadalang/Manifest +++ b/dev-ada/libadalang/Manifest @@ -1,6 +1,5 @@ -AUX libadalang-2017-gentoo.patch 1615 BLAKE2B 192a3981bed1d408d72e06431068eb3c204e28635231540cb25a5d561c778f00fb3f6532a92d296d52df7b9c850e9975d14cd15298665f7eed4a9ff1cd2048fc SHA512 30bd5d34b5f0a365c9ffda9d95025c424f8e1c5f1ee471d5565e1ba97ef0214998e2da911fcf156386baad845e1393f5de82946f2e17ad2ac80e1d53fe4166b0 +AUX libadalang-2017-gentoo.patch 2381 BLAKE2B 515d7d56d1b0adf1f14c5955f799732b33d41c4f2d182ab14c3653a9a18012ec880527d904dc34ed67476f54ec2514c2972de37e9a4731f4b56c54ead0a526f9 SHA512 4cdd11c16c0961be7ff9e6c2b9094b96a0be2e001d6d297ec801f9f0d33c99ee47d00f4f42b7ab9ee2a74baee2215448bd15cbc54d36fb4ed6c66093d37374b2 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7 -DIST quex-0.65.4.tar.gz 2202154 BLAKE2B 6b273998c9641aeee458291245a4fb956b5fe9b66d8c42f0c1d9b360a4d171c830a1d487bcbab9ccea49d10b7532ed488ce66dc165f31cce9521f97c5a4575f4 SHA512 0b11d7e5c5165674626fbbe7f54853656c579c63b78bd2fef2f5a9b316171dc647812d9a37df4e7c49c05de11a307b6425089f4ab281affb6c03a9cf09e2a035 -EBUILD libadalang-2017.ebuild 2086 BLAKE2B 3fb67920d9c85c8405ff5b719e3cb5582f41faca280335845304a4d8780a3e6a2481c6e5116b4c490f65ce521cf19d8aa36ea140f312c2f2bffa811a4d91c475 SHA512 35319b7c17f1f5a59e95e21f179cb33384429e74bff1ac7a1d65f84e60e76d8fe9cb4013f196ec25c7af3ebca37a14ff06011fe79f0fc3812290ad0b6d1269d0 +EBUILD libadalang-2017.ebuild 1896 BLAKE2B 94ce515623fb7ce05cbe90fdcbc95b6dc073c0b4af331d1364d36feb301dbe8f678d65196fedb89817fc947f5b892afb037b3809f722d3d8799b8387947d3de5 SHA512 5456c7554c7f0456965c5c2959f41263fe4b51bd53cd6c6d646a558cb467934b1a3febb0a160e52d37f18b688c5b12e44188240872984031694bc9b560ec7b47 MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505 diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch index a54f0cf98583..bf4dfcde83d0 100644 --- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch +++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch @@ -30,3 +30,15 @@ end Compiler; end P; '''.format(main_source=compile_units[0], +--- work/langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100 ++++ work/langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100 +@@ -1171,8 +1171,7 @@ + # the Quex specification changed from last build. + if generate_lexer and self.cache.is_stale('quex_specification', + quex_spec): +- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") +- subprocess.check_call([sys.executable, quex_py_file, "-i", ++ subprocess.check_call(["quex", "-i", + quex_file, + "-o", "quex_lexer", + "--buffer-element-size", "4", diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild index 5a0a5cfba07e..958c5382196e 100644 --- a/dev-ada/libadalang/libadalang-2017.ebuild +++ b/dev-ada/libadalang/libadalang-2017.ebuild @@ -11,7 +11,6 @@ DESCRIPTION="high performance semantic engine for the Ada programming language" HOMEPAGE="https://libre.adacore.com/" SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042 -> ${P}-src.tar.gz - mirror://sourceforge/quex/quex-0.65.4.tar.gz http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 -> langkit-gps-src-${PV}.tar.gz" @@ -23,13 +22,12 @@ IUSE="gnat_2016 gnat_2017" RDEPEND="dev-python/pyyaml ${PYTHON_DEPS}" DEPEND="${RDEPEND} - dev-python/virtualenv dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] dev-python/docutils dev-python/mako dev-python/enum34 + dev-python/quex dev-python/funcy" -#REQUIRED_USE="gnat_2016 !gnat_2017 ${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}" @@ -46,7 +44,6 @@ src_compile() { mkdir bin ln -sf /usr/bin/gnatbind-4.9.4 bin/gnatbind PATH=$PATH:${PWD}/bin \ - QUEX_PATH="${WORKDIR}"/quex-0.65.4 \ PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die } @@ -66,8 +63,7 @@ src_test () { src_install () { cd ${PN}-gps-src - QUEX_PATH="${WORKDIR}"/quex-0.65.4 \ - PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ + PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ ada/manage.py install "${D}"usr python_domodule build/python/libadalang.py } |