Add new revision to make use of esound-esd (for pulseaudio).

Package-Manager: portage-2.1.1_pre3-r1

7 files changed, 154 insertions, 21 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 9d95888145d4..b0d52ee78503 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.69 2006/07/17 18:33:49 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.70 2006/07/19 00:02:27 flameeyes Exp $
+
+*esound-0.2.36-r2 (19 Jul 2006)
+
+  19 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +files/esound.init.d.2,
+  esound-0.2.34.ebuild, esound-0.2.36-r1.ebuild, +esound-0.2.36-r2.ebuild:
+  Add new revision to make use of esound-esd (for pulseaudio).
 
   17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
   Marked stable on amd64 for bug #139612
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index 2b5f579db7c0..9ff2c1ab6457 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -25,20 +25,28 @@ AUX esound.init.d 862 RMD160 ef1ffe7574ce07aee165d9e6ebb14521ea4e5c49 SHA1 86cac
 MD5 0af490e6c9b79db177214d01027e800e files/esound.init.d 862
 RMD160 ef1ffe7574ce07aee165d9e6ebb14521ea4e5c49 files/esound.init.d 862
 SHA256 0ff0aed0667c132cc9e46e77003b698c451cdd1d57f545a495ce4d20b84f792a files/esound.init.d 862
+AUX esound.init.d.2 988 RMD160 af58377babe1681ae80bf8b3e85bc084360da215 SHA1 97d25ab612ff5c2375bc81febe6c13a106115fd0 SHA256 9b568155e4dc9f7be013bb71a6990eca3d2c6a6dff7600f5c18f9cfc92f7ac89
+MD5 5cdfe4c743e91867fc96ecf5df1b263b files/esound.init.d.2 988
+RMD160 af58377babe1681ae80bf8b3e85bc084360da215 files/esound.init.d.2 988
+SHA256 9b568155e4dc9f7be013bb71a6990eca3d2c6a6dff7600f5c18f9cfc92f7ac89 files/esound.init.d.2 988
 DIST esound-0.2.34.tar.bz2 318353
 DIST esound-0.2.36.tar.bz2 369952 RMD160 1a6d4a1f31311e6265324fb1a392f9b0491cf1f9 SHA1 66f451ff5a6b9cae8d49b196a536cf49f3f1755c SHA256 68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76
