New revision, with optional avahi support (with howl compatibility). Moved ~ppc-macos keyword to this new revision that has dropped the debug useflag and has no more dependency on efence. Also apply patch for bug #111442.

Package-Manager: portage-2.0.53

6 files changed, 178 insertions, 8 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index fe485976e2e9..65428545b0cb 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.8 2005/10/30 17:33:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.9 2005/12/01 20:43:55 flameeyes Exp $
+
+*mt-daapd-0.2.3-r2 (01 Dec 2005)
+
+  01 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mt-daapd-0.2.3-persist-fix.patch, mt-daapd-0.2.3-r1.ebuild,
+  +mt-daapd-0.2.3-r2.ebuild:
+  New revision, with optional avahi support (with howl compatibility). Moved
+  ~ppc-macos keyword to this new revision that has dropped the debug useflag
+  and has no more dependency on efence. Also apply patch for bug #111442.
 
   30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> files/mt-daapd.init.2:
   Don't provide daap to avoid warnings during start/stop of services. mt-daapd
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index e5f2062da327..fb0670fe2991 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ccd559c5c3db699e318634d7fdeab22a ChangeLog 1596
+MD5 1d84e62c6e242c417700c626edcfaeb5 ChangeLog 2010
 MD5 804311ec22b1fba76a61411d0c752a15 files/digest-mt-daapd-0.2.1.1 68
 MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3 66
 MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r1 66
+MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r2 66
+MD5 40d97e03e85d347c0ddf88f5f07d4093 files/mt-daapd-0.2.3-persist-fix.patch 1182
 MD5 b6ec66b0ccfd69869025f1bba1421dd6 files/mt-daapd-0.2.3-pidfile.patch 1918
 MD5 d14aca83cf21b8c519b42962ba276e42 files/mt-daapd.init 540
 MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 880127a188cf908b0ad84221e48eeebf mt-daapd-0.2.1.1.ebuild 1936
