summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/Manifest2
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild10
-rw-r--r--media-libs/libvorbis/Manifest2
-rw-r--r--media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild4
4 files changed, 14 insertions, 4 deletions
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 438bee0a..e7fbf4aa 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,3 +1,3 @@
DIST emul-linux-x86-soundlibs-20130224.tar.xz 7068240 SHA256 51ee669fb864b8522cd9ffa4aa8148c20eb07c06623a8c0bd718d444867da92a SHA512 67bca8c875e17bb8e1b3057182d08c679992ce525e124162e02e8a2c01bb5413d7ab19736a9f803d8a3835e7c5d68e556de9d3aee7240fb6708d2f3528ae56e0 WHIRLPOOL 48b9583dd91d5b1dbb4dedc1c9f5bf2937a325adad20bb45adf7de96e5d1db6a3e62a617ef85300c917faf57313a00790007d12db3a6dc9261ef627c71f14d9a
-EBUILD emul-linux-x86-soundlibs-20130224.ebuild 2012 SHA256 211d6f00335095c60328645b3dc9bf5cc2829a73cea2b70cde1c6cf4b220cda1 SHA512 238e493d60fc36e44397a23fefbc3579da81ecbea88d16317fb1d5e902acf866ecff1e71c4c867deb35066c8983a2f34f00ca7ca103a633252bb8ecbacd73ca1 WHIRLPOOL a4e7217e9f98d444ca78e19e5be2e11ec899ef90319846f99ca4278dc2b617e34645a7f9b7438536bbd6ffac2c32a810cef9515e7f66d8e0efafd62ca2e24691
+EBUILD emul-linux-x86-soundlibs-20130224.ebuild 2299 SHA256 78d7ac84e053b6b5dab383ffc2ae9526da19c8e78c00ed5fe7af51bcbb15c703 SHA512 79f14f61c9ac659993b52970b80637998c6f152c984e805072e8151058058137b1a8d6200c48e26fbfbbaeb4e4e1d9d6d560a7fa264139ab52ac89b5e4b87406 WHIRLPOOL 0a7707f13313d45cdae47295fe637bf5105f6233ab89ab3583b657539d9eacbffab0707826270f7e851743a4854139ce80a00956d2afc131d38336112fa59fac
MISC metadata.xml 225 SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453 SHA512 924fc3abc73e518a76ae8255dc51a98e2a96c5e0312b15a3b5f12e278b2b4345d0de8a7a2eb91dbad0b9e55e2c38ccc215fac8b07ff73ccd2fd9843e68531cf5 WHIRLPOOL 9ecaf784ea9cc1ae7e81cead25eb99cff6f61247a2f33ccf27782ddb17c2642f63a6892b9b664015d4f278469b2c8ef93b9f69b9a6d1f15cfcc55ce41451c503
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
index d80f273b..21019986 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
@@ -7,7 +7,7 @@ inherit emul-linux-x86
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
KEYWORDS="-* amd64"
-IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-flac filter-libogg filter-webrtc-audio-processing"
+IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-flac filter-libogg filter-libvorbis filter-webrtc-audio-processing"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
@@ -50,6 +50,14 @@ src_prepare() {
rm usr/lib32/pkgconfig/ogg.pc || die
fi
+ # media-libs/libvorbis-1.3.3-r1
+ if use filter-libvorbis; then
+ rm usr/lib32/libvorbis.so{,.0,.0.4.6} || die
+ rm usr/lib32/libvorbisenc.so{,.2,.2.0.9} || die
+ rm usr/lib32/libvorbisfile.so{,.3,.3.3.5} || die
+ rm usr/lib32/pkgconfig/vorbis{,enc,file}.pc || die
+ fi
+
# 'media-libs/webrtc-audio-processing-0.1-r1
if use filter-webrtc-audio-processing; then
rm usr/lib32/libwebrtc_audio_processing.so{,.0,.0.0.0} || die
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 653ba1d6..5b4c6393 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
DIST libvorbis-1.3.3.tar.xz 1087888 SHA256 834c7d35a5ebf4e7b8ab60b0979f2b7f204ca66ff6829728e9d2a67f15347ebd SHA512 6b579517b9caba293ccf88c8806689076ef9c122e5424c704a81a4c461dbc67147dadee1b9a7a678a75c95ab9ed17b98ac1a5da6e2bcd6f7eab19c17616d529f WHIRLPOOL c571a2ace83dbe78f5b7d12d14bc1caba185d1cda67695ee39f73cb6de6eb372e55377675779024086f3a77ebb3be3f9627b0f329b2f540cc944236715608c65
-EBUILD libvorbis-1.3.3-r1.ebuild 1275 SHA256 8edefffc1d5a536c48602e90b13ab9efe5d3fba979527288abab00b3807614a4 SHA512 37b777f50e3ecb7f9cbc4a469405a8ecc9403b43ff56e325c192d052d0d1280b5858dbfb41778111a5cb2231d970d07aae301d7b5888dcee53320f13030110b5 WHIRLPOOL 783becf9d5ce8015de0e769fa997fcd647cbc9aaf73c6c79a8c4bb83dea36fd1cbfaa99f769cf807b1ac9b568aa923c6d35bec5a4a61ab74df7edb8357de8285
+EBUILD libvorbis-1.3.3-r1.ebuild 1341 SHA256 88fe10c60615eaabf983e2518d13f15e1506023521faeff861403643b5403b12 SHA512 668cd797f89d1284a6720cd9e0990d02b13b02f4b43f1b2faa9e4f62a81cb53fe1eb9d7dc68872316396230b25d45d26b6ffa825a0b2b32cef0ffe85a1f36d4f WHIRLPOOL 7da4db0388ba1604e0000af7b4c93729d3fa028abd4c9828de2eef4b061d806e06e166c1dfeff482aa6b8f74ba48b57a1a20f48faddefbc344965350adde11ee
MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
diff --git a/media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild b/media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild
index cda999b9..c22669aa 100644
--- a/media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.3-r1.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
IUSE="static-libs"
RDEPEND="media-libs/libogg[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+ abi_x86_32? ( || (
+ app-emulation/emul-linux-x86-soundlibs[filter-${PN}]
+ !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) )"
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig"