Diff alsa-tools-1.2.5 with a alsa-tools-1.2.5-r1

/usr/portage/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild 2023-10-09 14:52:31.764368407 +0300
1
# Copyright 1999-2022 Gentoo Authors
1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6
inherit autotools flag-o-matic xdg
6
inherit autotools flag-o-matic libtool xdg
7 7

  
8 8
DESCRIPTION="Advanced Linux Sound Architecture tools"
9 9
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
......
18 18
alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
19 19
alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
20 20

  
21
DEPEND=">=media-libs/alsa-lib-${PV}
21
# bug #468294
22
DEPEND="
23
	>=media-libs/alsa-lib-${PV}
22 24
	>=dev-python/pyalsa-1.0.26
23 25
	fltk? ( >=x11-libs/fltk-1.3.0:1 )
24 26
	gtk? (
25 27
		dev-libs/gobject-introspection
26 28
		x11-libs/gtk+:2
27 29
		x11-libs/gtk+:3
28
	)" #468294
29
RDEPEND="${DEPEND}
30
	gtk? ( media-fonts/font-misc-misc )" #456114
30
	)
31
"
32
# bug #456114
33
RDEPEND="
34
	${DEPEND}
35
	gtk? ( media-fonts/font-misc-misc )
36
"
31 37
BDEPEND="
32 38
	virtual/pkgconfig
33 39
"
34 40

  
35 41
PATCHES=(
36 42
	"${FILESDIR}"/envy24control-config-dir.patch
43
	"${FILESDIR}"/${PN}-1.2.5-hdspmixer-crash.patch
37 44
)
38 45

  
39 46
pkg_setup() {
......
42 49
		us428control
43 50
		hwmixvolume
44 51
		hda-verb
45
		$(usex alsa_cards_mixart mixartloader '')
46
		$(usex alsa_cards_vx222 vxloader '')
47
		$(usex alsa_cards_usb-usx2y usx2yloader '')
48
		$(usex alsa_cards_pcxhr pcxhrloader '')
49
		$(usex alsa_cards_sscape sscape_ctl '')
52
		$(usev alsa_cards_mixart mixartloader)
53
		$(usev alsa_cards_vx222 vxloader)
54
		$(usev alsa_cards_usb-usx2y usx2yloader)
55
		$(usev alsa_cards_pcxhr pcxhrloader)
56
		$(usev alsa_cards_sscape sscape_ctl)
50 57
	)
51 58

  
52 59
	if use gtk; then
53 60
		ALSA_TOOLS+=(
54 61
			echomixer
55 62
			hdajackretask
56
			$(usex alsa_cards_ice1712 envy24control '')
63
			$(usev alsa_cards_ice1712 envy24control)
57 64
		)
58 65
		# Perhaps a typo the following && logic?
59 66
		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
......
64 71
	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
65 72
		ALSA_TOOLS+=(
66 73
			hdsploader
67
			$(usex fltk 'hdspconf hdspmixer' '')
74
			$(usev fltk 'hdspconf hdspmixer')
68 75
		)
69 76
	fi
70 77

  
......
84 91
	# AM_PATH_GTK macro.
85 92
	for dir in echomixer envy24control rmedigicontrol; do
86 93
		has "${dir}" "${ALSA_TOOLS[*]}" || continue
87
		pushd "${dir}" &> /dev/null
94
		pushd "${dir}" &> /dev/null || die
88 95
		eautoreconf
89
		popd &> /dev/null
96
		popd &> /dev/null || die
90 97
	done
91 98

  
92 99
	# This block deals with the tools that are being patched
93 100
	for dir in hdspconf; do
94 101
		has "${dir}" "${ALSA_TOOLS[*]}" || continue
95
		pushd "${dir}" &> /dev/null
102
		pushd "${dir}" &> /dev/null || die
96 103
		eautoreconf
97
		popd &> /dev/null
104
		popd &> /dev/null || die
98 105
	done
99 106

  
100 107
	elibtoolize
Thank you!