Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gtkada/files/, dev-ada/gtkada/
Date: Mon, 27 Dec 2021 11:10:26
Message-Id: 1640603412.f77708f4c8695462e5da7be8a5720119711d0c93.tupone@gentoo
1 commit: f77708f4c8695462e5da7be8a5720119711d0c93
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 27 11:09:48 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 27 11:10:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77708f4
7
8 dev-ada/gtkada: drop uninstall phase
9
10 Closes: https://bugs.gentoo.org/830017
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 dev-ada/gtkada/files/gtkada-2021-uninstall.patch | 13 +++++++++++++
15 dev-ada/gtkada/gtkada-2021.ebuild | 1 +
16 dev-ada/gtkada/gtkada-22.0.0.ebuild | 1 +
17 3 files changed, 15 insertions(+)
18
19 diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
20 new file mode 100644
21 index 000000000000..c782aac633b7
22 --- /dev/null
23 +++ b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
24 @@ -0,0 +1,13 @@
25 +--- a/Makefile.in 2021-12-27 09:42:14.575136019 +0100
26 ++++ b/Makefile.in 2021-12-27 09:42:31.159870381 +0100
27 +@@ -113,10 +113,6 @@
28 + endif
29 +
30 + install-clean:
31 +-ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
32 +- -$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
33 +- --project-subdir=lib/gnat gtkada
34 +-endif
35 +
36 + install: install-clean
37 + ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
38
39 diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
40 index da08ed425283..1005a7ba1034 100644
41 --- a/dev-ada/gtkada/gtkada-2021.ebuild
42 +++ b/dev-ada/gtkada/gtkada-2021.ebuild
43 @@ -39,6 +39,7 @@ S="${WORKDIR}"/${MYP}
44 PATCHES=(
45 "${FILESDIR}"/${PN}-2017-r1-gentoo.patch
46 "${FILESDIR}"/${PN}-2019-gentoo.patch
47 + "${FILESDIR}"/${P}-uninstall.patch
48 )
49
50 src_prepare() {
51
52 diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
53 index 8a1efe2e0af3..6cb33f81492e 100644
54 --- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
55 +++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
56 @@ -33,6 +33,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
57 PATCHES=(
58 "${FILESDIR}"/${PN}-2017-r1-gentoo.patch
59 "${FILESDIR}"/${PN}-2019-gentoo.patch
60 + "${FILESDIR}"/${PN}-2021-uninstall.patch
61 )
62
63 src_prepare() {