Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/, dev-ada/gps/files/
Date: Fri, 01 May 2020 08:54:10
Message-Id: 1588323212.975a01a2c0e74b0819120a28396c24279142fa52.mgorny@gentoo
1 commit: 975a01a2c0e74b0819120a28396c24279142fa52
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 08:33:42 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 08:53:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=975a01a2
7
8 dev-ada/gps: Remove old (LLVM 7)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-ada/gps/Manifest | 2 -
13 dev-ada/gps/files/gps-2018-gentoo.patch | 77 -----------------------
14 dev-ada/gps/gps-2018-r3.ebuild | 107 --------------------------------
15 3 files changed, 186 deletions(-)
16
17 diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
18 index 59e48b46d1a..354ebeca404 100644
19 --- a/dev-ada/gps/Manifest
20 +++ b/dev-ada/gps/Manifest
21 @@ -1,6 +1,4 @@
22 DIST ada_language_server-2019-src.tar.gz 169018 BLAKE2B 3ed7412773887f6ebe58a8b08a6befa8be780d10c1abb3a38f524918fb60d7213699e2c7a2cd845d5dd154f9eccf8672ce8833e408dcdaa3621d173a0a8e5818 SHA512 dd25878719c5237c2f1e01097076758f25a350705a58c2988ff3e92179ceaf659981cdd0887df9916e4c1e2226419ebd526f14716da4d3fda0fcf454b9122d37
23 -DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
24 DIST gps-gpl-2019-src.tar.gz 13758956 BLAKE2B 71158537d9d970b97db06c1a5ed40cfec2f7c8523dbced763227463450b4fd469817abcd61339cde96a13bb2b721141339b15444e55bdc64cee7ed2458fd42ed SHA512 4420311303122fd365794830fb7a7868832b8211804d6e11773f598c307229b139993b3c81d91646f7b5aa9a7fba118895234c4ac89193d960dd3170a04e52a7
25 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
26 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
27 -DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
28
29 diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
30 deleted file mode 100644
31 index 6e258bac36a..00000000000
32 --- a/dev-ada/gps/files/gps-2018-gentoo.patch
33 +++ /dev/null
34 @@ -1,77 +0,0 @@
35 ---- a/gps/Makefile 2018-07-09 20:27:34.950424490 +0200
36 -+++ b/gps/Makefile 2018-07-09 20:37:39.510558817 +0200
37 -@@ -47,7 +47,8 @@
38 - for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
39 - endif
40 - $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
41 -- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
42 -+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \
43 -+ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS}
44 -
45 - resources:
46 - ifeq ($(OS),Windows_NT)
47 ---- a/Makefile.in 2018-07-09 21:51:08.422550386 +0200
48 -+++ b/Makefile.in 2018-07-09 21:51:32.187225891 +0200
49 -@@ -10,7 +10,7 @@
50 - INSTALL_PROGRAM = @INSTALL_PROGRAM@
51 - INSTALL_DATA = @INSTALL_DATA@
52 - GNATCOLL_INSTALL = @GNATCOLL_INSTALL@
53 --prefix = @prefix@
54 -+prefix = $(DESTDIR)@prefix@
55 - bindir = $(prefix)/bin
56 - sharedir = $(prefix)/share
57 - examplesdir = $(prefix)/share/examples/gps
58 ---- a/docs/Makefile.in 2018-07-09 21:53:33.074572729 +0200
59 -+++ b/docs/Makefile.in 2018-07-09 21:53:52.149311484 +0200
60 -@@ -1,4 +1,4 @@
61 --prefix = @prefix@
62 -+prefix = $(DESTDIR)@prefix@
63 - docdir = $(prefix)/share/doc/gps
64 - sharedir = $(prefix)/share/gps
65 -
66 ---- a/share/support/core/toolchains.py 2018-07-11 12:15:18.758674244 +0200
67 -+++ b/share/support/core/toolchains.py 2018-07-11 12:20:20.389220849 +0200
68 -@@ -16,11 +16,11 @@
69 - nullified by using an empty value in the corresponding tag
70 - -->
71 - <toolchain_default>
72 -- <gnat_driver>gnat</gnat_driver>
73 -- <gnat_list>gnatls</gnat_list>
74 -+ <gnat_driver>@GNAT@</gnat_driver>
75 -+ <gnat_list>@GNATLS@</gnat_list>
76 - <debugger>gdb</debugger>
77 - <cpp_filt>c++filt</cpp_filt>
78 -- <compiler lang="ada">gnatmake</compiler>
79 -+ <compiler lang="ada">@GNATMAKE@</compiler>
80 - <compiler lang="c">gcc</compiler>
81 - <compiler lang="c++">g++</compiler>
82 - <compiler lang="asm">gcc</compiler>
83 ---- a/share/support/core/projects.py 2018-07-11 13:49:29.631289680 +0200
84 -+++ b/share/support/core/projects.py 2018-07-11 13:51:46.568252607 +0200
85 -@@ -146,7 +146,7 @@
86 - <string />
87 - </index>
88 - <specialized_index value="Ada">
89 -- <choice default="true" >gnatmake</choice>
90 -+ <choice default="true" >@GNATMAKE@</choice>
91 - </specialized_index>
92 - </project_attribute>
93 -
94 -@@ -166,7 +166,7 @@
95 - description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
96 - hide_in="all"
97 - label="Gnatls">
98 -- <choice default="true" >gnatls</choice>
99 -+ <choice default="true" >@GNATLS@</choice>
100 - <string />
101 - </project_attribute>
102 -
103 -@@ -178,7 +178,7 @@
104 - description="The gnat driver used to run the various commands associated with the GNAT toolchain."
105 - hide_in="all"
106 - label="Gnat">
107 -- <choice default="true" >gnat</choice>
108 -+ <choice default="true" >@GNAT@</choice>
109 - <string />
110 - </project_attribute>
111 -
112
113 diff --git a/dev-ada/gps/gps-2018-r3.ebuild b/dev-ada/gps/gps-2018-r3.ebuild
114 deleted file mode 100644
115 index 49dd272c9a9..00000000000
116 --- a/dev-ada/gps/gps-2018-r3.ebuild
117 +++ /dev/null
118 @@ -1,107 +0,0 @@
119 -# Copyright 1999-2020 Gentoo Authors
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=7
123 -PYTHON_COMPAT=( python2_7 )
124 -ADA_COMPAT=( gnat_2018 )
125 -inherit ada python-single-r1 autotools desktop llvm multilib
126 -
127 -MYP=${PN}-gpl-${PV}-src
128 -
129 -DESCRIPTION="The GNAT Programming Studio"
130 -HOMEPAGE="http://libre.adacore.com/tools/gps/"
131 -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
132 - -> ${MYP}.tar.gz
133 - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
134 - libadalang-tools-gpl-2018-src.tar.gz
135 - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
136 - gtk+-3.14.15-src.tar.gz"
137 -
138 -LICENSE="GPL-3"
139 -SLOT="0"
140 -KEYWORDS="amd64 x86"
141 -IUSE=""
142 -
143 -RDEPEND="${PYTHON_DEPS}
144 - dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
145 - dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
146 - ~dev-ada/gtkada-2018[${ADA_USEDEP}]
147 - ~dev-ada/libadalang-2018[${ADA_USEDEP}]
148 - dev-libs/gobject-introspection
149 - dev-libs/libffi
150 - sys-devel/llvm:7
151 - sys-devel/clang:=
152 - x11-themes/adwaita-icon-theme
153 - x11-themes/hicolor-icon-theme
154 - $(python_gen_cond_dep '
155 - dev-python/pep8[${PYTHON_MULTI_USEDEP}]
156 - dev-python/jedi[${PYTHON_MULTI_USEDEP}]
157 - ')"
158 -
159 -DEPEND="${RDEPEND}"
160 -
161 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
162 - ${ADA_REQUIRED_USE}"
163 -
164 -RESTRICT="test"
165 -
166 -S="${WORKDIR}"/${MYP}
167 -
168 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
169 -
170 -pkg_setup() {
171 - LLVM_MAX_SLOT=7
172 - llvm_pkg_setup
173 - python-single-r1_pkg_setup
174 - ada_pkg_setup
175 -}
176 -
177 -src_prepare() {
178 - default
179 - sed -i \
180 - -e "s:@GNATMAKE@:${GNATMAKE}:g" \
181 - -e "s:@GNAT@:${GNAT}:g" \
182 - -e "s:@GNATLS@:${GNATLS}:g" \
183 - share/support/core/toolchains.py \
184 - share/support/core/projects.py \
185 - || die
186 - mv "${WORKDIR}"/libadalang-tools-src laltools
187 - echo "#!/bin/bash" > gps.sh
188 - echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
189 - echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
190 - cd ../gtk+-3.14.15-src
191 - sed -i \
192 - -e "/^libadd/s:=.*$:= \\\:" \
193 - -e "/^deps/s:=.*$:= \\\:" \
194 - ../gtk+-3.14.15-src/gtk/Makefile.in
195 -}
196 -
197 -src_configure() {
198 - econf \
199 - --with-clang=$(llvm-config --libdir)
200 - cd ../gtk+-3.14.15-src
201 - econf --disable-cups
202 -}
203 -
204 -src_compile() {
205 - emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
206 - -XGPR_BUILD=relocatable" \
207 - Build=Production
208 - gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
209 - -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
210 - cd ../gtk+-3.14.15-src
211 - emake -C gtk/inspector
212 - emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
213 - emake -C gtk libgtk-3.la
214 -}
215 -
216 -src_install() {
217 - default
218 - make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
219 - mv "${D}"/usr/bin/gps{,_exe}
220 - newbin gps.sh gps
221 - cd ../gtk+-3.14.15-src
222 - emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
223 - rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
224 - dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
225 -}