Remove old versions; add a new revision pair that enables X by default, and make sure it's started even for non-xdg-compliant sessions.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 35 insertions, 183 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 1b29e40d4b25..06385bb47dab 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.172 2009/10/13 17:53:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.173 2009/10/20 13:34:12 flameeyes Exp $
+
+*pulseaudio-0.9.19-r51 (20 Oct 2009)
+*pulseaudio-0.9.19-r1 (20 Oct 2009)
+
+  20 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pulseaudio-0.9.9-r54.ebuild, -pulseaudio-0.9.18.ebuild,
+  -pulseaudio-0.9.18-r50.ebuild, +pulseaudio-0.9.19-r1.ebuild,
+  +pulseaudio-0.9.19-r51.ebuild:
+  Remove old versions; add a new revision pair that enables X by default,
+  and make sure it's started even for non-xdg-compliant sessions.
 
   13 Oct 2009; Raúl Porcel <armin76@gentoo.org>
   pulseaudio-0.9.15-r2.ebuild:
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild
index cd6adc0a5285..e1fda3c039e4 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18.ebuild,v 1.4 2009/10/05 10:31:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r1.ebuild,v 1.1 2009/10/20 13:34:12 flameeyes Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P/_rc/-test}"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	caps? ( sys-libs/libcap )
@@ -81,6 +81,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fweb.patch
+
 	elibtoolize
 }
 
@@ -133,6 +135,14 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
+	if use X; then
+		dodir /etc/X11/xinit/xinitrc.d
+		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
+	else
+		# Drop the script entirely
+		rm "${D}"/usr/bin/start-pulseaudio-x11
+	fi
+
 	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
 
 	if use hal && ! use udev; then
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild
index 2489251af655..ce4117ed51e6 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.18-r50.ebuild,v 1.4 2009/10/05 10:31:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19-r51.ebuild,v 1.1 2009/10/20 13:34:12 flameeyes Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P/_rc/-test}"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
+IUSE="+alsa avahi +caps jack lirc oss tcpd +X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
 	caps? ( sys-libs/libcap )
@@ -88,6 +88,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fweb.patch
+
 	elibtoolize
 }
 
@@ -140,6 +142,14 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
 
