Version bump dropping howl support.

(Portage version: 2.1.3.16)

7 files changed, 287 insertions, 147 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index 2bedef9492dc..09126017725d 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.51 2007/08/04 21:09:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.52 2007/10/28 22:13:40 drac Exp $
+
+*mt-daapd-0.2.4.1 (28 Oct 2007)
+
+  28 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  +files/mt-daapd-0.2.4.1-libsorder.patch,
+  +files/mt-daapd-0.2.4.1-pidfile.patch, +mt-daapd-0.2.4.1.ebuild:
+  Version bump dropping howl support.
 
 *mt-daapd-0.3.0_pre1586 (04 Aug 2007)
 
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1 b/media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1
new file mode 100644
index 000000000000..c5f66f791f93
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1
@@ -0,0 +1,3 @@
+MD5 8117141e8a88bfab54fe98b6bbd5cb3a mt-daapd-0.2.4.1.tar.gz 433226
+RMD160 c4e352c610040a99a713b220e234de32f218beb9 mt-daapd-0.2.4.1.tar.gz 433226
+SHA256 bf11f272014835b0771b1788fc7e4362c478ef3fe5ce7d945fa31480ed5f3e86 mt-daapd-0.2.4.1.tar.gz 433226
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1376 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1376
deleted file mode 100644
index 9f7648385970..000000000000
--- a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1376
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1c552fbc0822f943fd00abd46739193f mt-daapd-svn-1376.tar.gz 1126565
-RMD160 099508951f2fa089661c2f94893651c68e464c85 mt-daapd-svn-1376.tar.gz 1126565
-SHA256 671eb19019586d6a348a67bf1c839377356d2460672274ebaae96ac447f55ee4 mt-daapd-svn-1376.tar.gz 1126565
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
new file mode 100644
index 000000000000..a4c5a176ada4
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
@@ -0,0 +1,140 @@
+diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
+--- mt-daapd-0.2.4.1.orig/configure.in	2007-10-22 02:50:24.000000000 +0300
++++ mt-daapd-0.2.4.1/configure.in	2007-10-28 23:31:43.000000000 +0200
+@@ -20,8 +20,9 @@
+ CPPFLAGS="${CPPFLAGS} -g"
+ 
+ dnl fix freebsd's broken (?) libpthread
+-AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
+-  AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
++AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
++  AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
++AC_SUBST(THREAD_LIBS)
+ 
+ AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
+ 		       CPPFLAGS="${CPPFLAGS} -Wall")
+@@ -35,26 +36,29 @@
+ 		      esac ])
+ 
+ AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
+-			LDFLAGS="${LDFLAGS} -lefence")
++			EFENCE_LIBS="-lefence")
++AC_SUBST(EFENCE_LIBS)
+ AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng], 
+ 		       CFLAGS="${CFLAGS} -DNSLU2")
+ 
+ AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
+ 		      [ case "${enableval}" in
+-                        yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
++                        yes) rend_howl=true; rend_posix=false; rend_avahi=false; HOWL_LIBS="-lhowl";
+ 			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
+ 		        no)  rend_howl=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
+ 		      esac ])
++AC_SUBST(HOWL_LIBS)
+ 
+ AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
+ 		      [ case "${enableval}" in
+                         yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
+-			rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
++			rend_avahi=true; rend_howl=false; rend_posix=false;
+ 			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
+ 		        no)  rend_avahi=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
+ 		      esac ])
++AC_SUBST(AVAHI_LIBS)
+ 
+ AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
+                            use_oggvorbis=true;
+@@ -82,7 +86,7 @@
+ 	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
+ 	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+-	LDFLAGS="$LDFLAGS -lnsl -lsocket";;	
++	EXTRA_LIBS="$EXTRA_LIBS -lnsl -lsocket";;
+ *freebsd*)
+ 	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
+ *linux*)
+@@ -98,6 +102,8 @@
+ 	AM_CONDITIONAL(COND_REND_POSIX,false);;
+ esac
+ 
++AC_SUBST(EXTRA_LIBS)
++
+ dnl Checks for libraries.
+ AC_ARG_WITH(static-libs,
+ 	[--with-static-libs[[=DIR]]            use static libs in DIR],[
+@@ -154,12 +160,13 @@
+ AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
++  GDBM_LIBS="${STATIC_LIBS}/libgdbm.a"
+   echo "Adding static libgdbm"
+ else
+-  LDFLAGS="${LDFLAGS} -lgdbm"
++  GDBM_LIBS="-lgdbm"
+   echo "Adding dynamic libgdbm"
+ fi
++AC_SUBST(GDBM_LIBS)
+ 
+ AC_CHECK_HEADERS(id3tag.h,, [
+  AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])])
+@@ -170,12 +177,14 @@
+ AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
++  ID3_LIBS="${STATIC_LIBS}/libid3tag.a -lz"
+   echo "Adding static libid3tag"
+ else
+-  LDFLAGS="${LDFLAGS} -lid3tag -lz"
++  ID3_LIBS="-lid3tag -lz"
+   echo "Adding dynamic libid3tag"
+ fi
++AC_SUBST([ID3_LIBS])
++
+ CFLAGS=$oldcflags
+ 
+ if test x$use_oggvorbis = xtrue; then
+@@ -184,22 +193,23 @@
+   AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
++    OGG_LIBS="${STATIC_LIBS}/libogg.a"
+     echo "Adding static libogg"
+   else
+-    LDFLAGS="${LDFLAGS} -logg"
++    OGG_LIBS="-logg"
+     echo "Adding dynamic libogg"
+   fi
++  AC_SUBST(OGG_LIBS)
+ 
+   AC_CHECK_HEADERS(vorbis/codec.h,, [
+    AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])])
+   AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
++    OGG_LIBS="${OGG_LIBS} ${STATIC_LIBS}/libvorbis.a"
+     echo "Adding static libvorbis"
+   else
+-    LDFLAGS="${LDFLAGS} -lvorbis"
++    OGG_LIBS="${OGG_LIBS} -lvorbis"
+     echo "Adding dynamic libvorbis"
+   fi
+ fi
+diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
+--- mt-daapd-0.2.4.1.orig/src/Makefile.am	2007-10-22 03:32:27.000000000 +0300
++++ mt-daapd-0.2.4.1/src/Makefile.am	2007-10-28 23:31:33.000000000 +0200
+@@ -34,6 +34,9 @@
+ 	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
+ 	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)
+ 
++mt_daapd_LDADD = $(GDBM_LIBS) $(ID3_LIBS) $(OGG_LIBS) $(THREAD_LIBS) \
++	$(EFENCE_LIBS) $(HOWL_LIBS) $(AVAHI_LIBS) $(EXTRA_LIBS)
++
+ EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
+ 	mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
+ 	rend-howl.c rend-posix.c rend-osx.c db-memory.c \
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
new file mode 100644
index 000000000000..5976316e5bf2
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
@@ -0,0 +1,50 @@
+diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
+--- mt-daapd-0.2.4.1.orig/src/main.c	2007-10-22 02:27:57.000000000 +0300
++++ mt-daapd-0.2.4.1/src/main.c	2007-10-28 23:54:29.000000000 +0200
+@@ -551,6 +551,7 @@
+     printf("  -m             Disable mDNS\n");
+     printf("  -c <file>      Use configfile specified\n");
+     printf("  -p             Parse playlist file\n");
++    printf("  -P <file>      Write the PID to specified file\n");
+     printf("  -f             Run in foreground\n");
+     printf("  -y             Yes, go ahead and run as non-root user\n");
+     printf("\n\n");
+@@ -708,6 +709,7 @@
+ int main(int argc, char *argv[]) {
+     int option;
+     char *configfile=DEFAULT_CONFIGFILE;
++    char *pidfile=PIDFILE;
+     WSCONFIG ws_config;
+     WSHANDLE server;
+     int parseonly=0;
+@@ -726,7 +728,7 @@
+     config.use_mdns=1;
+     err_debuglevel=1;
+ 
+-    while((option=getopt(argc,argv,"D:d:c:mpfry")) != -1) {
++    while((option=getopt(argc,argv,"D:d:c:mpP:fry")) != -1) {
+         switch(option) {
+         case 'd':
+             err_debuglevel=atoi(optarg);
+@@ -754,6 +756,10 @@
+             foreground=1;
+             break;
+ 
++        case 'P':
++            pidfile=optarg;
++            break;
++
+         case 'r':
+             reload=1;
+             break;
+@@ -803,8 +809,8 @@
+ 
+     /* open the pidfile, so it can be written once we detach */
+     if((!foreground) && (!force_non_root)) {
+-        if(-1 == (pid_fd = open(PIDFILE,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
+-            DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",PIDFILE,strerror(errno));
++        if(-1 == (pid_fd = open(pidfile,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
++            DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",pidfile,strerror(errno));
+ 
+         if(0 == (pid_fp = fdopen(pid_fd, "w")))
+             DPRINTF(E_FATAL,L_MAIN,"fdopen: %s\n",strerror(errno));
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.1.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.1.ebuild
new file mode 100644
index 000000000000..7c6d05b1e0fc
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 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.4.1.ebuild,v 1.1 2007/10/28 22:13:40 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
+HOMEPAGE="http://www.mt-daapd.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sh ~sparc ~x86"
+IUSE="avahi vorbis"
+
+DEPEND="media-libs/libid3tag
+	sys-libs/gdbm
+	avahi? ( net-dns/avahi )
+	!avahi? ( net-misc/mDNSResponder )
+	vorbis? ( media-libs/libvorbis )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch
+	epatch "${FILESDIR}"/${P}-libsorder.patch
+	epatch "${FILESDIR}"/${P}-pidfile.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/${PN}.init.2 initd
+
+	if use avahi; then
+		sed -i -e 's:#USEHOWL need mDNSResponder:need avahi-daemon:' initd
+	else
+		sed -i -e 's:#USEHOWL ::' initd
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	if use avahi; then
+		myconf="--enable-avahi --disable-mdns"
+	else
+		myconf="--disable-avahi --enable-mdns"
+	fi
+
+	econf $(use_enable vorbis oggvorbis) \
+		${myconf}
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	insinto /etc
+	newins contrib/mt-daapd.conf mt-daapd.conf.example
+	doins contrib/mt-daapd.playlist
+
+	newinitd initd ${PN}
+
+	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
+	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
+}
+
+pkg_postinst() {
+	einfo
+	elog "You have to configure your mt-daapd.conf following"
+	elog "/etc/mt-daapd.conf.example file."
+	einfo
+
+	if use vorbis; then
+		einfo
+		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
+		elog "if you want your mt-daapd to serve ogg files."
+		einfo
+	fi
+
+	einfo
+	elog "If you want to start more than one ${PN} service, symlink"
+	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from /etc/${PN}.d/<name>.conf."
+	elog "Make sure that you have different cache directories for them."
+	einfo
+}
diff --git a/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild
deleted file mode 100644
index 4f4d65057c07..000000000000
--- a/media-sound/mt-daapd/mt-daapd-0.3.0_pre1376.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2007 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.3.0_pre1376.ebuild,v 1.3 2007/02/17 01:02:34 flameeyes Exp $
-
-inherit eutils flag-o-matic base
-
-SVN="${PV#*pre}"
-
-if [[ -n ${SVN} ]] ; then
-	MY_P="${PN}-svn-${SVN}"
-	SRC_URI="http://nightlies.mt-daapd.org/${MY_P}.tar.gz"
-else
-	MY_P="${P/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
-HOMEPAGE="http://www.mt-daapd.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sh ~sparc ~x86"
-IUSE="howl vorbis avahi sqlite3 flac ffmpeg"
-
-DEPEND="sys-libs/zlib
-	media-libs/libid3tag
-	!sqlite3? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	howl? ( !avahi? ( >=net-misc/howl-0.9.2 )
-		avahi? ( net-dns/avahi ) )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )
-	ffmpeg? ( media-video/ffmpeg )"
-
-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_compile() {
-	local myconf=""
-	local howlincludes
-
-	append-flags -fno-strict-aliasing
-
-	# 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 \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable flac) \
-		$(use_enable !sqlite3 sqlite) \
-		$(use_enable sqlite3) \
-		$(use_enable ffmpeg) \
-		--with-ffmpeg-includes=/usr/include/ffmpeg \
-		${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 ${FILESDIR}/mt-daapd.conf.example 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
-	elog "You have to configure your mt-daapd.conf following"
-	elog "/etc/mt-daapd.conf.example file."
-	einfo
-
-	if use howl; then
-		use avahi && \
-			howlservice="avahi-daemon" || \
-			howlservice="mDNSResponder"
-
-		einfo
-		elog "Since you want to use howl instead of the internal mdnsd"
-		elog "you need to make sure that you have ${howlservice} configured"
-		elog "and running to use mt-daapd."
-		einfo
-
-		if use avahi; then
-			elog "Avahi support is currently experimental, it does not work"
-			elog "as intended when using more than one mt-daapd instance."
-			elog "If you want to run more than one mt-daapd, just use the"
-			elog "internal mdnsd by building with -howl flag."
-		fi
-	fi
-
-	if use vorbis; then
-		einfo
-		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
-		elog "if you want your mt-daapd to serve ogg files."
-		einfo
-	fi
-
-	einfo
-	elog "If you want to start more than one ${PN} service, symlink"
-	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
-	elog "load the data from /etc/${PN}.d/<name>.conf."
-	elog "Make sure that you have different cache directories for them."
-	einfo
-}