-EBUILD esound-0.2.34.ebuild 1369 RMD160 38536cdb5197e025a832311c0bc97afe7ba6de2b SHA1 623382488d72db75e2c34c00afbd4e9227355eb8 SHA256 36cf1f0f0aee9fc64ff348b44cefa408b73884e89ab3910275e949d3f28322b0
-MD5 ae22795b520c0e4e7dece068198d0f00 esound-0.2.34.ebuild 1369
-RMD160 38536cdb5197e025a832311c0bc97afe7ba6de2b esound-0.2.34.ebuild 1369
-SHA256 36cf1f0f0aee9fc64ff348b44cefa408b73884e89ab3910275e949d3f28322b0 esound-0.2.34.ebuild 1369
-EBUILD esound-0.2.36-r1.ebuild 1815 RMD160 eeafd6fe1860075f1ad15f82d493c699007c6c80 SHA1 ea99d8f938f0f6d1b6b63bc99b747eb423c68f0e SHA256 c6c04c98559bb479c4f6b5490b49ec89f8f0e46b9a5904e386706d60c8bc3ebb
-MD5 0331e61152056ac54485a877ff49ec73 esound-0.2.36-r1.ebuild 1815
-RMD160 eeafd6fe1860075f1ad15f82d493c699007c6c80 esound-0.2.36-r1.ebuild 1815
-SHA256 c6c04c98559bb479c4f6b5490b49ec89f8f0e46b9a5904e386706d60c8bc3ebb esound-0.2.36-r1.ebuild 1815
-MISC ChangeLog 8885 RMD160 8976f48ad00798a902b0c33e09aa3f1d6aa7a5f6 SHA1 592f4b3ee059444b4947263e677a1ceb00052752 SHA256 05dd25d60ab7d2af44c27b0ba2acbeb297e32a702af7dec4a430010111055232
-MD5 47f32645ad5a33acffc572589a020986 ChangeLog 8885
-RMD160 8976f48ad00798a902b0c33e09aa3f1d6aa7a5f6 ChangeLog 8885
-SHA256 05dd25d60ab7d2af44c27b0ba2acbeb297e32a702af7dec4a430010111055232 ChangeLog 8885
+EBUILD esound-0.2.34.ebuild 1416 RMD160 ee1325a109ef9db8250a86a47b7da21a25be0e44 SHA1 4b67c0fc6aaffcf60cc0d4b4d2ebca0e4afd2e0f SHA256 35a1b0c9d5c46cd319a4e5af3e5f85c74b2421ccd52e3a160ade4770ac503ad8
+MD5 7ce7f9592ea8f114d2a26459eb671fed esound-0.2.34.ebuild 1416
+RMD160 ee1325a109ef9db8250a86a47b7da21a25be0e44 esound-0.2.34.ebuild 1416
+SHA256 35a1b0c9d5c46cd319a4e5af3e5f85c74b2421ccd52e3a160ade4770ac503ad8 esound-0.2.34.ebuild 1416
+EBUILD esound-0.2.36-r1.ebuild 1860 RMD160 08bc94dc8ee547dba098605da27dc260e9bcedc1 SHA1 dd42c344b3c35d250cd2a975a3258cad7ddc2c27 SHA256 7e4684bdbf971537189fd71c73cdf05cde49d97fe3fe0a0cda0120cce65578c6
+MD5 0066d908cbf0c298ac8ef3a005010442 esound-0.2.36-r1.ebuild 1860
+RMD160 08bc94dc8ee547dba098605da27dc260e9bcedc1 esound-0.2.36-r1.ebuild 1860
+SHA256 7e4684bdbf971537189fd71c73cdf05cde49d97fe3fe0a0cda0120cce65578c6 esound-0.2.36-r1.ebuild 1860
+EBUILD esound-0.2.36-r2.ebuild 1965 RMD160 7f07a538ffba416f5a9208abd1b3700653e0fc83 SHA1 c99a3a967bfbace7d7e4df8dacc7b259dc90b794 SHA256 2be9dfbfdb4e7691af0cacb9cda217f89f09708497d889e7cffd4ba2585ed25a
+MD5 40b849fd94c49feb330041db102e2a38 esound-0.2.36-r2.ebuild 1965
+RMD160 7f07a538ffba416f5a9208abd1b3700653e0fc83 esound-0.2.36-r2.ebuild 1965
+SHA256 2be9dfbfdb4e7691af0cacb9cda217f89f09708497d889e7cffd4ba2585ed25a esound-0.2.36-r2.ebuild 1965
+MISC ChangeLog 9139 RMD160 3db83d4dc33e91a15d46ee4610663dc087af0f57 SHA1 dbdf6c4c3f14666e01cdee844dd39e359b157e3e SHA256 616c6c5e3f91217e5eae937ec2ab631a96b49839bc37e91b20899a2822e326dc
+MD5 f350eacd4f856efb018223e87ce114b7 ChangeLog 9139
+RMD160 3db83d4dc33e91a15d46ee4610663dc087af0f57 ChangeLog 9139
+SHA256 616c6c5e3f91217e5eae937ec2ab631a96b49839bc37e91b20899a2822e326dc ChangeLog 9139
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
@@ -49,10 +57,13 @@ SHA256 9a13be6f0011a5c456db237d08435e5016467134e733a3acdfc0e36fd5132c6f files/di
 MD5 c66f1145b5ad855011d64cc0a4c981e1 files/digest-esound-0.2.36-r1 244
 RMD160 b7bc1d028470b463042a4ae50b4ca01e2eb662ad files/digest-esound-0.2.36-r1 244
 SHA256 16ece8103a44cee10de1d41a141f1977347b58400ae28d017bd88f6f7e529c86 files/digest-esound-0.2.36-r1 244
+MD5 c66f1145b5ad855011d64cc0a4c981e1 files/digest-esound-0.2.36-r2 244
+RMD160 b7bc1d028470b463042a4ae50b4ca01e2eb662ad files/digest-esound-0.2.36-r2 244
+SHA256 16ece8103a44cee10de1d41a141f1977347b58400ae28d017bd88f6f7e529c86 files/digest-esound-0.2.36-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEu9f9omPajV0RnrERAkDtAJ9v29zFG9zpSPFebobOiU74qEnVuACghAoL
-lIedtEz01g/8+gGoRnN4Z6o=
-=7dUf
+iD8DBQFEvXaaAiZjviIA2XgRAnlGAKCreoBjYDk7sHAb3fdQdZWdYVieCQCaAtGC
+PD5p5eaypOClHdBVn0sBjfM=
+=y/AE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/esound/esound-0.2.34.ebuild b/media-sound/esound/esound-0.2.34.ebuild
index 11caa4eced56..efccccff46b7 100644
--- a/media-sound/esound/esound-0.2.34.ebuild
+++ b/media-sound/esound/esound-0.2.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.34.ebuild,v 1.15 2005/12/31 11:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.34.ebuild,v 1.16 2006/07/19 00:02:27 flameeyes Exp $
 
 inherit libtool gnome.org eutils
 
@@ -15,6 +15,8 @@ IUSE="tcpd alsa ipv6"
 DEPEND=">=media-libs/audiofile-0.1.5
 	alsa? ( >=media-libs/alsa-lib-0.5.10b )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+RDEPEND="${DEPEND}