+	if use X; then
+		dodir /etc/X11/xinit/xinitrc.d
+		ln -s ../../../usr/bin/start-pulseaudio-x11 "${D}"/etc/X11/xinit/xinitrc.d/95-pulseaudio
+	else
+		# Drop the script entirely
+		rm "${D}"/usr/bin/start-pulseaudio-x11
+	fi
+
 	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
 
 	use_define() {
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild
deleted file mode 100644
index 21b00f6097f7..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.9-r54.ebuild,v 1.4 2009/09/16 20:52:09 scarabeus Exp $
-
-inherit eutils libtool autotools flag-o-matic
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="alsa avahi caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth asyncns"
-
-RDEPEND="X? ( x11-libs/libX11 )
-	caps? ( sys-libs/libcap )
-	>=media-libs/audiofile-0.2.6-r1
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	>=media-libs/libsndfile-1.0.10
-	>=dev-libs/liboil-0.3.6
-	alsa? ( >=media-libs/alsa-lib-1.0.10 )
-	>=dev-libs/glib-2.4.0
-	avahi? ( >=net-dns/avahi-0.6.12 )
-	>=dev-libs/liboil-0.3.0
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	hal? (
-		>=sys-apps/hal-0.5.7
-		>=sys-apps/dbus-1.0.0
-	)
-	app-admin/eselect-esd
-	bluetooth? (
-		>=net-wireless/bluez-libs-3
-		>=sys-apps/dbus-1.0.0
-	)
-	asyncns? ( net-libs/libasyncns )
-	=sys-devel/libtool-1.5*" # it's a valid RDEPEND, libltdl.so is used
-DEPEND="${RDEPEND}
-	dev-libs/libatomic_ops
-	dev-util/pkgconfig"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez-utils dep is for the bluetooth init.d script
-RDEPEND="${RDEPEND}
-	gnome-extra/gnome-audio
-	alsa? ( media-sound/alsa-utils )
-	bluetooth? ( >=net-wireless/bluez-utils-3 )"
-
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi dbus ; then
-		echo
-		eerror "In order to compile pulseaudio with avahi support, you need to have"
-		eerror "net-dns/avahi emerged with 'dbus' in your USE flag. Please add that"
-		eerror "flag, re-emerge avahi, and then emerge pulseaudio again."
-		die "net-dns/avahi is missing the D-Bus bindings."
-	fi
-
-	enewgroup audio 18 # Just make sure it exists
-	enewgroup realtime
-	enewgroup pulse-access
-	enewgroup pulse
-	enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.9.8-svn2074.patch"
-	epatch "${FILESDIR}/${PN}-0.9.8-polkit.patch"
-	epatch "${FILESDIR}/${PN}-0.9.8-bt-nohal.patch"
-	epatch "${FILESDIR}/${PN}-0.9.8-esoundpath.patch"
-	epatch "${FILESDIR}/${PN}-0.9.8-create-directory.patch"
-	epatch "${FILESDIR}/${P}-CVE-2009-1894.patch"
-
-	eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	# To properly fix CVE-2008-0008
-	append-flags -UNDEBUG
-
-	econf \
-		--enable-largefile \
-		--enable-glib2 \
-		--disable-solaris \
-		$(use_enable asyncns) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable tcpd tcpwrap) \
-		$(use_enable jack) \
-		$(use_enable lirc) \
-		$(use_enable avahi) \
-		$(use_enable hal) \
-		$(use_enable dbus) \
-		$(use_enable gnome gconf) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable bluetooth bluez) \
-		--disable-polkit \
-		$(use_with caps) \
-		$(use_with X x) \
-		--disable-ltdl-install \
-		--localstatedir=/var \
-		--with-realtime-group=realtime \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-	local neededservices
-	use alsa && neededservices="$neededservices alsasound"
-	use avahi && neededservices="$neededservices avahi-daemon"
-	use hal && neededservices="$neededservices hald"
-	use bluetooth && neededservices="$neededservices bluetooth"
-	if [[ -n ${neededservices} ]]; then
-		sed -e "s/@neededservices@/need $neededservices/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	else
-		sed -e "/@neededservices@/d" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
-	fi
-	doinitd "${T}/pulseaudio"
-
-	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
-
-	dohtml -r doc
-	dodoc README
-
-	# Create the state directory
-	diropts -o pulse -g pulse -m0755
-	keepdir /var/run/pulse
-}
-
-pkg_postinst() {
-	elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
-	elog "This support is enabled by starting the pulseaudio init.d ."
-	elog "To be able to access that you need to be in the group pulse-access."
-	elog "For more information about system-wide support, please refer to"
-	elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
-	if use gnome; then
-		elog
-		elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-		elog "that you might need to remove the gnome USE flag or disable the"
-		elog "gconf module on /etc/pulse/default.pa to be able to use PulseAudio"
-		elog "with a system-wide instance."
-	fi
-	elog
-	elog "To use the ESounD wrapper while using a system-wide daemon, you also"
-	elog "need to enable auth-anonymous for the esound-unix module, or to copy"
-	elog "/var/run/pulse/.esd_auth into each home directory."
-	elog
-	elog "If you want to make use of realtime capabilities of PulseAudio"
-	elog "you should follow the realtime guide to create and set up a realtime"
-	elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
-	elog "Make sure you also have baselayout installed with pam USE flag"
-	elog "enabled, if you're using the rlimit method."
-	if use bluetooth; then
-		elog
-		elog "The BlueTooth proximity module is not enabled in the default"
-		elog "configuration file. If you do enable it, you'll have to have"
-		elog "your BlueTooth controller enabled and inserted at bootup or"
-		elog "PulseAudio will refuse to start."
-		elog
-		elog "Please note that the BlueTooth proximity module seems itself"
-		elog "still experimental, so please report to upstream if you have"
-		elog "problems with it."
-	fi
-
-	eselect esd update --if-unset
-}