From 153f94eabbcfb0c5f8dee0b76468a82e81bdaaad Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Mon, 10 Nov 2014 22:23:16 +0000 Subject: [PATCH] ensure the ebuild does not install pulseaudio libs when USE=-pulseaudio Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED --- .../emul-linux-x86-soundlibs/ChangeLog | 8 ++- .../emul-linux-x86-soundlibs/Manifest | 9 +-- ...mul-linux-x86-soundlibs-20140508-r1.ebuild | 70 +++++++++++++++++++ 3 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog index 1793095af2f0..70fb869b1d16 100644 --- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-soundlibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.128 2014/11/06 21:52:12 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.129 2014/11/10 22:23:12 axs Exp $ + +*emul-linux-x86-soundlibs-20140508-r1 (10 Nov 2014) + + 10 Nov 2014; Ian Stakenvicius (_AxS_) + +emul-linux-x86-soundlibs-20140508-r1.ebuild: + ensure the ebuild does not install pulseaudio libs when USE=-pulseaudio 06 Nov 2014; Ian Stakenvicius (_AxS_) emul-linux-x86-soundlibs-20131008-r2.ebuild, diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest index 68c671cc6186..93b4644093cb 100644 --- a/app-emulation/emul-linux-x86-soundlibs/Manifest +++ b/app-emulation/emul-linux-x86-soundlibs/Manifest @@ -7,13 +7,14 @@ DIST emul-linux-x86-soundlibs-20140406.tar.xz 7230696 SHA256 83585754db38294dbba DIST emul-linux-x86-soundlibs-20140508.tar.xz 7259656 SHA256 6d79654e4c93f1f7f289fdab3125aba80d66b08ef0677c6e46869ed2488320e0 SHA512 5ee5efeffdc74bdf5f98d9bf862de4a90b22d0bac4447919f044bbe4a2f66a672901c3dbf79a52cc302e27b06a03aa4266b7143918afa364e2d7623190c99cdb WHIRLPOOL 96412024eaa8814ed334ae1087c099b690dcc1b64fd105f246b6740f6679036d2c61420d76c034780084fd095648d879aa9522213bd2b134fd9afe74cbfcce9e EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2507 SHA256 d9c5cba21dd1ca2f9f2f8d3274dab86953a97b7c19cee81b9d122bae0e0d7ff8 SHA512 656b3d33c7223e702d2cc9d7e29027f87307762ad6207172f03730e1e17da51481b4dd2a9d0812240d114d4b7dbf19595cbc9ea6fc1ba70fd83a2969cf435d07 WHIRLPOOL a78e085d172b85651ee627f9f1bc71c767f326016c578ace6dce33be27d9f7c42198be01827b1640746362fe79210e3f6fb7478445132bac72d1c7fef6a4773b EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 2587 SHA256 060f15d066187731a6efb9e35c99a99227de9721064f609973ea01601a4049ed SHA512 d291b65ecb9c7a823bfb1cea24cc7c2b514fff64d46e8b24a52fa7a270113fba8c4685a85e959caf1d058eccc14a64311689941a95aa44202c7823f85d6514a1 WHIRLPOOL 543f871614cda9113ff6535a7b1cfa49119f2e2b80dd46415467d94e739b8aa2ea837fcd6034fbc835ff994dd5f7c7a6565eb6e96946c3031fb0b335ed27d088 +EBUILD emul-linux-x86-soundlibs-20140508-r1.ebuild 2675 SHA256 36cfa5c38b461d2d1c1200f989155e6e968a3155978821e3fd239c303f0cbc08 SHA512 c427594ec0664681f22614f8bcde5f7453cdfc121543fae56bd597e84baa47d4a2619db0d62f5c9250e64b07f49d20d462df7bc693e09d18a7017c3779aad814 WHIRLPOOL c6059812681d7e6485bf415a9c44c44f8c45c3b38b5879cf04c6d1e8e6fc705b42a42f888c28e1ae19af72e179d676dc8e0d9459104ec5b770f0e7964b68d3c3 EBUILD emul-linux-x86-soundlibs-20140508.ebuild 2591 SHA256 e9232ae829672ef17ce4e6d2f18e869626e4ba8ae97b33e88a28b9ab6c64bf4a SHA512 0e160566cd74e2d8e00e36104d40b110767085f94afb9463877358cab956e9a5ab537949800dd7ac9038057abdf4e5d6ff85b363dbc3ca6d128d9d6be9bf421a WHIRLPOOL f62c5836214f89807c225de1be73ef7b5db73d528b8b82f6287ca7e690aec2d7c4eb661f541d8e4ee6018489b450c8a42f1056634d59f956d5faa744925574de -MISC ChangeLog 24997 SHA256 7bb8bae1a3fa9d82935a29cd9b14b1bf754abe30e69ce1439eda40732b842a94 SHA512 73e946168aafc36052f0843b6f2c5a4c73e0996674244b6fa766bc5878a5e4dff7c2a1651529f51a54e0720b42495ce1ececeba39b54b6a61cc2ddf7cbbec4d2 WHIRLPOOL e96d72f436074717603bf90beb296c5d01e9d0b0fb4d686000b73acf14eecc889af1a0b21fbb5e15a6bd2de8fbacb81886e93f9bdb08f0a0918307462a6a3aec +MISC ChangeLog 25230 SHA256 db852b71010c4e3df2fb56151db7256005a00d86364566cb8a3d1310d7dd4c7a SHA512 0aefa1ffcd78ed77bdf9c56ad4ddeda6d71dd5fabff96e465c941be6f9d0c955027fa24a5dbd3623e6f83aef9cbbbe8c19370801c65cbd270f27f5630d54ed66 WHIRLPOOL c12617da92247c284d52912bd992e28a8257871595c640f84c27b8fa1e1032393e334292434c8faa7b6eeacb388e14f49ef22fe993a6cab39256295010d6fff5 MISC metadata.xml 517 SHA256 faf3defb4feb1fd0093d95cb224b838c58bfc83b23c5e370cb902b7442c6e4df SHA512 261d34677e9b7f7da806f7d29439645e067679c2cb6c957ad73fc73dd9b6562aff9052220370f2acdce6bd0421e7cf5dde354d44444beab4b3ae965d20d50553 WHIRLPOOL 183e21dd5f32842b27b676e5befe7cc971903ca8d723c656adf5776788356e55b583c9ba7d74ef27e6e98ca7da0921b41eedf499a32eec989db4fb7b5a97d1df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRb7ZYACgkQ2ugaI38ACPD04QEAnRciDUfZ/bggkmMTm2TKZymn -QeA0i4+SnhBhAYEy2csA/2DQmkI/cfL4gXMTwQULOehsL0djvNDGY2bXDzEe9xID -=WoeN +iF4EAREIAAYFAlRhOtQACgkQ2ugaI38ACPCIMQD/ahSYQg8kdMgtHUzguTPWUQqr +RTpD/cHE+jd3X7mirB0A/3qLXM6d+wJC60lj68Vwx83/SasO+yfs/L6kYENZTun7 +=u+4F -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild new file mode 100644 index 000000000000..cb3c60471070 --- /dev/null +++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508-r1.ebuild,v 1.1 2014/11/10 22:23:12 axs Exp $ + +EAPI=5 +inherit emul-linux-x86 + +LICENSE="!abi_x86_32? ( BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain ) abi_x86_32? ( metapackage )" +KEYWORDS="-* ~amd64" +IUSE="abi_x86_32 alsa +pulseaudio" + +RDEPEND=" + !abi_x86_32? ( + ~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=] + ~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=] + + !>=sci-libs/fftw-3.3.3-r1[abi_x86_32] + !>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] ) + abi_x86_32? ( + >=media-libs/libogg-1.3.1[abi_x86_32(-)] + >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] + >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] + >=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] + >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] + >=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)] + >=sci-libs/fftw-3.3.3-r2[abi_x86_32(-)] + >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)] + >=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)] + >=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)] + >=media-libs/libmikmod-3.3.5[abi_x86_32(-)] + >=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)] + >=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)] + >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)] + >=media-sound/musepack-tools-465-r1[abi_x86_32(-)] + >=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)] + >=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)] + >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)] + >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)] + >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)] + >=media-sound/mpg123-1.18.1[abi_x86_32(-)] + >=media-libs/libao-1.1.0-r2[abi_x86_32(-)] + >=media-libs/alsa-oss-1.0.25-r1[abi_x86_32(-)] + >=media-plugins/alsa-plugins-1.0.27-r3[abi_x86_32(-)] + || ( + >=net-wireless/bluez-5.18-r1[abi_x86_32(-)] + =net-wireless/bluez-4.101-r9[abi_x86_32(-)] + ) + pulseaudio? ( >=media-sound/pulseaudio-5.0[glib,abi_x86_32(-)] ) + )" + +pkg_pretend() { + if use abi_x86_32 && ! use pulseaudio; then + ewarn "You have disabled USE=pulseaudio. This is known to break pre-built" + ewarn "libavfilter in emul-linux-x86-medialibs. If you need that, please" + ewarn "turn USE=pulseaudio back on." + fi +} + +src_prepare() { + use abi_x86_32 || emul-linux-x86_src_prepare +} + +src_install() { + if use abi_x86_32 ; then + emul-linux-x86_src_install + use pulseaudio || rm -f "${ED}"/usr/lib32/libpulse{,-simple}.so* + fi +} -- 2.26.2