libltdl is only a native dep, so dropped needless MULTILIB_USEDEP flags; also dropped libtool from ~arch version of ebuild to match vapier's pattern in bug 528294; also fixed building with USE=-glib on non-native ABI

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 31 insertions, 20 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 576adcb7c0cf..d9e3cb8d07a8 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.355 2014/11/06 19:22:25 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.356 2014/11/06 21:32:53 axs Exp $
+
+  06 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  pulseaudio-5.0-r4.ebuild, pulseaudio-5.0-r5.ebuild:
+  libltdl is only a native dep, so dropped needless MULTILIB_USEDEP flags; also
+  dropped libtool from ~arch version of ebuild to match vapier's pattern in bug
+  528294; also fixed building with USE=-glib on non-native ABI
 
 *pulseaudio-5.0-r5 (06 Nov 2014)
 *pulseaudio-5.0-r4 (06 Nov 2014)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 88b839be8c31..7c4c7f1eb4b9 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -15,14 +15,14 @@ DIST pulseaudio-4.0.tar.xz 1392072 SHA256 35ceb36bb1822fe54f0b5e4863b4f486769fdf
 DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
 EBUILD pulseaudio-2.1-r1.ebuild 6722 SHA256 80d93c9f75137471fdf3d7904251fd3e70ace606fddb9f7646efdddf274d2fbf SHA512 a3ca0cb01df88f30a164a3c575eff876cb60551e148c84688cf2e26d22a351df7b3ea5ec7dc1f9c4ebe82904b7195ef761d1c2636b94488b5daedb94eae1c93b WHIRLPOOL c006024d46e9f129af3a685fd548b60ce2d2ba97b132e63a957a36257e96a77e12575ecddd728ba60d52780fb427ca0b3b7508b2ab2152bb77d15822b174c207
 EBUILD pulseaudio-4.0.ebuild 6912 SHA256 3dd5fffafbc324d0814d33a07db183c5c1b9a0ee963338a6c7a0b00c80982f97 SHA512 855fd1c48bcd00cfe1f096461e25688903e61f8799f91fa0883d8da857bcc1bbee6bf4b3c72718a35224661be05eb435f0a5c7a8a0588beba74cd5056bfc9c41 WHIRLPOOL a337cdb325915c4b38a1b42eda3371d61f9b8c93aa408eac18b0ad2e4e5d7ca0b988edf3ba87b21ff15f69ba5a0af942bd22c74a98f032000a2d9f902edd7253
-EBUILD pulseaudio-5.0-r4.ebuild 10131 SHA256 05ae5342d293aaad728900a548e674831e1b70286b037757cdbd1ffd237ab51a SHA512 ad9dcd376b75ae1cda9c12430a98d5555798465bcba290785f6c527eb54535a53a4d426ec8fe76bb2016b44d4ff3ceb196ba01d1c829a720dc5d430204b523f2 WHIRLPOOL 0debeeee544ea20e9fdcacfc079adcc5901d40cd11b9945598387dd4e87bcd88c00fa55b4ead473b8071575d30e3d575b4af25a3cbb641935040f1db45f6efe5
-EBUILD pulseaudio-5.0-r5.ebuild 10346 SHA256 cfcdf0dc1447dcd36f4be6adc7efd9fc0be14e752a7756b47f4cb847fddaec90 SHA512 622a844ae59489e6a4fbfa8e14a1a0990e2442c59bfae17662308823073c8ac582d126ea1bd8f318274de4aac09671a787fc7585e7eeab7490dc974c0e92a14b WHIRLPOOL 1d1f842596297b785fb6bb562b34092ded6f3e99ec325a86de75fd45149d83ef9f686ee123e7f9c5eb7092c80ca73e39c78d6ff8e56a47a34c040d7413f1fb96
-MISC ChangeLog 67461 SHA256 c9375631d8f3944ec20bbbf25a516d1938bc9e0670a3c3b65b2c5c29c3574140 SHA512 0bf58f9b45f71fef538daced59fb552d8aa4bf7031643b1d42940f03a6ce85cf40458eef8dcc33d1b93bce67d6778fc83841bef06c3801e5cfefc1d263f02b55 WHIRLPOOL 05214ba863cb8b08d7807170f8af0d7d05f9d2909a8fc36060aae46bd69d539ccb7c3b9eecdc267f193e1a2ffefd827f466fd0297362da63236a3977abd687a4
+EBUILD pulseaudio-5.0-r4.ebuild 10280 SHA256 ecfcb8e41987a89721eece1b90535d8b69e6051fc526b8017ed93cde28986588 SHA512 53bbcda4b9885cbdb4c3d2c3077052e519ceb64fe4ad74678eef75ddedd5590f4ea7b33efbd58bd8a35b29ab084fce596d8672188abf1b5b915ec007ee33cae0 WHIRLPOOL 7bb2a3898ee6b6775c51a207ff13102524f76ea38a49e68b30b647b8423eb456e841bf4e61fbe8a4bcb48a6cdbdd594253ccb1702989ac1ac460648e7f47e14d
+EBUILD pulseaudio-5.0-r5.ebuild 10448 SHA256 0dfe2972221d0f35bf3479af2c0a50870034041a58fc789e9d062d42ba3e1e9e SHA512 86d0b366eb6e4bb6d0db5df77c13e89b5a90fbf4d78302319bd8adb7c9cd37583436731ad14886a1a5e8ed4e923d9309965e16823142ad6e34d00bb27aec52e1 WHIRLPOOL 6a5dbbe698ced48dfc1c9c85af7ee25e96a65a21cda35a305c7129d7dca9390625f447900e62aa53d7d52c14a173c245df650ebbefbc62342789685c693504dc
+MISC ChangeLog 67796 SHA256 a0b1c1700f0175fef86e3961dd3e9d4e1b62d2100d2fd26dc699e0cfbd2386af SHA512 e91ab3e03437de92e7ebad09bce72da769144b838ad647f6f071c8f7f02fbf3d67cd9196faf78fd87979666ed697157d7ff5dd3d51d10956474ef23df15f5ed6 WHIRLPOOL 8887da8f4532f31fee618273d7488e488698c1c51008dc3f675b441da2b661cee608ae305c51c957fb676968f1a4a6eb3c10919edee8c93ac6188a3f41370ac5
 MISC metadata.xml 2831 SHA256 626aa770bbfbd06e872686d755d45c82f53e8b99cc82719fa7d8e69d9d9e2130 SHA512 a3b13e05bec6d3b4df89324e8caffdb8d9c4e9ed45087289e4b967269cb65ed7acbaa3896139b43a26e3fcffbe723f0579f0a438077069573eb9319ff7f179a1 WHIRLPOOL 1356c3d642361188574001f2f1d7797dfe7935c54dfcc6146389c930b69fdb89e7354f00201d99471c585b908d241b16bc8ae409c4d9852ebdcd07ffab85f1fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRbyn8ACgkQ2ugaI38ACPDyIAEAvYi8KHaII7B56WH2pfmdXyBC
