From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- dev-ada/Manifest.gz | Bin 3538 -> 3530 bytes dev-ada/gps/Manifest | 5 ++ dev-ada/gps/files/gps-2019-gentoo.patch | 77 +++++++++++++++++++++ dev-ada/gps/gps-2019.ebuild | 114 ++++++++++++++++++++++++++++++++ dev-ada/langkit/Manifest | 2 +- dev-ada/langkit/langkit-2019.ebuild | 1 + 6 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 dev-ada/gps/files/gps-2019-gentoo.patch create mode 100644 dev-ada/gps/gps-2019.ebuild (limited to 'dev-ada') diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz index 2105dffbde23..0f0548cb4ab1 100644 Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest index 5f7122b409ae..0cc89e1e79ed 100644 --- a/dev-ada/gps/Manifest +++ b/dev-ada/gps/Manifest @@ -1,6 +1,11 @@ AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79bd903e17be0fd879027638821edaa625a64f355b2355a37fa7472b9c1b1072e06fd24c9c5547369916f2bde SHA512 fbfb23f29de218ca1371e39aed70aa4ef22080a11aa8bcbd13ef3ea6b68f69db9a4c6f6f5c7c0cefa85ef6495685fb9811de2521b3085f2f25d9acce0ad14047 +AUX gps-2019-gentoo.patch 2976 BLAKE2B b79ead5d30030cb8e1bc1e67034cb6394a3898716b190b3c9850e2931a0cae22a6d39e23f3e996abee3c3a8b278631c299bf7e2d70e828a50e28af99024e3adb SHA512 bd7e30a3f11be4d6dabb01ebcfa199a400cd0ff7d590bc563a7cfd168710c20fefe08fc1617cfbf8abd4a5603f0a1b7cc42300ac270e040b159145e08ad04054 +DIST ada_language_server-2019-src.tar.gz 169018 BLAKE2B 3ed7412773887f6ebe58a8b08a6befa8be780d10c1abb3a38f524918fb60d7213699e2c7a2cd845d5dd154f9eccf8672ce8833e408dcdaa3621d173a0a8e5818 SHA512 dd25878719c5237c2f1e01097076758f25a350705a58c2988ff3e92179ceaf659981cdd0887df9916e4c1e2226419ebd526f14716da4d3fda0fcf454b9122d37 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470 +DIST gps-gpl-2019-src.tar.gz 13758956 BLAKE2B 71158537d9d970b97db06c1a5ed40cfec2f7c8523dbced763227463450b4fd469817abcd61339cde96a13bb2b721141339b15444e55bdc64cee7ed2458fd42ed SHA512 4420311303122fd365794830fb7a7868832b8211804d6e11773f598c307229b139993b3c81d91646f7b5aa9a7fba118895234c4ac89193d960dd3170a04e52a7 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84 +DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 EBUILD gps-2018-r2.ebuild 2826 BLAKE2B 5a2a574b9897041d16b0b91abfd0a7e156b0aaf693df4343890a838b8869e0932edc5fcbadd2a9331d94ceb43a2c368fc6f144c9db75a3f6540064f715b62823 SHA512 99c8d2c356285a62747f488ca5cd36d0b9dba2e5edbe300bcbfb48bc5fc7233e0441d58faa1e1d4fc7fafc1b0342baad6cbcbea6bd388b5a13170ae422e9ca5a +EBUILD gps-2019.ebuild 3149 BLAKE2B cb23c29aef034c0f3b370c42fae6a3c01c2bdbd4fcfab2d54c6863912bb0b354875ab766466ed44a3ea2b6b55381b41bc62045a5ce4c5a5347c99e3e9629b6a9 SHA512 4fd58f7c4505751e932e896adf52cfd67af925b06edb89f776251734c19b95e5f26b5be542e36a6e4de945c524958b2b62160ab109be665c3f0659e0dc42fd08 MISC metadata.xml 406 BLAKE2B 663412f7328e2ed9ca4df57304073e48b2c18d43c84c6a5a4b8331f57f731bd63c38d7eb23b9edb4939e0644238a7883581e3ae50afb708cd263a9c39f936671 SHA512 7e13f81414da0346f385d66d88eca699dab64aeaf7d22a38ff05bec1ddc3fab5f98f7d2049902a75f63bfe10f918c599f15a1497cdb09799fec8330152251b46 diff --git a/dev-ada/gps/files/gps-2019-gentoo.patch b/dev-ada/gps/files/gps-2019-gentoo.patch new file mode 100644 index 000000000000..00fc810a2b9b --- /dev/null +++ b/dev-ada/gps/files/gps-2019-gentoo.patch @@ -0,0 +1,77 @@ +--- a/gps/Makefile 2018-07-09 20:27:34.950424490 +0200 ++++ b/gps/Makefile 2018-07-09 20:37:39.510558817 +0200 +@@ -47,7 +47,8 @@ + for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done + endif + $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \ +- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` ++ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \ ++ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} + + resources: + ifeq ($(OS),Windows_NT) +--- a/Makefile.in 2018-07-09 21:51:08.422550386 +0200 ++++ b/Makefile.in 2018-07-09 21:51:32.187225891 +0200 +@@ -10,7 +10,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + GNATCOLL_INSTALL = @GNATCOLL_INSTALL@ +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ + bindir = $(prefix)/bin + sharedir = $(prefix)/share + examplesdir = $(prefix)/share/examples/gps +--- a/docs/Makefile.in 2018-07-09 21:53:33.074572729 +0200 ++++ b/docs/Makefile.in 2018-07-09 21:53:52.149311484 +0200 +@@ -1,4 +1,4 @@ +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ + docdir = $(prefix)/share/doc/gps + sharedir = $(prefix)/share/gps + +--- a/share/support/core/toolchains.py 2018-07-11 12:15:18.758674244 +0200 ++++ b/share/support/core/toolchains.py 2018-07-11 12:20:20.389220849 +0200 +@@ -16,11 +16,11 @@ + nullified by using an empty value in the corresponding tag + --> + +- gnat +- gnatls ++ @GNAT@ ++ @GNATLS@ + gdb + c++filt +- gnatmake ++ @GNATMAKE@ + gcc + g++ + gcc +--- a/share/support/core/projects.py 2018-07-11 13:49:29.631289680 +0200 ++++ b/share/support/core/projects.py 2018-07-11 13:51:46.568252607 +0200 +@@ -146,7 +146,7 @@ + + + +- gnatmake ++ @GNATMAKE@ + + + +@@ -166,7 +166,7 @@ + description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)." + hide_in="all" + label="Gnatls"> +- gnatls ++ @GNATLS@ + + + +@@ -206,7 +206,7 @@ + description="The gnat driver used to run the various commands associated with the GNAT toolchain." + hide_in="all" + label="GNAT"> +- gnat ++ @GNAT@ + + + diff --git a/dev-ada/gps/gps-2019.ebuild b/dev-ada/gps/gps-2019.ebuild new file mode 100644 index 000000000000..fef7223a4b72 --- /dev/null +++ b/dev-ada/gps/gps-2019.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +ADA_COMPAT=( gnat_2018 ) +inherit ada python-single-r1 autotools desktop llvm multilib + +MYP=${PN}-gpl-${PV}-src + +commitId="8606676b6b4fb245faad5e91127b15c2e61174e9" +alsId="286f2d6bb14ccd4583034b26fd923e1b80cf522c" + +DESCRIPTION="The GNAT Programming Studio" +HOMEPAGE="http://libre.adacore.com/tools/gps/" +SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz + -> ${MYP}.tar.gz + http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f + -> libadalang-tools-2019-20190517-195C4-src.tar.gz + https://github.com/AdaCore/ada_language_server/archive/${alsId}.tar.gz + -> ada_language_server-2019-src.tar.gz + http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> + gtk+-3.14.15-src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="${PYTHON_DEPS} + dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref] + dev-ada/gnatcoll-bindings[${ADA_USEDEP},python] + ~dev-ada/gtkada-2019[${ADA_USEDEP}] + ~dev-ada/libadalang-2019[${ADA_USEDEP}] + dev-libs/gobject-introspection + dev-libs/libffi + || ( + sys-devel/llvm:6 + sys-devel/llvm:7 + ) + sys-devel/clang:= + x11-themes/adwaita-icon-theme + x11-themes/hicolor-icon-theme + dev-python/pep8[${PYTHON_USEDEP}] + dev-python/jedi[${PYTHON_USEDEP}]" + +DEPEND="${RDEPEND}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ${ADA_REQUIRED_USE}" + +RESTRICT="test" + +S="${WORKDIR}"/${PN}-${commitId} + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +pkg_setup() { + LLVM_MAX_SLOT=7 + llvm_pkg_setup + python-single-r1_pkg_setup + ada_pkg_setup +} + +src_prepare() { + default + sed -i \ + -e "s:@GNATMAKE@:${GNATMAKE}:g" \ + -e "s:@GNAT@:${GNAT}:g" \ + -e "s:@GNATLS@:${GNATLS}:g" \ + share/support/core/toolchains.py \ + share/support/core/projects.py \ + || die + mv "${WORKDIR}"/libadalang-tools-2019-20190517-195C4-src laltools + mv "${WORKDIR}"/ada_language_server-${alsId} ada_language_server + echo "#!/bin/bash" > gps.sh + echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh + echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh + cd ../gtk+-3.14.15-src + sed -i \ + -e "/^libadd/s:=.*$:= \\\:" \ + -e "/^deps/s:=.*$:= \\\:" \ + ../gtk+-3.14.15-src/gtk/Makefile.in +} + +src_configure() { + econf \ + --with-clang=$(llvm-config --libdir) + cd ../gtk+-3.14.15-src + econf --disable-cups +} + +src_compile() { + emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \ + -XGPR_BUILD=relocatable" \ + Build=Production + gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ + -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die + cd ../gtk+-3.14.15-src + emake -C gtk/inspector + emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h + emake -C gtk libgtk-3.la +} + +src_install() { + default + make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;" + mv "${D}"/usr/bin/gps{,_exe} + newbin gps.sh gps + cd ../gtk+-3.14.15-src + emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES + rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die + dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0 +} diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index 854f15b76967..1cce10a0ee0d 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -3,5 +3,5 @@ AUX langkit-2019-gentoo.patch 3308 BLAKE2B 266bd5bd1d507a565c325e5668eebc3a2a96a DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f EBUILD langkit-2018.ebuild 1031 BLAKE2B 70e31054892cb9d53288827932fbbc57d6584ec87168a3dc461c993618eb46198ea9045600fb2f76d595ba63b6faa0bd28c2a9effac09691818552049eaa3024 SHA512 819a47dec6c36f66ac1240f2dd7d7cfb469604f8c12d10d095ba4010d9aadc04ae6cf72cf4a08b37cacc87ebd9cdc0baef85c6945c48f32dc9c4200c37b11b84 -EBUILD langkit-2019.ebuild 1051 BLAKE2B b2d9f137be3bd39deef51864af08f1b1a38a0d334df3d161bec6e963b91cf4fe42e3d896033af0d9249191c3f4c91da4dfc92544670f3da136bf9341542b45ab SHA512 ea814d9477fbc593bf0471b63e653c3be5f769277e453ebc4a74beed021069f83ce2acdd9d02661d82515e244dc1abd3346c534fd7ea7d53670a24ebc755852f +EBUILD langkit-2019.ebuild 1078 BLAKE2B abd78945ddafd9a7105afef643feed551132bf488b8e98710b4a3dc97415547b0b2e4cc62a61848578eede16b87930a88aa7bdde477df01afdd6f301e27c89b1 SHA512 5171e2f76e59d918ef4f4e338ddba1213393a69a7b52892400c96f63418c09dd13376f4fd4e60acce57a8b391f664598989e3f648fa32d32c8b8cf320db6fee9 MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714 diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild index 07c0444b1684..229fdd526dcc 100644 --- a/dev-ada/langkit/langkit-2019.ebuild +++ b/dev-ada/langkit/langkit-2019.ebuild @@ -18,6 +18,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} -- cgit v1.2.3