Gentoo Archives: gentoo-commits

From: Sergey Torokhov <torokhov-s-a@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/gtk-fortran/
Date: Sat, 29 Oct 2022 22:20:41
Message-Id: 1667081821.20bd1b614f7adad2ebd07754514b524588dedc92.SergeyTorokhov@gentoo
1 commit: 20bd1b614f7adad2ebd07754514b524588dedc92
2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Sat Oct 29 22:17:01 2022 +0000
4 Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
5 CommitDate: Sat Oct 29 22:17:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20bd1b61
7
8 x11-lib/gtk-fortran: fix test fail due to DISPLAY absence
9
10 The issue bellow isn't related to 'lto' and was to absence
11 of virtual DISPLAY while running test.
12
13 Closes: https://bugs.gentoo.org/863935
14
15 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
16
17 ...ortran-3.24.30.ebuild => gtk-fortran-3.24.30-r1.ebuild} | 14 ++++++++++----
18 ...tk-fortran-4.1.0.ebuild => gtk-fortran-4.1.0-r1.ebuild} | 14 ++++++++++----
19 2 files changed, 20 insertions(+), 8 deletions(-)
20
21 diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
22 similarity index 86%
23 rename from x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
24 rename to x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
25 index f3ead5547..e8bf7a4aa 100644
26 --- a/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
27 +++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
28 @@ -1,12 +1,13 @@
29 -# Copyright 1999-2021 Gentoo Authors
30 +# Copyright 1999-2022 Gentoo Authors
31 # Distributed under the terms of the GNU General Public License v2
32
33 -EAPI=7
34 +EAPI=8
35
36 CMAKE_MAKEFILE_GENERATOR="emake"
37 FORTRAN_STANDARD=2003
38 +VIRTUALX_REQUIRED="test"
39
40 -inherit cmake fortran-2
41 +inherit cmake fortran-2 virtualx
42
43 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
44 HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
45 @@ -16,8 +17,9 @@ LICENSE="GPL-3"
46 SLOT="3"
47 KEYWORDS="~amd64 ~x86"
48
49 -IUSE="examples high-level plplot static-libs"
50 +IUSE="examples high-level plplot static-libs test"
51 REQUIRED_USE="plplot? ( high-level )"
52 +RESTRICT="!test? ( test )"
53
54 RDEPEND="
55 x11-libs/gtk+:3
56 @@ -55,6 +57,10 @@ src_configure() {
57 cmake_src_configure
58 }
59
60 +src_test() {
61 + virtx cmake_src_test
62 +}
63 +
64 src_install() {
65 cmake_src_install
66
67
68 diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
69 similarity index 86%
70 rename from x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
71 rename to x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
72 index 3de8bf832..1e6bf531f 100644
73 --- a/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
74 +++ b/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
75 @@ -1,12 +1,13 @@
76 -# Copyright 1999-2021 Gentoo Authors
77 +# Copyright 1999-2022 Gentoo Authors
78 # Distributed under the terms of the GNU General Public License v2
79
80 -EAPI=7
81 +EAPI=8
82
83 CMAKE_MAKEFILE_GENERATOR="emake"
84 FORTRAN_STANDARD=2003
85 +VIRTUALX_REQUIRED="test"
86
87 -inherit cmake fortran-2
88 +inherit cmake fortran-2 virtualx
89
90 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
91 HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
92 @@ -16,8 +17,9 @@ LICENSE="GPL-3"
93 SLOT="4"
94 KEYWORDS="~amd64 ~x86"
95
96 -IUSE="examples high-level plplot static-libs"
97 +IUSE="examples high-level plplot static-libs test"
98 REQUIRED_USE="plplot? ( high-level )"
99 +RESTRICT="!test? ( test )"
100
101 RDEPEND="
102 gui-libs/gtk:4
103 @@ -55,6 +57,10 @@ src_configure() {
104 cmake_src_configure
105 }
106
107 +src_test() {
108 + virtx cmake_src_test
109 +}
110 +
111 src_install() {
112 cmake_src_install