1 |
commit: acaa9e19e72d68484e08ef2615cdf1f82ad35dde |
2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sun Sep 26 23:12:15 2021 +0000 |
4 |
Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
5 |
CommitDate: Sun Sep 26 23:12:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=acaa9e19 |
7 |
|
8 |
dev-util/eclipse-parallel-bin: inherit wrapper,rm eutils. Respect {LD,C}FLAGS |
9 |
|
10 |
Try to respect LDFLAGS and CFLAGS by updating regular expression |
11 |
|
12 |
Closes: https://bugs.gentoo.org/814977 |
13 |
Closes: https://bugs.gentoo.org/814980 |
14 |
|
15 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
16 |
|
17 |
.../eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild | 11 ++++++----- |
18 |
.../eclipse-parallel-bin/eclipse-parallel-bin-4.21.ebuild | 4 ++-- |
19 |
2 files changed, 8 insertions(+), 7 deletions(-) |
20 |
|
21 |
diff --git a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild |
22 |
index d8106ff52..2d212497f 100644 |
23 |
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild |
24 |
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.20.ebuild |
25 |
@@ -3,14 +3,15 @@ |
26 |
|
27 |
EAPI=7 |
28 |
|
29 |
-inherit desktop eutils xdg |
30 |
+inherit desktop wrapper xdg |
31 |
|
32 |
MY_PN="eclipse" |
33 |
+MY_PV="2021-06" |
34 |
DESCRIPTION="Eclipse IDE for Scientific Computing (C, C++, Fortran)" |
35 |
HOMEPAGE="https://www.eclipse.org/" |
36 |
SRC_URI=" |
37 |
- amd64? ( https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-parallel-2021-06-R-linux-gtk-x86_64.tar.gz ) |
38 |
- arm64? ( https://download.eclipse.org/technology/epp/downloads/release/2021-06/R/eclipse-parallel-2021-06-R-linux-gtk-aarch64.tar.gz ) |
39 |
+ amd64? ( https://download.eclipse.org/technology/epp/downloads/release/${MY_PV}/R/eclipse-parallel-${MY_PV}-R-linux-gtk-x86_64.tar.gz ) |
40 |
+ arm64? ( https://download.eclipse.org/technology/epp/downloads/release/${MY_PV}/R/eclipse-parallel-${MY_PV}-R-linux-gtk-aarch64.tar.gz ) |
41 |
" |
42 |
|
43 |
S="${WORKDIR}/${MY_PN}" |
44 |
@@ -27,7 +28,7 @@ RDEPEND=" |
45 |
|
46 |
QA_FLAGS_IGNORED=" |
47 |
/opt/eclipse-parallel-bin/eclipse |
48 |
- /opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux.*/eclipse_*.so |
49 |
+ /opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux[.].*/eclipse_.*[.]so |
50 |
" |
51 |
|
52 |
src_install() { |
53 |
@@ -39,5 +40,5 @@ src_install() { |
54 |
make_wrapper ${PN%-*} "/opt/${PN}/${MY_PN} -vm /opt/openjdk*/bin/java" "" "/opt/${PN}" "/opt/bin" |
55 |
|
56 |
doicon -s 48 plugins/org.eclipse.platform_4.20.0.v20210611-1600/eclipse48.png |
57 |
- make_desktop_entry eclipse-parallel "Eclipse IDE Parallel 2021-06" eclipse48 "Development;" || die "Failed making desktop entry!" |
58 |
+ make_desktop_entry eclipse-parallel "Eclipse IDE Parallel ${MY_PV}" eclipse48 "Development;" || die "Failed making desktop entry!" |
59 |
} |
60 |
|
61 |
diff --git a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.21.ebuild b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.21.ebuild |
62 |
index 6dcc00c1c..e42021af5 100644 |
63 |
--- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.21.ebuild |
64 |
+++ b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.21.ebuild |
65 |
@@ -3,7 +3,7 @@ |
66 |
|
67 |
EAPI=7 |
68 |
|
69 |
-inherit desktop eutils xdg |
70 |
+inherit desktop wrapper xdg |
71 |
|
72 |
MY_PN="eclipse" |
73 |
MY_PV="2021-09" |
74 |
@@ -28,7 +28,7 @@ RDEPEND=" |
75 |
|
76 |
QA_FLAGS_IGNORED=" |
77 |
/opt/eclipse-parallel-bin/eclipse |
78 |
- /opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux.*/eclipse_*.so |
79 |
+ /opt/eclipse-parallel-bin/plugins/org.eclipse.equinox.launcher.gtk.linux[.].*/eclipse_.*[.]so |
80 |
" |
81 |
|
82 |
src_install() { |