summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-09-28 10:15:17 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-09-28 10:15:17 +0000
commit5170e790c7c14153eab1b803d84bb2ee617419a1 (patch)
treefc14f83b8745e71d1faabf73e46195737ce80632 /media-sound/pulseaudio
parentVersion bumped. This mainly adds frech translations. (diff)
downloadgentoo-2-5170e790c7c14153eab1b803d84bb2ee617419a1.tar.gz
gentoo-2-5170e790c7c14153eab1b803d84bb2ee617419a1.tar.bz2
gentoo-2-5170e790c7c14153eab1b803d84bb2ee617419a1.zip
Fix unifdef call to be [options] file rather than file [options] as documented in the man page and allow freebsd unifdef too.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)
Diffstat (limited to 'media-sound/pulseaudio')
-rw-r--r--media-sound/pulseaudio/ChangeLog7
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.12.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index c52f651cf786..54eae6d53f40 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/pulseaudio
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.110 2008/09/12 15:53:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.111 2008/09/28 10:15:17 aballier Exp $
+
+ 28 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+ pulseaudio-0.9.12.ebuild:
+ Fix unifdef call to be [options] file rather than file [options] as
+ documented in the man page and allow freebsd unifdef too.
*pulseaudio-0.9.12 (12 Sep 2008)
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild
index 5cf314e5eb78..14787edd2e45 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild,v 1.1 2008/09/12 15:53:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.12.ebuild,v 1.2 2008/09/28 10:15:17 aballier Exp $
EAPI=1
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
X? ( x11-proto/xproto )
dev-libs/libatomic_ops
dev-util/pkgconfig
- dev-util/unifdef"
+ || ( dev-util/unifdef sys-freebsd/freebsd-ubin )"
# alsa-utils dep is for the alsasound init.d script (see bug #155707)
# bluez-utils dep is for the bluetooth init.d script
@@ -130,11 +130,11 @@ src_install() {
use "$1" && echo "-D$define" || echo "-U$define"
}
- unifdef "${FILESDIR}/pulseaudio.init.d-4" \
- $(use_define hal) \
+ unifdef $(use_define hal) \
$(use_define avahi) \
$(use_define alsa) \
$(use_define bluetooth) \
+ "${FILESDIR}/pulseaudio.init.d-4" \
> "${T}/pulseaudio"
doinitd "${T}/pulseaudio"