diff options
Diffstat (limited to 'media-libs/libsamplerate')
| -rw-r--r-- | media-libs/libsamplerate/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild | 30 |
2 files changed, 29 insertions, 9 deletions
diff --git a/media-libs/libsamplerate/ChangeLog b/media-libs/libsamplerate/ChangeLog index bb4f07242bd7..821431a1d58b 100644 --- a/media-libs/libsamplerate/ChangeLog +++ b/media-libs/libsamplerate/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libsamplerate # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.75 2013/05/07 12:49:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.76 2013/07/29 22:19:12 aballier Exp $ + + 29 Jul 2013; Alexis Ballier <aballier@gentoo.org> + libsamplerate-0.1.8-r1.ebuild: + Do not build useless binaries for non native ABIs. Drop now useless + MULTILIB_USEDEP on libsndfile. Slat it for + emul-linux-x86-soundlibs-20130224-r7. *libsamplerate-0.1.8-r1 (07 May 2013) diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild index 172a601becc8..2eb0078e762d 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild +++ b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild,v 1.1 2013/05/07 12:49:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild,v 1.2 2013/07/29 22:19:12 aballier Exp $ EAPI=5 @@ -17,8 +17,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="sndfile static-libs" -RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emultaion/emul-linux-x86-soundlibs-20130224 )" +RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -35,11 +36,24 @@ src_prepare() { } src_configure() { - local myeconfargs=( - --disable-fftw - $(use_enable sndfile) - ) - autotools-multilib_src_configure + my_configure() { + local myeconfargs=( + --disable-fftw + ) + + if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then + myeconfargs+=( $(use_enable sndfile) ) + else + myeconfargs+=( --disable-sndfile ) + fi + + autotools-utils_src_configure + + if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + sed -i -e "s/ doc examples//" "${BUILD_DIR}/Makefile" || die + fi + } + multilib_parallel_foreach_abi my_configure } src_install() { |