Add (masked) nightlie of 0.3.0 prerelease for testing.

(Portage version: 2529-svn)

5 files changed, 288 insertions, 11 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index a9dde0015d9b..c0b96d1eae82 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.13 2006/01/12 16:45:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.14 2006/01/12 17:41:10 flameeyes Exp $
+
+*mt-daapd-0.3.0_pre20060112 (12 Jan 2006)
+
+  12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mt-daapd-20060112-libs.patch, +mt-daapd-0.3.0_pre20060112.ebuild:
+  Add (masked) nightlie of 0.3.0 prerelease for testing.
 
   12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/mt-daapd-0.2.3-libsorder.patch, mt-daapd-0.2.3-r2.ebuild:
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index e7e4faa6bedc..ab41bcff9f75 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6ed8189e29f0b2c3d78d3a06106af4b1 ChangeLog 2646
 MD5 804311ec22b1fba76a61411d0c752a15 files/digest-mt-daapd-0.2.1.1 68
 MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r2 66
+MD5 ec403b48af5c6a0a2addbe3ec692f67f files/digest-mt-daapd-0.3.0_pre20060112 73
 MD5 55238544e58e1a12aa7a405779d03fb1 files/mt-daapd-0.2.3-libsorder.patch 5162
 MD5 40d97e03e85d347c0ddf88f5f07d4093 files/mt-daapd-0.2.3-persist-fix.patch 1182
 MD5 b6ec66b0ccfd69869025f1bba1421dd6 files/mt-daapd-0.2.3-pidfile.patch 1918
@@ -13,10 +11,4 @@ MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 880127a188cf908b0ad84221e48eeebf mt-daapd-0.2.1.1.ebuild 1936
 MD5 4e20971d10008c86db9e602e3b738fa1 mt-daapd-0.2.3-r2.ebuild 3500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxoebAiZjviIA2XgRAqv/AKDuKOm5COAk6go++vSQgxbgSO4z0gCdH4ho