-+AUlDfXVfrlcTn5FoisA/0P3RJSaXp/eMz+9M/kN2celAPxmj0ZvMHaRcQ2IO2vl
-=IiMp
+iF4EAREIAAYFAlRb6RAACgkQ2ugaI38ACPAcNgD/em880q0gHxDbG37PkE1qdD8K
+9KNRYICLYASzDcoZwQ0A/jGVt20SGds3rnSlhBnNdcMHIJM/Jp1URHLVt2xRqZUn
+=6BhE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
index 7ebf21df192a..13705f09d39b 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild,v 1.1 2014/11/06 19:22:25 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild,v 1.2 2014/11/06 21:32:53 axs Exp $
 
 EAPI="5"
 inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -71,11 +71,11 @@ RDEPEND="
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
 		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2[${MULTILIB_USEDEP}]
+		dev-libs/libltdl:0
+		( >=sys-devel/libtool-2.4.2 <sys-devel/libtool-2.4.3-r2 )
 	)
 "
-# it's a valid RDEPEND, libltdl.so is used
+# it's a valid RDEPEND, libltdl.so is used for native abi
 
 DEPEND="${RDEPEND}
 	sys-devel/m4
@@ -241,7 +241,9 @@ multilib_src_compile() {
 	if multilib_is_native_abi; then
 		emake
 	else
-		emake -C src libpulse{,-simple,-mainloop-glib}.la
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[@]}
 	fi
 }
 
@@ -268,10 +270,12 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
 	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
 		emake DESTDIR="${D}" install-pkgconfigDATA
 		emake DESTDIR="${D}" -C src \
 			install-libLTLIBRARIES \
-			lib_LTLIBRARIES="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la" \
+			lib_LTLIBRARIES="${targets[*]}" \
 			install-pulseincludeHEADERS
 	fi
 }
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild
index 705fc5a03097..264180c02462 100644
--- a/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild,v 1.1 2014/11/06 19:22:25 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild,v 1.2 2014/11/06 21:32:53 axs Exp $
 
 EAPI="5"
 inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
@@ -70,12 +70,9 @@ RDEPEND="
 	dev-libs/json-c[${MULTILIB_USEDEP}]
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
 		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2[${MULTILIB_USEDEP}]
-	)
+	dev-libs/libltdl:0
 "
-# it's a valid RDEPEND, libltdl.so is used
+# it's a valid RDEPEND, libltdl.so is used for native abi
 
 DEPEND="${RDEPEND}
 	sys-devel/m4
@@ -244,6 +241,8 @@ multilib_src_compile() {
 	if multilib_is_native_abi; then
 		emake
 	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
 		emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
 	fi
 }
@@ -271,11 +270,13 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
 	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
 		emake DESTDIR="${D}" install-pkgconfigDATA
 		emake DESTDIR="${D}" -C src \
 			install-libLTLIBRARIES \
 			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la" \
+			lib_LTLIBRARIES="${targets[*]}" \
 			install-pulseincludeHEADERS
 	fi
 }