From 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 22 Apr 2018 14:25:03 +0100 Subject: gentoo resync : 22.04.2018 --- media-libs/libsamplerate/Manifest | 4 ++-- .../libsamplerate/libsamplerate-0.1.9.ebuild | 4 +--- media-libs/libsamplerate/libsamplerate-9999.ebuild | 22 +++++++++------------- 3 files changed, 12 insertions(+), 18 deletions(-) (limited to 'media-libs/libsamplerate') diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest index 4a7faf51337d..eec6b87d428a 100644 --- a/media-libs/libsamplerate/Manifest +++ b/media-libs/libsamplerate/Manifest @@ -1,6 +1,6 @@ AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 BLAKE2B e6acec51e3a8dcfaa50074734e55ba64d416882334e80e9fbf5a079d236e1ed358173efd84faf568c29962dc5655b11e8cf7adeb007159f8fdd0b0e14904c457 SHA512 93fce01981c831ced0fd83c315841660a7d194a706ba8b1fb775cc327d8e526c1b65abc8556dfde808672143d51b5e70f005f569034e6921e8af53af1ad45eee AUX libsamplerate-0.1.8-lm.patch 215 BLAKE2B 1123b4aab36476f89505daaa0d0ddf842819d8a70930469dc35140f648d71a29f3ed84eb36016c69a0738358a03d58930acc8381cacf3c047552b1fdcb7bae60 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a DIST libsamplerate-0.1.9.tar.gz 4336641 BLAKE2B f1cf4c669315ef6a93bfa0c5c73284187068b9b049299afbfd45da5c133372cfd6fdd00fda2dbb2a6740446219203ceda8b46385c844d9ef480e8578aa0b3928 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 -EBUILD libsamplerate-0.1.9.ebuild 1547 BLAKE2B ae0254f5b72ed170b7a9b131e03ad535581dbd7b2de82b3d9f76872c5d7a213b2ba16bcd0cf30a7cbe6e3b7f23529cda26615c1b44091cbb3541d2e237ce6b34 SHA512 35da5b5fcb387d32ee2dbaf09fc68a4bc6cfe3561fc2f2e363cd5eca4ae640bc7f2789c9bf5ae13ca8003b1ef70ac0532ee61943fec710b55d06f31d12264d34 -EBUILD libsamplerate-9999.ebuild 1328 BLAKE2B a6cbd940836eda3f2db12b23726356f1659d454a5a5a1df5cd5a5a9f72afbc1c74d005ad11a1fd0bf3946f76ee7fbcebd610715ced979972a2e09ba802cfaf0e SHA512 e1628a69023daae1bd4a50fbc1b4b63e8438dcb56a7c2ca1a991fd5c3e0388d0d3e4ea68df3c9788f21ac2b2afa48053767810fb0098da58be832900e1be8f24 +EBUILD libsamplerate-0.1.9.ebuild 1415 BLAKE2B 239e713e8cc7b601c78887aa133c1a6ccbf9be0a3c6200e0f9d42f479a0a7cdc2ab2ee6057de42c4a909cadd85c79d160bde61d089c1e02365930270f137d748 SHA512 97955e2a094b8c114c23776a08343f9c0b85647f8f512f406e74a7189a47ed51b0f4fdf748ea31cd14a62e005e0e49f61dea859cba6513efda734ac84716d2b6 +EBUILD libsamplerate-9999.ebuild 1300 BLAKE2B 04ce2d1e21e31f24c0d653a41c912ea70f78fab450cd2438e7473100f67cde8238a81868437aa3e3e331df5a0959675682560f6b0d96526f349f6c8b50279820 SHA512 776bd88b30e5fba3383af725ab05648863c3168335706959532f456cbb7c2835513fdd144ea36fae6919f8ed99eeb13bb7e6fd5f66e4ac97c601297ff5d594d6 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild index b69d708bec88..ec95a697c759 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild +++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild @@ -16,9 +16,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 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 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild index e92848835512..5fd3fc1ba457 100644 --- a/media-libs/libsamplerate/libsamplerate-9999.ebuild +++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,19 +18,15 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="sndfile static-libs test" -REQUIRED_USE="test? ( sndfile )" - -RDEPEND=" - sndfile? ( - media-libs/libsndfile:=[${MULTILIB_USEDEP}] - )" -# Alsa/FFTW are only consumed -# by tests, not by the main library. +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +# Alsa/FFTW are only required for tests +# libsndfile is only used by examples and tests DEPEND=" - ${RDEPEND} test? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] + media-libs/libsndfile[${MULTILIB_USEDEP}] sci-libs/fftw:3.0[${MULTILIB_USEDEP}] ) virtual/pkgconfig" @@ -43,10 +39,10 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ - $(use_enable sndfile) \ $(use_enable static-libs static) \ $(use_enable test alsa) \ - $(use_enable test fftw) + $(use_enable test fftw) \ + $(use_enable test sndfile) } multilib_src_install_all() { -- cgit v1.2.3