1 |
commit: c32ca8b2104a3644ab693de9e835fea300a084a8 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 6 22:56:16 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 6 23:32:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32ca8b2 |
7 |
|
8 |
app-arch/xz-utils: modernise ebuilds |
9 |
|
10 |
Notably drop obsolete dev-vcs/cvs BDEPEND in 9999. It's been using git |
11 |
for a while. |
12 |
|
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild | 39 ++++++++++++++++++++---------- |
16 |
app-arch/xz-utils/xz-utils-9999.ebuild | 39 ++++++++++++++++++++---------- |
17 |
2 files changed, 52 insertions(+), 26 deletions(-) |
18 |
|
19 |
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
20 |
index 7a24ca8fbd0d..c67793d89db9 100644 |
21 |
--- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
22 |
+++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild |
23 |
@@ -8,20 +8,22 @@ EAPI=7 |
24 |
|
25 |
inherit libtool multilib multilib-minimal preserve-libs usr-ldscript |
26 |
|
27 |
-if [[ ${PV} == "9999" ]] ; then |
28 |
+if [[ ${PV} == 9999 ]] ; then |
29 |
EGIT_REPO_URI="https://git.tukaani.org/xz.git" |
30 |
inherit git-r3 autotools |
31 |
- SRC_URI="" |
32 |
- BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 |
33 |
+ |
34 |
+ # bug #272880 and bug #286068 |
35 |
+ BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" |
36 |
else |
37 |
MY_P="${PN/-utils}-${PV/_}" |
38 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
39 |
- [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ |
40 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
41 |
+ if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then |
42 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
43 |
+ fi |
44 |
S="${WORKDIR}/${MY_P}" |
45 |
fi |
46 |
|
47 |
-DESCRIPTION="utils for managing LZMA compressed files" |
48 |
+DESCRIPTION="Utils for managing LZMA compressed files" |
49 |
HOMEPAGE="https://tukaani.org/xz/" |
50 |
|
51 |
# See top-level COPYING file as it outlines the various pieces and their licenses. |
52 |
@@ -39,11 +41,13 @@ RESTRICT="!extra-filters? ( test )" |
53 |
|
54 |
src_prepare() { |
55 |
default |
56 |
- if [[ ${PV} == "9999" ]] ; then |
57 |
+ |
58 |
+ if [[ ${PV} == 9999 ]] ; then |
59 |
eautopoint |
60 |
eautoreconf |
61 |
else |
62 |
- elibtoolize # to allow building shared libs on Solaris/x64 |
63 |
+ # Allow building shared libs on Solaris/x64 |
64 |
+ elibtoolize |
65 |
fi |
66 |
} |
67 |
|
68 |
@@ -53,24 +57,32 @@ multilib_src_configure() { |
69 |
$(use_enable nls) |
70 |
$(use_enable static-libs static) |
71 |
) |
72 |
- multilib_is_native_abi || |
73 |
- myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) |
74 |
- if ! use extra-filters; then |
75 |
+ |
76 |
+ if ! multilib_is_native_abi ; then |
77 |
+ myconf+=( |
78 |
+ --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} |
79 |
+ ) |
80 |
+ fi |
81 |
+ |
82 |
+ if ! use extra-filters ; then |
83 |
myconf+=( |
84 |
# LZMA1 + LZMA2 for standard .lzma & .xz files |
85 |
--enable-encoders=lzma1,lzma2 |
86 |
--enable-decoders=lzma1,lzma2 |
87 |
+ |
88 |
# those are used by default, depending on preset |
89 |
--enable-match-finders=hc3,hc4,bt4 |
90 |
+ |
91 |
# CRC64 is used by default, though some (old?) files use CRC32 |
92 |
--enable-checks=crc32,crc64 |
93 |
) |
94 |
fi |
95 |
|
96 |
if [[ ${CHOST} == *-solaris* ]] ; then |
97 |
- # undo Solaris-based defaults pointing to /usr/xpg5/bin |
98 |
+ export gl_cv_posix_shell="${EPREFIX}"/bin/sh |
99 |
+ |
100 |
+ # Undo Solaris-based defaults pointing to /usr/xpg5/bin |
101 |
myconf+=( --disable-path-for-script ) |
102 |
- export gl_cv_posix_shell=${EPREFIX}/bin/sh |
103 |
fi |
104 |
|
105 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" |
106 |
@@ -78,6 +90,7 @@ multilib_src_configure() { |
107 |
|
108 |
multilib_src_install() { |
109 |
default |
110 |
+ |
111 |
gen_usr_ldscript -a lzma |
112 |
} |
113 |
|
114 |
|
115 |
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild |
116 |
index 0b2c2d879fb8..c67793d89db9 100644 |
117 |
--- a/app-arch/xz-utils/xz-utils-9999.ebuild |
118 |
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild |
119 |
@@ -8,20 +8,22 @@ EAPI=7 |
120 |
|
121 |
inherit libtool multilib multilib-minimal preserve-libs usr-ldscript |
122 |
|
123 |
-if [[ ${PV} == "9999" ]] ; then |
124 |
+if [[ ${PV} == 9999 ]] ; then |
125 |
EGIT_REPO_URI="https://git.tukaani.org/xz.git" |
126 |
inherit git-r3 autotools |
127 |
- SRC_URI="" |
128 |
- BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 |
129 |
+ |
130 |
+ # bug #272880 and bug #286068 |
131 |
+ BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" |
132 |
else |
133 |
MY_P="${PN/-utils}-${PV/_}" |
134 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
135 |
- [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ |
136 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
137 |
+ if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then |
138 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
139 |
+ fi |
140 |
S="${WORKDIR}/${MY_P}" |
141 |
fi |
142 |
|
143 |
-DESCRIPTION="utils for managing LZMA compressed files" |
144 |
+DESCRIPTION="Utils for managing LZMA compressed files" |
145 |
HOMEPAGE="https://tukaani.org/xz/" |
146 |
|
147 |
# See top-level COPYING file as it outlines the various pieces and their licenses. |
148 |
@@ -39,11 +41,13 @@ RESTRICT="!extra-filters? ( test )" |
149 |
|
150 |
src_prepare() { |
151 |
default |
152 |
- if [[ ${PV} == "9999" ]] ; then |
153 |
+ |
154 |
+ if [[ ${PV} == 9999 ]] ; then |
155 |
eautopoint |
156 |
eautoreconf |
157 |
else |
158 |
- elibtoolize # to allow building shared libs on Solaris/x64 |
159 |
+ # Allow building shared libs on Solaris/x64 |
160 |
+ elibtoolize |
161 |
fi |
162 |
} |
163 |
|
164 |
@@ -53,24 +57,32 @@ multilib_src_configure() { |
165 |
$(use_enable nls) |
166 |
$(use_enable static-libs static) |
167 |
) |
168 |
- multilib_is_native_abi || |
169 |
- myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) |
170 |
- if ! use extra-filters; then |
171 |
+ |
172 |
+ if ! multilib_is_native_abi ; then |
173 |
+ myconf+=( |
174 |
+ --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} |
175 |
+ ) |
176 |
+ fi |
177 |
+ |
178 |
+ if ! use extra-filters ; then |
179 |
myconf+=( |
180 |
# LZMA1 + LZMA2 for standard .lzma & .xz files |
181 |
--enable-encoders=lzma1,lzma2 |
182 |
--enable-decoders=lzma1,lzma2 |
183 |
+ |
184 |
# those are used by default, depending on preset |
185 |
--enable-match-finders=hc3,hc4,bt4 |
186 |
+ |
187 |
# CRC64 is used by default, though some (old?) files use CRC32 |
188 |
--enable-checks=crc32,crc64 |
189 |
) |
190 |
fi |
191 |
|
192 |
if [[ ${CHOST} == *-solaris* ]] ; then |
193 |
- # undo Solaris-based defaults pointing to /usr/xpg5/bin |
194 |
+ export gl_cv_posix_shell="${EPREFIX}"/bin/sh |
195 |
+ |
196 |
+ # Undo Solaris-based defaults pointing to /usr/xpg5/bin |
197 |
myconf+=( --disable-path-for-script ) |
198 |
- export gl_cv_posix_shell=${EPREFIX}/bin/sh |
199 |
fi |
200 |
|
201 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" |
202 |
@@ -78,6 +90,7 @@ multilib_src_configure() { |
203 |
|
204 |
multilib_src_install() { |
205 |
default |
206 |
+ |
207 |
gen_usr_ldscript -a lzma |
208 |
} |