-MD5 af17d3795fb915a7ff4df04205183adc mt-daapd-0.2.3-r1.ebuild 2517
+MD5 a378c8396d1caf87b44e661053519830 mt-daapd-0.2.3-r1.ebuild 2509
+MD5 207257ce8015dfb7b5a400ae53982355 mt-daapd-0.2.3-r2.ebuild 3400
 MD5 14f69e3681187656efa996600cdf20d9 mt-daapd-0.2.3.ebuild 1959
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDjsImgIKl8Uu19MoRAq0cAJ9QZpANXaKlVEWVsTwDCS8Z3DdH7ACfTtoG
-l6Go9zJSuRcETyEzAEqokvs=
-=Dmyp
+iD8DBQFDj2ClAiZjviIA2XgRAiTUAJ9tLj6Prt4iqDsaPbRFG1OK2ia/oACcCQFR
+3TIf6/6ZpuPnVFaB3k6ygzc=
+=zp+p
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.2.3-r2 b/media-sound/mt-daapd/files/digest-mt-daapd-0.2.3-r2
new file mode 100644
index 000000000000..b3d3908ff384
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.2.3-r2
@@ -0,0 +1 @@
+MD5 17aa3fa0601cbe172d18f53489141e5a mt-daapd-0.2.3.tar.gz 406035
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-persist-fix.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-persist-fix.patch
new file mode 100644
index 000000000000..c86138891883
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-persist-fix.patch
@@ -0,0 +1,28 @@
+Index: mt-daapd-0.2.3/src/rend-howl.c
+===================================================================
+--- mt-daapd-0.2.3.orig/src/rend-howl.c
++++ mt-daapd-0.2.3/src/rend-howl.c
+@@ -156,8 +156,8 @@ void rend_callback(void) {
+ 					NULL, /* domain */
+ 					NULL, /* host */
+ 					msg.port,
+-					"\034Database ID=beddab1edeadbea7", /* text record */
+-					29, /* text record length */
++					"\011txtvers=1\034Database ID=beddab1edeadbea7", /* text record */
++					39, /* text record length */
+ 					rend_howl_reply,
+ 					NULL,
+ 					&rend_oid)) != SW_OKAY) {
+Index: mt-daapd-0.2.3/src/rend-posix.c
+===================================================================
+--- mt-daapd-0.2.3.orig/src/rend-posix.c
++++ mt-daapd-0.2.3/src/rend-posix.c
+@@ -414,7 +414,7 @@ void rend_callback(void) {
+     switch(msg.cmd) {
+     case REND_MSG_TYPE_REGISTER:
+ 	DPRINTF(E_DBG,L_REND,"Registering %s.%s (%d)\n",msg.name,msg.type,msg.port);
+-	RegisterOneService(msg.name,msg.type,"local.","\034Database ID=beddab1edeadbea7",29,
++	RegisterOneService(msg.name,msg.type,"local.","\011txtvers=1\034Database ID=beddab1edeadbea7",39,
+ 			   msg.port);
+ 	rend_send_response(0); /* success */
+ 	break;
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild
index fe62815d2e6f..f6c8b425bdb9 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild,v 1.2 2005/12/01 09:25:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r1.ebuild,v 1.3 2005/12/01 20:43:55 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sh ~x86"
+KEYWORDS="~amd64 ~ppc ~sh ~x86"
 IUSE="debug howl vorbis"
 
 DEPEND="sys-libs/zlib
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..893e315fd347
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.3-r2.ebuild,v 1.1 2005/12/01 20:43:55 flameeyes Exp $
+
+inherit flag-o-matic eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
+HOMEPAGE="http://www.mt-daapd.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sh ~x86"
+IUSE="howl vorbis avahi"
+
+DEPEND="sys-libs/zlib
+	media-libs/libid3tag
+	sys-libs/gdbm
+	howl? ( !avahi? ( >=net-misc/howl-0.9.2 )
+		avahi? ( net-dns/avahi ) )
+	vorbis? ( media-libs/libvorbis )"
+
+pkg_setup() {
+	if use howl && use avahi && ! built_with_use net-dns/avahi howl-compat; then
+		eerror "You requested avahi support, but this package requires"
+		eerror "the howl-compat support enabled in net-dns/avahi to work"
+		eerror "with it."
+		eerror
+		eerror "Please recompile net-dns/avahi with +howl-compat."
+		die "Missing howl-compat support in avahi."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-pidfile.patch"
+	epatch "${FILESDIR}/${P}-persist-fix.patch"
+}
+
+src_compile() {
+	local myconf=""
+	local howlincludes
+
+	# howl support?
+	if use howl; then
+		use avahi && \
+			howlincludes="/usr/include/avahi-compat-howl" || \
+			howlincludes="/usr/include/howl"
+
+		myconf="${myconf}
+			--enable-howl
+			--with-howl-libs=/usr/$(get_libdir)
+			--with-howl-includes=${howlincludes}"
+	fi
+
+	# Bug 65723
+	if use vorbis; then
+		myconf="${myconf} --enable-oggvorbis"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+
+	cp ${FILESDIR}/${PN}.init.2 ${WORKDIR}/initd
+	if ! use howl; then
+		sed -i -e '/#USEHOWL/d' ${WORKDIR}/initd
+	elif ! use avahi; then
+		sed -i -e 's:#USEHOWL ::' ${WORKDIR}/initd
+	else
+		sed -i -e 's:#USEHOWL ::; s:mDNSResponder:avahi-daemon:' ${WORKDIR}/initd
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /etc
+	newins contrib/mt-daapd.conf mt-daapd.conf.example
+	doins contrib/mt-daapd.playlist
+
+	newinitd ${WORKDIR}/initd ${PN}
+
+	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You have to configure your mt-daapd.conf following"
+	einfo "/etc/mt-daapd.conf.example file."
+	einfo
+
+	if use howl; then
+		use avahi && \
+			howlservice="avahi-daemon" || \
+			howlservice="mDNSResponder"
+
+		einfo
+		einfo "Since you want to use howl instead of the internal mdnsd"
+		einfo "you need to make sure that you have ${howlservice} configured"
+		einfo "and running to use mt-daapd."
+		einfo
+
+		if use avahi; then
+			einfo "Avahi support is currently experimental, it does not work"
+			einfo "as intended when using more than one mt-daapd instance."
+			einfo "If you want to run more than one mt-daapd, just use the"
+			einfo "internal mdnsd by building with -howl flag."
+		fi
+	fi
+
+	if use vorbis; then
+		einfo
+		einfo "You need to edit you extensions list in /etc/mt-daapd.conf"
+		einfo "if you want your mt-daapd to serve ogg files."
+		einfo
+	fi
+
+	einfo
+	einfo "If you want to start more than one ${PN} service, symlink"
+	einfo "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
+	einfo "load the data from /etc/${PN}.d/<name>.conf."
+	einfo "Make sure that you have different cache directories for them."
+	einfo
+}