media-sound/esound: patch fixes messy html documentation installation (bugs #154902 and #191306)

Package-Manager: portage-2.1.3.8

5 files changed, 124 insertions, 5 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 6680f9975d1c..9d8acc95183a 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.103 2007/08/28 17:47:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.104 2007/09/09 08:22:34 remi Exp $
+
+*esound-0.2.38-r1 (09 Sep 2007)
+
+  09 Sep 2007; Rémi Cardona <remi@gentoo.org>
+  +files/esound-0.2.38-doc.patch, +esound-0.2.38-r1.ebuild:
+  patch fixes messy html documentation installation (bugs #154902 and #191306)
 
   28 Aug 2007; Jeroen Roovers <jer@gentoo.org> esound-0.2.38.ebuild:
   Stable for HPPA (bug #185823).
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index c94b020d6aee..726436441e12 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -22,6 +22,10 @@ AUX esound-0.2.38-as-needed.patch 496 RMD160 4646e35ed1240a65ea83c1a3d3f74e8c713
 MD5 222741231337cc7bb477542e24473446 files/esound-0.2.38-as-needed.patch 496
 RMD160 4646e35ed1240a65ea83c1a3d3f74e8c713b9430 files/esound-0.2.38-as-needed.patch 496
 SHA256 e9a2241de5d829ae0dfafee2fef9f7b7910de06340b0eb6dc0265f686ab7754b files/esound-0.2.38-as-needed.patch 496
+AUX esound-0.2.38-doc.patch 573 RMD160 4d7e957cb52af939be7691f9599cd00712f9e951 SHA1 7549c542f97b2188aee6a57283b7f75436df03be SHA256 02ce40da43debead987a44ff895b5a32a000599cbe07b97b8b17515e810190f0
+MD5 1dbb713022918f512288990fcd477ace files/esound-0.2.38-doc.patch 573
+RMD160 4d7e957cb52af939be7691f9599cd00712f9e951 files/esound-0.2.38-doc.patch 573
+SHA256 02ce40da43debead987a44ff895b5a32a000599cbe07b97b8b17515e810190f0 files/esound-0.2.38-doc.patch 573
 AUX esound.conf.d 737 RMD160 a8c11bc892cf58b2ae99a4898c3adc50c483087d SHA1 e4ee0fb3eb877afb29bcb99eeac7503eb8631ef1 SHA256 cbdec56c59d79c438606eda307ba5a25f35d1f51d0c5caed09057aba99a81fab
 MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
 RMD160 a8c11bc892cf58b2ae99a4898c3adc50c483087d files/esound.conf.d 737
@@ -53,14 +57,18 @@ EBUILD esound-0.2.37.ebuild 1998 RMD160 a5326e9557594b7c38cd1548989885aaf51cf4ae
 MD5 50fa8633a2ff19eca1cfcb2c8304f181 esound-0.2.37.ebuild 1998
 RMD160 a5326e9557594b7c38cd1548989885aaf51cf4ae esound-0.2.37.ebuild 1998
 SHA256 6c2632b5e239df179670a89abf408ce51980893b5c73f9d2be2fb05d0c5dac28 esound-0.2.37.ebuild 1998
+EBUILD esound-0.2.38-r1.ebuild 2051 RMD160 6afb9033d06b8aa96bca9f2e1db5a6cb6d25719d SHA1 d7751d01b37775b21556de7ea2a12c3e251ea9f3 SHA256 859f60ff30789253fc52e8d436fb1241b83cd257bacb8550596f5aac1ccd8f28
+MD5 e33d7bede21c4c183b81378d94ab5d2d esound-0.2.38-r1.ebuild 2051
+RMD160 6afb9033d06b8aa96bca9f2e1db5a6cb6d25719d esound-0.2.38-r1.ebuild 2051
+SHA256 859f60ff30789253fc52e8d436fb1241b83cd257bacb8550596f5aac1ccd8f28 esound-0.2.38-r1.ebuild 2051
 EBUILD esound-0.2.38.ebuild 1958 RMD160 37cd16a44e885c0fcaf3c3dd451f8ff4b7195fe5 SHA1 410d8b05a58cb502a906777ae1caf58a7b552239 SHA256 b475ede9aca48021f25c57798c427de4a65739f701b05f0a4a4603619ca6caef
 MD5 a1a448ce22de61f57abebcea2650b21f esound-0.2.38.ebuild 1958
 RMD160 37cd16a44e885c0fcaf3c3dd451f8ff4b7195fe5 esound-0.2.38.ebuild 1958
 SHA256 b475ede9aca48021f25c57798c427de4a65739f701b05f0a4a4603619ca6caef esound-0.2.38.ebuild 1958
-MISC ChangeLog 13960 RMD160 d1ffd990287c7673c6568b050a35137c21e5f8e6 SHA1 cb498fc684bb3bc27d81e2606d5cd22eb4800224 SHA256 d3252f6a41c397aa00c84a69e8ef59bc99336abf5d4a288ed11cbdb2348c5068
-MD5 220243bf0b548cff407ed9a37311ef6f ChangeLog 13960
-RMD160 d1ffd990287c7673c6568b050a35137c21e5f8e6 ChangeLog 13960
-SHA256 d3252f6a41c397aa00c84a69e8ef59bc99336abf5d4a288ed11cbdb2348c5068 ChangeLog 13960
+MISC ChangeLog 14181 RMD160 f8d4f6ac57ba3a7f572380510fbd9ac6eec5a897 SHA1 bc764d1b21814a2647f260d5a85ae6ddc14ee02e SHA256 dd9e50ccd45301c3fae9a645b8c80b901f2333388901c68f715922ad294f4893
+MD5 85f058cd2ea10d867849e0738f8766d7 ChangeLog 14181
+RMD160 f8d4f6ac57ba3a7f572380510fbd9ac6eec5a897 ChangeLog 14181
+SHA256 dd9e50ccd45301c3fae9a645b8c80b901f2333388901c68f715922ad294f4893 ChangeLog 14181
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
@@ -80,3 +88,6 @@ SHA256 72b8cd9f0d4ee6501c2c4671c0e6745af03cc90be5751823dca63fc5af3b15d1 files/di
 MD5 3938dfcff224ad2295a45a8eb13c4a48 files/digest-esound-0.2.38 244
 RMD160 56c7615051fe4dd387048b9277f405f00e0296a7 files/digest-esound-0.2.38 244
 SHA256 030003960c0078d5ce530abc8511004f379bd2d16ab0d7bf1795946420476e94 files/digest-esound-0.2.38 244
+MD5 3938dfcff224ad2295a45a8eb13c4a48 files/digest-esound-0.2.38-r1 244
+RMD160 56c7615051fe4dd387048b9277f405f00e0296a7 files/digest-esound-0.2.38-r1 244
+SHA256 030003960c0078d5ce530abc8511004f379bd2d16ab0d7bf1795946420476e94 files/digest-esound-0.2.38-r1 244
diff --git a/media-sound/esound/esound-0.2.38-r1.ebuild b/media-sound/esound/esound-0.2.38-r1.ebuild
new file mode 100644
index 000000000000..b91e9c1969c8
--- /dev/null
+++ b/media-sound/esound/esound-0.2.38-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.38-r1.ebuild,v 1.1 2007/09/09 08:22:34 remi Exp $
+
+WANT_AUTOMAKE=1.10
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug doc 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 )
+	doc?  ( app-text/docbook-sgml-utils )
+	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"
+
+	epatch "${FILESDIR}/${PN}-0.2.36-mode_t.patch"
+	epatch "${FILESDIR}/${PN}-0.2.38-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-0.2.38-doc.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	# Strict aliasing problem
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--sysconfdir=/etc/esd \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(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 -j1 DESTDIR="${D}" install  || die "Installation failed"
+	mv "${D}/usr/bin/"{esd,esound-esd}
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README TIPS TODO
+
+	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 \
+		|| die "eselect failed, try removing /usr/bin/esd and re-emerging."
+}
diff --git a/media-sound/esound/files/digest-esound-0.2.38-r1 b/media-sound/esound/files/digest-esound-0.2.38-r1
new file mode 100644
index 000000000000..9e67ac80cc9d
--- /dev/null
+++ b/media-sound/esound/files/digest-esound-0.2.38-r1
@@ -0,0 +1,3 @@
+MD5 1c48c100b450d617b58dacb59837d34f esound-0.2.38.tar.bz2 393758
+RMD160 d12605bcd24b697a5525b0e266d2bbca43edea32 esound-0.2.38.tar.bz2 393758
+SHA256 08ea208cb3948650250bb068de5c75b877e78902d679e8af5d0a14062c939b37 esound-0.2.38.tar.bz2 393758
diff --git a/media-sound/esound/files/esound-0.2.38-doc.patch b/media-sound/esound/files/esound-0.2.38-doc.patch
new file mode 100644
index 000000000000..a873b90b664f
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.38-doc.patch
@@ -0,0 +1,23 @@
+--- configure.ac.old	2007-09-09 09:28:00.000000000 +0200
++++ configure.ac	2007-09-09 09:28:12.000000000 +0200
+@@ -25,9 +25,6 @@
+ AC_SUBST(ESD_VERSION)
+ AC_SUBST(ESD_VERSION_INFO)
+ 
+-pkgdocdir="\$(datadir)/doc/esound"
+-AC_SUBST(pkgdocdir)
+-
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_LIBTOOL_WIN32_DLL
+--- docs/Makefile.am.old	2007-09-09 09:37:28.000000000 +0200
++++ docs/Makefile.am	2007-09-09 09:38:59.000000000 +0200
+@@ -14,8 +14,6 @@
+ 
+ CLEANFILES = esound.dvi esound.ps esound.tex esound.aux esound.log
+ 
+-htmldir=$(pkgdocdir)/html
+-
+ if HAVE_JW
+ noinst_DATA = html/index.html
+ else