axs 14/11/06 21:32:53
Modified: pulseaudio-5.0-r5.ebuild pulseaudio-5.0-r4.ebuild
ChangeLog
Log:
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
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key
2B6559ED)
Revision Changes Path
1.2 media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild?r1=1.1&r2=1.2
Index: pulseaudio-5.0-r5.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio-5.0-r5.ebuild 6 Nov 2014 19:22:25 -0000 1.1
+++ pulseaudio-5.0-r5.ebuild 6 Nov 2014 21:32:53 -0000 1.2
@@ -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 @@
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 @@
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 @@
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
}
1.2 media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild?r1=1.1&r2=1.2
Index: pulseaudio-5.0-r4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio-5.0-r4.ebuild 6 Nov 2014 19:22:25 -0000 1.1
+++ pulseaudio-5.0-r4.ebuild 6 Nov 2014 21:32:53 -0000 1.2
@@ -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 @@
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 @@
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 @@
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
}
1.356 media-sound/pulseaudio/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.356&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?rev=1.356&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/pulseaudio/ChangeLog?r1=1.355&r2=1.356
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- ChangeLog 6 Nov 2014 19:22:25 -0000 1.355
+++ ChangeLog 6 Nov 2014 21:32:53 -0000 1.356
@@ -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_) <[email protected]>
+ 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)
