app-emulation/emul-linux-x86-soundlibs: merge -20140406-r1 deltas from 20131008-r3

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 68 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index b0bb8a2..6e252ac 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,8 +1,8 @@
 AUX remove-native 12819 SHA256 6ec9711463c6e4ba3e525ba25d839e3f9ecba530fe6dfc05745f447ba3c00aa8 SHA512 8f74f2edbb0c7cbd05f234632b419fa91f37a3b096316064182456ad8d6b2f8431f262e20582858452c06a2610638f881d4ea26a7c6c2445ec4980188c2106e7 WHIRLPOOL 6b46687de78f9b08cd5ce79c6f2d9ca6ddb641c4b6d6ee066101319dbd386955fa228f994ebcf5e2c03c809d00424c87564cbd75ce96bf7f4393625d05d1da1b
-AUX remove-native-20140406 11442 SHA256 a10bfc635a004e90597008894648283b4155910943fc1ba33eebfcf89b1ca3f7 SHA512 d1a65e7e526aeaf408e98c352d519ee0591fb98dc86ebb5acc2d0ba500ee3466d954a7636e25a1e27ec34a730cbb16737b765b00607b0855f05e66d4d41e4f7f WHIRLPOOL d83edc8ed98651ad2bbb49d913065bedb82c1e7c2e7337932bd55e678a1f05fd807a778c384771a55dbfbbf98f076e93cd058b477dc5b498cb9e94842159a811
+AUX remove-native-20140406-r1 13279 SHA256 90815ce41d56069285f1e6271483bff130fb0a8eddcf660767d21994a2d4e027 SHA512 3de8402828125356bde08e271abd683dd1632c1665adf2b33e9af9739cf31d1c7220688fcecb2ee94e46e3d6bf85295b8cb19341f5cf6bc9e54be7eb2cbc1838 WHIRLPOOL f241faf056f02e58406e3f9c2cf47b2f2b53abd1e9930a44137a4133f61689bc542d0a03e32ad96be70d39ab52f8152e8e78552b5755ae453b5f5b72e631cfd9
 DIST emul-linux-x86-soundlibs-20131008.tar.xz 6700140 SHA256 4afbaea80a493556475abfba0f2ee72941d214bfab159097f1c3267190f3fbdf SHA512 da1e38004fee464d88051fa2c4496bf250a2b641b7c6570ae327260ea121a8cb9c9557065595c1c546185d890fedbae987daab6deb8d192e94623fd3926ded20 WHIRLPOOL af569f721be3e07334b1384f5d245ad010aa4090705dfb954b1e48b5845894ea9400f9ac9c8cfbe0168ec1954bfd4503711068218c970c7a7f4a6d33d54a022b
 DIST emul-linux-x86-soundlibs-20140406.tar.xz 7230696 SHA256 83585754db38294dbba72d9a60623e988fb58df3895bd93acaf223c92013f3a9 SHA512 323323e6a195bbe4ecdc7d4ad52160945fffb906a0f8edb0845984649449f2fac57ed1ce89b7fb71d4479c2a7152ca580a75b86bf89882e8aaa435229ecf5f28 WHIRLPOOL fe35f35c44bc2e3fb5c03260b897b5df7bcc079e371c2fbfb3cb6c16d002a0999d0958140398225faa0fd36f7ba1e40f29dd2c36dd9f9ee8b3990fbcfbd4443f
 EBUILD emul-linux-x86-soundlibs-20131008-r3.ebuild 2742 SHA256 fe0d36597a179bedf74c595323fa170bc8a3cc4e966b33192d6f19a57ad912d6 SHA512 3474d6236d18bf5b1d429f18a8c2cfd8849a0245bd4fdf06d8696f60a65bee880e1b64788750e503ed3c1fd242d9e0e61d56238a2633a4b398db9eed31a697c3 WHIRLPOOL 9b9a70a72c044dbe7ae56546fa545e2f088458349cf9fc52aab2f939cd692036754e67774c8a38be21eb880a408abcf5edc4c8232c7267b97fa688be8ace1f07
-EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 2392 SHA256 45ac94c2a4840d0c7a45d9a7a6cc0d004c4cf1ce12e74254ec49821cf347e1be SHA512 02cb9f64bc6ef1f33a83ad903bb3a64a77a05aa7aa9fbb713b1d17bdd3d7cc15a4c75a1edcb15c3a3ec69f2159fe410e1eeeeef8832a5ab2297cf3ab11916147 WHIRLPOOL b0bcb6de1eee1213dd97986127dd3cfc37b6cd8456707f2bce225b9c77360311c3a46af888554043a93f3c6c4ec2cd0bcd888784fcd0e0b00b7c3fb6d18e4c62
+EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 3352 SHA256 cc22c914a57277639d159eb000f6f1f611ae6ae4d33458261ab4cb505d1822aa SHA512 a6c80f2be3d805b6ea7154cff39b0069dc17ba19593449ec867de7c3aac038e7777f9c2746564aab7f2aaa460e63083e905c1487b98e476b8dac8aae6aaf22fc WHIRLPOOL d003a74a88f85c0dc88516a2281d482039c31da58ddc1eb598e7421924d93bcbb98eca0cbcbe2b4e82fd044f350808c30d5cfe787ba4c9b907927df5c11f73f1
 MISC ChangeLog 22039 SHA256 3768d794f42447b0d8191c68be879f9c7b8cc1219697782da6ece6f5a0eeef4e SHA512 6e0f72f9532c18cae6c7a7e979e89ac6717c6fac65c7ec737e95da051f7affa6b8ab682930fe3188cbf1843f8ea2b6ccd9efb0068db856148e8c48b1103bc201 WHIRLPOOL 7b9355afbae377a448c6be8953168cb49bfd976d5be99f0e65a72e4fb102713805da25b315a36fbaf345b5a2b482efecc16b74f52b3d5b1c50db5480a650c4c8
 MISC metadata.xml 393 SHA256 1c7a2ff2a63b40d4d163c62ec9b2a8734abefa33f9aa2fd514c51e62ba284a80 SHA512 ad676da46d237f6f3562a01055e935b4b5e04b95bf8b9e20a6b02562849627eac594d50146291c7434259440473b48bde16f4c5e985ef3ed7250275bfc47a6a6 WHIRLPOOL 2023a9f3b593d6f4d92f4e3a4fcc8e5ee4271911ebb1578323acb17b7e7e17230fcf3c342751bda7f9bcc149c956d169923d9f157e789eba3ccf03df374199a6
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild
index dec5e3c..71cb9aa 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406-r1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[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.1-r1[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-r1[abi_x86_32(-)]
@@ -27,7 +26,11 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[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.2.0-r1[abi_x86_32(-)]
-		>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
+		alsa? (
+			>=media-libs/alsa-lib-1.0.27.1-r1[abi_x86_32(-)]
+			>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
+			>=media-plugins/alsa-plugins-1.0.27-r2[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(-)]
@@ -38,7 +41,12 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
 		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
 		>=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
 		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
+		|| (
+			=net-wireless/bluez-4.101-r9[abi_x86_32(-)]
+			>=net-wireless/bluez-5.18-r1[abi_x86_32(-)]
+		)
 		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
+		>=dev-libs/libical-0.48-r2[abi_x86_32(-)]
 	)"
 
 pkg_pretend() {
@@ -57,9 +65,22 @@ src_prepare() {
 	emul-linux-x86_src_prepare
 
 	if use alsa; then
-		mv -f "${S}"/usr/bin/aoss{,32} || die
+		if use abi_x86_32; then
+			rm -f "${S}"/usr/bin/aoss || die
+		else
+			mv -f "${S}"/usr/bin/aoss{,32} || die
+		fi
 	fi
 
 	# Remove migrated stuff.
 	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+
+	[[ $(ls -A "${S}"/usr/bin) ]] || { rmdir "${S}"/usr/bin || die ; }
+	[[ $(ls -A "${S}"/usr/lib32/bluetooth/plugins) ]] || { rmdir "${S}"/usr/lib32/bluetooth/plugins || die ; }
+	[[ $(ls -A "${S}"/usr/lib32/bluetooth) ]] || { rmdir "${S}"/usr/lib32/bluetooth || die ; }
+	[[ $(ls -A "${S}"/usr/lib32/alsa-lib) ]] || { rmdir "${S}"/usr/lib32/alsa-lib || die ; }
+	[[ $(ls -A "${S}"/usr/lib32) ]] || { rmdir "${S}"/usr/lib32 || die ; }
+	[[ $(ls -A "${S}"/usr/libexec/bluetooth) ]] || { rmdir "${S}"/usr/libexec/bluetooth || die ; }
+	[[ $(ls -A "${S}"/usr/libexec) ]] || { rmdir "${S}"/usr/libexec || die ; }
+	[[ $(ls -A "${S}"/usr) ]] || { rmdir "${S}"/usr || die ; }
 }
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406 b/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406-r1
index 8378d44..25dc05f 100644
--- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406
+++ b/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406-r1
@@ -316,3 +316,45 @@ usr/lib32/libao.so
 usr/lib32/libao.so.4
 usr/lib32/libao.so.4.0.0
 usr/lib32/pkgconfig/ao.pc
+usr/lib32/pkgconfig/bluez.pc
+usr/lib32/libbluetooth.so
+usr/lib32/libbluetooth.so.3
+usr/lib32/libbluetooth.so.3.17.6
+usr/lib32/bluetooth/plugins/sixaxis.so
+usr/libexec/bluetooth/bluetoothd
+usr/libexec/bluetooth/obexd
+usr/lib32/alsa-lib/libasound_module_rate_lavcrate_higher.so
+usr/lib32/alsa-lib/libasound_module_rate_samplerate_linear.so
+usr/lib32/alsa-lib/libasound_module_rate_samplerate_medium.so
+usr/lib32/alsa-lib/libasound_module_pcm_vdownmix.so
+usr/lib32/alsa-lib/libasound_module_rate_samplerate.so
+usr/lib32/alsa-lib/libasound_module_pcm_jack.so
+usr/lib32/alsa-lib/libasound_module_ctl_pulse.so
+usr/lib32/alsa-lib/libasound_module_pcm_oss.so
+usr/lib32/alsa-lib/libasound_module_ctl_oss.so
+usr/lib32/alsa-lib/libasound_module_ctl_arcam_av.so
+usr/lib32/alsa-lib/libasound_module_rate_lavcrate_fast.so
+usr/lib32/alsa-lib/libasound_module_pcm_upmix.so
+usr/lib32/alsa-lib/libasound_module_rate_lavcrate_high.so
+usr/lib32/alsa-lib/libasound_module_conf_pulse.so
+usr/lib32/alsa-lib/libasound_module_pcm_pulse.so
+usr/lib32/alsa-lib/libasound_module_pcm_a52.so
+usr/lib32/alsa-lib/libasound_module_rate_speexrate_best.so
+usr/lib32/alsa-lib/libasound_module_rate_lavcrate_faster.so
+usr/lib32/alsa-lib/libasound_module_pcm_usb_stream.so
+usr/lib32/alsa-lib/libasound_module_rate_samplerate_best.so
+usr/lib32/alsa-lib/libasound_module_rate_speexrate_medium.so
+usr/lib32/alsa-lib/libasound_module_rate_lavcrate.so
+usr/lib32/alsa-lib/libasound_module_pcm_speex.so
+usr/lib32/alsa-lib/libasound_module_rate_samplerate_order.so
+usr/lib32/alsa-lib/libasound_module_rate_speexrate.so
+usr/lib32/pkgconfig/libical.pc
+usr/lib32/libical.so
+usr/lib32/libical.so.0
+usr/lib32/libical.so.0.48.0
+usr/lib32/libicalss.so
+usr/lib32/libicalss.so.0
+usr/lib32/libicalss.so.0.48.0
+usr/lib32/libicalvcal.so
+usr/lib32/libicalvcal.so.0
+usr/lib32/libicalvcal.so.0.48.0