Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/sparse/
Date: Sun, 19 Sep 2021 02:24:55
Message-Id: 1632018260.c5ea3c2cc75ac22165cd80e75298a75b30031294.sam@gentoo
1 commit: c5ea3c2cc75ac22165cd80e75298a75b30031294
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 19 02:15:23 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 02:24:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ea3c2c
7
8 sys-devel/sparse: add 0.6.4
9
10 Closes: https://bugs.gentoo.org/812551
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 sys-devel/sparse/Manifest | 1 +
14 .../sparse/{sparse-9999.ebuild => sparse-0.6.4.ebuild} | 18 ++++++++++--------
15 sys-devel/sparse/sparse-9999.ebuild | 18 ++++++++++--------
16 3 files changed, 21 insertions(+), 16 deletions(-)
17
18 diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
19 index a706e2ac3fc..7c1cf179d14 100644
20 --- a/sys-devel/sparse/Manifest
21 +++ b/sys-devel/sparse/Manifest
22 @@ -1 +1,2 @@
23 DIST sparse-0.6.3.tar.xz 350676 BLAKE2B 5c8f54f3b7d2095df30b9a59a151e307ebedac5dbb6910ab5684b298c2b427e55dd43697e698fd289fb0d8e824ba4d72c2761772babb9f438e622f439ab3448d SHA512 33170065ea5967d7c640a7551acc78d7efee9f7aa6a9edf6afe2cdd8a04ea5cebe7b5dcdeebf791d384542b8bcdd4e818c75e7ae2e7aa4e1edbd56b68367b28f
24 +DIST sparse-0.6.4.tar.xz 370840 BLAKE2B 4b21d26c87df65f08928438c311582a45f4cbbb5ed2bb399c3521d1e40630006d794b4f1e545693e82225f086968cf686c5bfb29059644a31812120f07caebe2 SHA512 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9
25
26 diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild
27 similarity index 80%
28 copy from sys-devel/sparse/sparse-9999.ebuild
29 copy to sys-devel/sparse/sparse-0.6.4.ebuild
30 index 0fcda784733..3304272807e 100644
31 --- a/sys-devel/sparse/sparse-9999.ebuild
32 +++ b/sys-devel/sparse/sparse-0.6.4.ebuild
33 @@ -3,6 +3,7 @@
34
35 EAPI=7
36
37 +LLVM_MAX_SLOT=12
38 inherit llvm multilib toolchain-funcs
39
40 DESCRIPTION="C semantic parser"
41 @@ -21,16 +22,20 @@ SLOT="0"
42 IUSE="gtk llvm sqlite test xml"
43 RESTRICT="!test? ( test )"
44
45 -LLVM_MAX_SLOT=10
46 -
47 RDEPEND="gtk? ( x11-libs/gtk+:2 )
48 - llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
49 + llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
50 sqlite? ( dev-db/sqlite:= )
51 xml? ( dev-libs/libxml2 )"
52 -DEPEND="${RDEPEND}
53 - gtk? ( virtual/pkgconfig )
54 +DEPEND="${RDEPEND}"
55 +BDEPEND="gtk? ( virtual/pkgconfig )
56 xml? ( virtual/pkgconfig )"
57
58 +llvm_check_deps() {
59 + has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \
60 + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \
61 + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))"
62 +}
63 +
64 pkg_setup() {
65 use llvm && llvm_pkg_setup
66 }
67 @@ -44,15 +49,12 @@ _emake() {
68 AR="$(tc-getAR)" \
69 CFLAGS="${CFLAGS}" \
70 PKG_CONFIG="$(tc-getPKG_CONFIG)" \
71 - \
72 HAVE_GTK=$(usex gtk) \
73 HAVE_LLVM=$(usex llvm) \
74 HAVE_SQLITE=$(usex sqlite) \
75 HAVE_LIBXML=$(usex xml) \
76 - \
77 V=1 \
78 PREFIX="${EPREFIX}/usr" \
79 - \
80 "$@"
81 }
82
83
84 diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
85 index 0fcda784733..3304272807e 100644
86 --- a/sys-devel/sparse/sparse-9999.ebuild
87 +++ b/sys-devel/sparse/sparse-9999.ebuild
88 @@ -3,6 +3,7 @@
89
90 EAPI=7
91
92 +LLVM_MAX_SLOT=12
93 inherit llvm multilib toolchain-funcs
94
95 DESCRIPTION="C semantic parser"
96 @@ -21,16 +22,20 @@ SLOT="0"
97 IUSE="gtk llvm sqlite test xml"
98 RESTRICT="!test? ( test )"
99
100 -LLVM_MAX_SLOT=10
101 -
102 RDEPEND="gtk? ( x11-libs/gtk+:2 )
103 - llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
104 + llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
105 sqlite? ( dev-db/sqlite:= )
106 xml? ( dev-libs/libxml2 )"
107 -DEPEND="${RDEPEND}
108 - gtk? ( virtual/pkgconfig )
109 +DEPEND="${RDEPEND}"
110 +BDEPEND="gtk? ( virtual/pkgconfig )
111 xml? ( virtual/pkgconfig )"
112
113 +llvm_check_deps() {
114 + has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \
115 + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \
116 + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))"
117 +}
118 +
119 pkg_setup() {
120 use llvm && llvm_pkg_setup
121 }
122 @@ -44,15 +49,12 @@ _emake() {
123 AR="$(tc-getAR)" \
124 CFLAGS="${CFLAGS}" \
125 PKG_CONFIG="$(tc-getPKG_CONFIG)" \
126 - \
127 HAVE_GTK=$(usex gtk) \
128 HAVE_LLVM=$(usex llvm) \
129 HAVE_SQLITE=$(usex sqlite) \
130 HAVE_LIBXML=$(usex xml) \
131 - \
132 V=1 \
133 PREFIX="${EPREFIX}/usr" \
134 - \
135 "$@"
136 }