+	!app-admin/eselect-esd"
 
 src_unpack() {
 
diff --git a/media-sound/esound/esound-0.2.36-r1.ebuild b/media-sound/esound/esound-0.2.36-r1.ebuild
index 91071f6a2c9d..ffd09f829106 100644
--- a/media-sound/esound/esound-0.2.36-r1.ebuild
+++ b/media-sound/esound/esound-0.2.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.17 2006/05/20 00:30:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.18 2006/07/19 00:02:27 flameeyes Exp $
 
 inherit libtool gnome.org eutils autotools
 
@@ -19,6 +19,9 @@ DEPEND=">=media-libs/audiofile-0.1.5
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
 #	arts? ( kde-base/arts )
 
+RDEPEND="${DEPEND}
+	!app-admin/eselect-esd"
+
 src_unpack() {
 
 	unpack ${A}
@@ -49,7 +52,7 @@ src_compile() {
 
 src_install() {
 
-	make DESTDIR="${D}" install  || die "Installation failed"
+	make DESTDIR="${D}" install	 || die "Installation failed"
 
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TIPS TODO
 
diff --git a/media-sound/esound/esound-0.2.36-r2.ebuild b/media-sound/esound/esound-0.2.36-r2.ebuild
new file mode 100644
index 000000000000..4c9b0f308bdc
--- /dev/null
+++ b/media-sound/esound/esound-0.2.36-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r2.ebuild,v 1.1 2006/07/19 00:02:27 flameeyes Exp $
+
+inherit libtool gnome.org eutils autotools flag-o-matic
+
+DESCRIPTION="The Enlightened Sound Daemon"
+HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa debug ipv6 tcpd"
+
+# esound comes with arts support, but it hasn't been tested yet, feel free to
+# submit patches/improvements
+DEPEND=">=media-libs/audiofile-0.1.5
+	alsa? ( >=media-libs/alsa-lib-0.5.10b )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+#	arts? ( kde-base/arts )
+
+RDEPEND="${DEPEND}
+	app-admin/eselect-esd"
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.2.32-amd64.patch"
+	# please note, this is a conditional, version specific patch!!!
+	# when bumping avoid bugs like #103969
+	use ppc-macos && epatch "${FILESDIR}/${P}-ppc-macos.patch"
+
+	epatch "${FILESDIR}/${P}-mode_t.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	eautomake
+
+	elibtoolize
+}
+
+src_compile() {
+	# Strict aliasing problem
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--sysconfdir=/etc/esd \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_enable alsa) \
+		$(use_with tcpd libwrap) \
+		--disable-dependency-tracking \
+		|| die "Configure failed"
+
+	emake || die "Make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install  || die "Installation failed"
+	mv "${D}/usr/bin/"{esd,esound-esd}
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TIPS TODO
+
+	[[ -d "docs/html" ]] && dohtml -r docs/html/*
+
+	newconfd "${FILESDIR}/esound.conf.d" esound
+
+	extradepend=""
+	use tcpd && extradepend=" portmap"
+	use alsa && extradepend="$extradepend alsasound"
+	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/esound.init.d.2" >"${T}/esound"
+	doinitd "${T}/esound"
+}
+
+pkg_postinst() {
+	eselect esd update --if-unset
+}
diff --git a/media-sound/esound/files/digest-esound-0.2.36-r2 b/media-sound/esound/files/digest-esound-0.2.36-r2
new file mode 100644
index 000000000000..9ec79c050716
--- /dev/null
+++ b/media-sound/esound/files/digest-esound-0.2.36-r2
@@ -0,0 +1,3 @@
+MD5 3facb5aa0115cc1c31771b9ad454ae76 esound-0.2.36.tar.bz2 369952
+RMD160 1a6d4a1f31311e6265324fb1a392f9b0491cf1f9 esound-0.2.36.tar.bz2 369952
+SHA256 68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76 esound-0.2.36.tar.bz2 369952
diff --git a/media-sound/esound/files/esound.init.d.2 b/media-sound/esound/files/esound.init.d.2
new file mode 100644
index 000000000000..bda0cffbbe9f
--- /dev/null
+++ b/media-sound/esound/files/esound.init.d.2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/files/esound.init.d.2,v 1.1 2006/07/19 00:02:27 flameeyes Exp $
+
+# Note: You need to start esound on boot, only if you want to use it over network.
+
+# Warning: To use global esound daemon, you must also set spawn_options
+# in /etc/esd/esd.conf to the same protocol (i. e. add "-tcp") and unset
+# "Enable sound server startup" in gnome-sound-properties for all users
+# and optionally handle authentization.
+
+# The name sound-esd is needed because /usr/bin/esd might simply be a symlink
+# to PulseAudio's esd wrapper
+
+depend() {
+	use net@extradepend@
+}
+
+start() {
+	ebegin "Starting esound"
+	start-stop-daemon --start --quiet --background --exec /usr/bin/esound-esd -- $ESD_START $ESD_OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping esound"
+	start-stop-daemon --stop --quiet --exec /usr/bin/esound-esd
+	eend $?
+}