-v7v6QZwD57GojGJLIGK83Mk=
-=kqUS
------END PGP SIGNATURE-----
+MD5 87dab0681df9d04787cd0a49896f9a16 mt-daapd-0.3.0_pre20060112.ebuild 3635
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112
new file mode 100644
index 000000000000..8c2400387dfb
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112
@@ -0,0 +1 @@
+MD5 33d021ec7933db96074627bba2478f06 mt-daapd-cvs-20060112.tar.gz 777107
diff --git a/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch b/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch
new file mode 100644
index 000000000000..6f93f5bc197f
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch
@@ -0,0 +1,126 @@
+Index: mt-daapd-cvs-20060112/configure.in
+===================================================================
+--- mt-daapd-cvs-20060112.orig/configure.in
++++ mt-daapd-cvs-20060112/configure.in
+@@ -23,8 +23,8 @@ STATIC_LIBS=no
+ CPPFLAGS="${CPPFLAGS} -g -Wall"
+ 
+ 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,LIBS="${LIBS} -lc_r", [
++  AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
+ 
+ AC_ARG_ENABLE(sqlite,[  --enable-sqlite         Enable the sqlite db backend],
+ 			[ case "${enableval}" in
+@@ -52,7 +52,7 @@ AC_ARG_ENABLE(nslu2,[  --enable-nslu2   
+ 
+ AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
+ 		      [ case "${enableval}" in
+-                        yes) rend_howl=true; rend_posix=false; LDFLAGS="${LDFLAGS} -lhowl";
++                        yes) rend_howl=true; rend_posix=false; LIBS="${LIBS} -lhowl";
+ 			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
+ 		        no)  rend_howl=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
+@@ -101,7 +101,7 @@ case $host in
+ 	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";;	
++	LIBS="${LIBS} -lnsl -lsocket";;	
+ *freebsd*)
+ 	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
+ *linux*)
+@@ -162,9 +162,9 @@ CFLAGS="$CFLAGS -lz"
+ AC_CHECK_LIB(id3tag,id3_file_open,,echo "no libid3tag. Try --with-id3tag=dir";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
++  LIBS="${LIBS} ${STATIC_LIBS}/libid3tag.a -lz"
+ else
+-  LDFLAGS="${LDFLAGS} -lid3tag -lz"
++  LIBS="${LIBS} -lid3tag -lz"
+ fi
+ CFLAGS=$oldcflags
+ 
+@@ -174,9 +174,9 @@ if test x$db_sqlite = xtrue; then
+   AC_CHECK_LIB(sqlite,sqlite_open,,echo "Must have sqlite libraries installed";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libsqlite.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libsqlite.a"
+   else
+-    LDFLAGS="${LDFLAGS} -lsqlite"
++    LIBS="${LIBS} -lsqlite"
+   fi
+ fi
+ 
+@@ -186,9 +186,9 @@ if test x$db_sqlite3 = xtrue; then
+   AC_CHECK_LIB(sqlite3,sqlite3_open,,echo "Must have sqlite3 libraries installed";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libsqlite3.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libsqlite3.a"
+   else
+-    LDFLAGS="${LDFLAGS} -lsqlite3"
++    LIBS="${LIBS} -lsqlite3"
+   fi
+ fi
+ 
+@@ -199,9 +199,9 @@ if test x$use_oggvorbis = xtrue; then
+   AC_CHECK_LIB(ogg,ogg_sync_init,,echo "Must have libogg for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
+   else
+-    LDFLAGS="${LDFLAGS} -logg"
++    LIBS="${LIBS} -logg"
+   fi
+ 
+   AC_CHECK_HEADERS(vorbis/codec.h,, [
+@@ -209,16 +209,16 @@ if test x$use_oggvorbis = xtrue; then
+   AC_CHECK_LIB(vorbis,vorbis_info_init,,echo "Must have libvorbis for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
+   else
+-    LDFLAGS="${LDFLAGS} -lvorbis"
++    LIBS="${LIBS} -lvorbis"
+   fi
+ 
+   AC_CHECK_LIB(vorbisfile,ov_open,,echo "Must have libvorbisfile for Ogg/Vorbis support";exit)
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbisfile.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libvorbisfile.a"
+   else
+-    LDFLAGS="${LDFLAGS} -lvorbisfile"
++    LIBS="${LIBS} -lvorbisfile"
+   fi
+ fi
+ 
+@@ -228,9 +228,9 @@ if test x$use_flac = xtrue; then
+   AC_CHECK_LIB(FLAC,FLAC__metadata_chain_read,,echo "Must have libFLAC for FLAC support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libFLAC.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libFLAC.a"
+   else
+-    LDFLAGS="${LDFLAGS} -lFLAC"
++    LIBS="${LIBS} -lFLAC"
+   fi
+ fi
+ 
+@@ -246,9 +246,9 @@ dnl        AC_MSG_ERROR(['Taglib C bindi
+ dnl  fi
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libtag_c.a"
++    LIBS="${LIBS} ${STATIC_LIBS}/libtag_c.a"
+   else
+-    LDFLAGS="${LDFLAGS} -ltag_c"
++    LIBS="${LIBS} -ltag_c"
+   fi
+ fi
+ 
diff --git a/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild
new file mode 100644
index 000000000000..9faee06d2d9e
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2006 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_pre20060112.ebuild,v 1.1 2006/01/12 17:41:10 flameeyes Exp $
+
+inherit eutils autotools
+
+CVS="${PV#*pre}"
+
+if [[ -n ${CVS} ]] ; then
+	MY_P="${PN}-cvs-${CVS}"
+	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 ~ppc-macos ~sh ~sparc ~x86"
+IUSE="howl vorbis avahi sqlite sqlite3 flac"
+
+DEPEND="sys-libs/zlib
+	media-libs/libid3tag
+	sqlite? ( =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 )"
+
+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
+
+	if use sqlite && use sqlite3; then
+		eerror "You can't enable both sqlite 2.x and sqlite 3.x suppor at the"
+		eerror "same time. Please drop one of the useflag."
+		die "Invalid use of sqlite flags"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-${CVS}-libs.patch"
+
+	eautoreconf
+}
+
+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 \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable flac) \
+		$(use_enable sqlite) \
+		$(use_enable sqlite3) \
+		${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
+}