1 |
commit: 38b59bef6f76edc37a0e4d0f301841ecd855e994 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 17:31:17 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 21:19:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b59bef |
7 |
|
8 |
media-sound/xmms2: switch to waf-utils.eclass + adjustments |
9 |
|
10 |
Was unused when picked up this package and left it like that, |
11 |
but might as well use it to be consistent with the recent eclass |
12 |
changes (albeit calling waf-utils_src_compile in src_test feels |
13 |
a bit dodgy to avoid calling it directly). |
14 |
|
15 |
Doing straight to stable, this is scarcely used and not too worried. |
16 |
|
17 |
Also adjust deps a bit and filter-lto. |
18 |
|
19 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
20 |
|
21 |
...xmms2-0.9.1-r1.ebuild => xmms2-0.9.1-r2.ebuild} | 42 +++++++++------------- |
22 |
1 file changed, 17 insertions(+), 25 deletions(-) |
23 |
|
24 |
diff --git a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild b/media-sound/xmms2/xmms2-0.9.1-r2.ebuild |
25 |
similarity index 86% |
26 |
rename from media-sound/xmms2/xmms2-0.9.1-r1.ebuild |
27 |
rename to media-sound/xmms2/xmms2-0.9.1-r2.ebuild |
28 |
index cf96eb8a448c..53a3edec371e 100644 |
29 |
--- a/media-sound/xmms2/xmms2-0.9.1-r1.ebuild |
30 |
+++ b/media-sound/xmms2/xmms2-0.9.1-r2.ebuild |
31 |
@@ -4,7 +4,8 @@ |
32 |
EAPI=8 |
33 |
|
34 |
PYTHON_COMPAT=( python3_{8..11} ) |
35 |
-inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs |
36 |
+PYTHON_REQ_USE="threads(+)" |
37 |
+inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils |
38 |
|
39 |
DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player" |
40 |
HOMEPAGE="https://github.com/XMMS2" |
41 |
@@ -77,11 +78,7 @@ COMMON_DEPEND=" |
42 |
media-libs/libofa |
43 |
sci-libs/fftw:3.0= |
44 |
) |
45 |
- opus? ( |
46 |
- media-libs/libogg |
47 |
- media-libs/opus |
48 |
- media-libs/opusfile |
49 |
- ) |
50 |
+ opus? ( media-libs/opusfile ) |
51 |
pulseaudio? ( media-libs/libpulse ) |
52 |
samba? ( net-fs/samba ) |
53 |
sid? ( media-libs/libsidplay:2 ) |
54 |
@@ -142,11 +139,10 @@ src_prepare() { |
55 |
} |
56 |
|
57 |
src_configure() { |
58 |
- local waf=( |
59 |
- ./waf configure |
60 |
- --prefix="${EPREFIX}"/usr |
61 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) |
62 |
- --boost-includes="${ESYSROOT}"/usr/include # needed for prefix |
63 |
+ filter-lto # `xmms2 add somefile` breaks with lto + fortify=2 |
64 |
+ |
65 |
+ local wafargs=( |
66 |
+ --boost-includes="${ESYSROOT}"/usr/include |
67 |
--with-target-platform="${CHOST}" |
68 |
) |
69 |
|
70 |
@@ -168,14 +164,14 @@ src_configure() { |
71 |
plugins+=$(xmms2_flag ${flag}) |
72 |
done |
73 |
else |
74 |
- waf+=( --without-xmms2d ) |
75 |
+ wafargs+=( --without-xmms2d ) |
76 |
fi |
77 |
|
78 |
for flag in "${XMMS2_OPTIONALS[@]}"; do |
79 |
optionals+=$(xmms2_flag ${flag}) |
80 |
done |
81 |
|
82 |
- waf+=( |
83 |
+ wafargs+=( |
84 |
# pass even if empty to avoid automagic |
85 |
--with-optionals=${optionals:1} |
86 |
--with-plugins=${plugins:1} |
87 |
@@ -183,40 +179,36 @@ src_configure() { |
88 |
|
89 |
if use perl; then |
90 |
perl_set_version |
91 |
- waf+=( --with-perl-archdir="${ARCH_LIB}" ) |
92 |
+ wafargs+=( --with-perl-archdir="${ARCH_LIB}" ) |
93 |
fi |
94 |
|
95 |
if use valgrind; then |
96 |
if valgrind true &>/dev/null; then |
97 |
- waf+=( --with-valgrind ) |
98 |
+ wafargs+=( --with-valgrind ) |
99 |
else |
100 |
ewarn "valgrind was disabled due to failing a basic sanity check" #807271 |
101 |
fi |
102 |
fi |
103 |
|
104 |
- tc-export AR CC CXX |
105 |
- |
106 |
- echo "${waf[*]}" |
107 |
- "${waf[@]}" || die |
108 |
+ waf-utils_src_configure "${wafargs[@]}" |
109 |
} |
110 |
|
111 |
src_compile() { |
112 |
- ./waf build -j$(makeopts_jobs) --verbose --notests || die |
113 |
+ waf-utils_src_compile --notests |
114 |
} |
115 |
|
116 |
src_test() { |
117 |
- ./waf --alltests || die |
118 |
+ waf-utils_src_compile --alltests |
119 |
} |
120 |
|
121 |
src_install() { |
122 |
- ./waf install --destdir="${D}" --without-ldconfig --notests || die |
123 |
- |
124 |
- dodoc AUTHORS README.mdown *.ChangeLog |
125 |
+ local DOCS=( AUTHORS README.mdown *.ChangeLog ) |
126 |
+ waf-utils_src_install --without-ldconfig --notests |
127 |
|
128 |
use python && python_optimize |
129 |
|
130 |
# to avoid editing waftools/man.py (use find given not always installed) |
131 |
- find "${ED}" -name '*.gz' -exec gzip -d {} + || die |
132 |
+ find "${ED}" -type f -name '*.gz' -exec gzip -d {} + || die |
133 |
} |
134 |
|
135 |
pkg_postinst() { |