Diff timidity++-2.14.0-r3 with a timidity++-2.15.0

/usr/portage/media-sound/timidity++/timidity++-2.15.0.ebuild 2019-10-11 19:11:00.000000000 +0300
1
# Copyright 1999-2018 Gentoo Foundation
1
# Copyright 1999-2019 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=6
4
EAPI=7
5 5

  
6
inherit autotools desktop elisp-common systemd toolchain-funcs user xdg-utils
6
inherit autotools desktop elisp-common systemd toolchain-funcs user xdg
7 7

  
8 8
MY_PV=${PV/_/-}
9 9
MY_P=TiMidity++-${MY_PV}
......
15 15

  
16 16
LICENSE="GPL-2"
17 17
SLOT="0"
18
KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
18
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
19 19
IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
20 20

  
21 21
REQUIRED_USE="tk? ( X )"
......
58 58
DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
59 59

  
60 60
PATCHES=(
61
	"${FILESDIR}"/${P}-params.patch
62
	"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch
63
	"${FILESDIR}"/${P}-tcltk86.patch
64
	"${FILESDIR}"/${P}-ar.patch
65
	"${FILESDIR}"/${P}-configure-flags.patch
66
	"${FILESDIR}"/${P}-pkg-config.patch
67
	"${FILESDIR}"/${P}-CVE-2017-1154{6,7}.patch
68
	"${FILESDIR}"/${P}-gcc5.patch # bug 606894
61
	"${FILESDIR}"/${PN}-2.14.0-params.patch
62
	"${FILESDIR}"/${PN}-2.14.0-ar.patch
63
	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
64
	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
65
	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
69 66
)
70 67

  
71 68
src_prepare() {
......
76 73
src_configure() {
77 74
	export EXTRACFLAGS="${CFLAGS}" #385817
78 75

  
79
	local myconf=()
80 76
	local audios
77
	local myeconfargs=(
78
		--localstatedir=/var/state/${PN}
79
		--with-module-dir="${EPREFIX}/usr/share/timidity"
80
		--with-lispdir="${SITELISP}/${PN}"
81
		--with-elf
82
		--enable-server
83
		--enable-network
84
		--enable-dynamic
85
		--enable-vt100
86
		--enable-spline=cubic
87
		$(use_enable emacs)
88
		$(use_enable slang)
89
		$(use_enable ncurses)
90
		$(use_with X x)
91
		$(use_enable X spectrogram)
92
		$(use_enable X wrd)
93
		$(use_enable X xskin)
94
		$(use_enable X xaw)
95
		$(use_enable gtk)
96
		$(use_enable tk tcltk)
97
		$(use_enable motif)
98
	)
81 99

  
82 100
	use flac && audios+=",flac"
83 101
	use speex && audios+=",speex"
......
88 106

  
89 107
	if use nas; then
90 108
		audios+=",nas"
91
		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
109
		myeconfargs+=(
110
			--with-nas-library="/usr/$(get_libdir)/libaudio.so"
111
			--with-x
112
		)
92 113
		use X || ewarn "Basic X11 support will be enabled because required by nas."
93 114
	fi
94 115

  
95 116
	if use alsa; then
96 117
		audios+=",alsa"
97
		myconf+=( --with-default-output=alsa --enable-alsaseq )
118
		myeconfargs+=(
119
			--with-default-output=alsa
120
			--enable-alsaseq
121
		)
98 122
	fi
99 123

  
100
	# We disable motif by default and then only enable it if it's requested.
101 124
	if use motif; then
102
		myconf+=( --enable-motif --with-x )
125
		myeconfargs+=(
126
			--with-x
127
		)
103 128
		use X || ewarn "Basic X11 support will be enabled because required by motif."
104 129
	fi
105 130

  
106
	econf \
107
		--localstatedir=/var/state/timidity++ \
108
		--with-module-dir="${EPREFIX}/usr/share/timidity" \
109
		--with-lispdir="${SITELISP}/${PN}" \
110
		--with-elf \
111
		--enable-audio=${audios} \
112
		--enable-server \
113
		--enable-network \
114
		--enable-dynamic \
115
		--enable-vt100 \
116
		--enable-spline=cubic \
117
		$(use_enable emacs) \
118
		$(use_enable slang) \
119
		$(use_enable ncurses) \
120
		$(use_with X x) \
121
		$(use_enable X spectrogram) \
122
		$(use_enable X wrd) \
123
		$(use_enable X xskin) \
124
		$(use_enable X xaw) \
125
		$(use_enable gtk) \
126
		$(use_enable tk tcltk) \
127
		--disable-motif \
128
		"${myconf[@]}"
131
	# needs to come after all audios have been collected
132
	myeconfargs+=(
133
		--enable-audio=${audios}
134
	)
135

  
136
	econf "${myeconfargs[@]}"
129 137
}
130 138

  
131 139
src_install() {
......
173 181
	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
174 182
		-e "s/Terminal=.*/Terminal=${terminal}/" \
175 183
		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
176
		-i "${D}"/usr/share/applications/timidity.desktop || die
184
		-i "${ED}"/usr/share/applications/timidity.desktop || die
185
}
186

  
187
pkg_preinst() {
188
	xdg_pkg_preinst
177 189
}
178 190

  
179 191
pkg_postinst() {
......
193 205
		elog "Only saving to wave file and ALSA soundback has been tested working."
194 206
	fi
195 207

  
196
	xdg_desktop_database_update
208
	xdg_pkg_postinst
197 209
}
198 210

  
199 211
pkg_postrm() {
200 212
	use emacs && elisp-site-regen
201
	xdg_desktop_database_update
213
	xdg_pkg_postrm
202 214
}
Thank you!