Version bump and, while I'm here, replace einfo with elog for important messages.

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 170 insertions, 17 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index 48a8672cabd9..15cc9d5ecb0a 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.40 2006/07/13 15:02:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.41 2006/07/21 16:48:50 flameeyes Exp $
+
+*mt-daapd-0.3.0_pre1311 (21 Jul 2006)
+
+  21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> mt-daapd-0.2.4.ebuild,
+  -mt-daapd-0.3.0_pre1303.ebuild, +mt-daapd-0.3.0_pre1311.ebuild:
+  Version bump and, while I'm here, replace einfo with elog for important
+  messages.
 
 *mt-daapd-0.3.0_pre1303 (13 Jul 2006)
 
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1311 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1311
new file mode 100644
index 000000000000..fa5017afab51
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre1311
@@ -0,0 +1,3 @@
+MD5 9ab69ec1239539ddfa125f150d22ffea mt-daapd-svn-1311.tar.gz 1129672
+RMD160 2f036a4002309ca766ff496763464112d80866d9 mt-daapd-svn-1311.tar.gz 1129672
+SHA256 b04b3c1de3f0930247ba9630dac69e9ce33494848588a43c966600f93c2dee11 mt-daapd-svn-1311.tar.gz 1129672
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.ebuild
index f620591fbd74..cb782043a018 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.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/mt-daapd/mt-daapd-0.2.4.ebuild,v 1.4 2006/07/03 07:19:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.2.4.ebuild,v 1.5 2006/07/21 16:48:50 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -94,8 +94,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo
-	einfo "You have to configure your mt-daapd.conf following"
-	einfo "/etc/mt-daapd.conf.example file."
+	elog "You have to configure your mt-daapd.conf following"
+	elog "/etc/mt-daapd.conf.example file."
 	einfo
 
 	if use howl; then
@@ -104,30 +104,30 @@ pkg_postinst() {
 			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."
+		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
-			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."
+			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
-		einfo "You need to edit you extensions list in /etc/mt-daapd.conf"
-		einfo "if you want your mt-daapd to serve ogg files."
+		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
-	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."
+	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_pre1311.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre1311.ebuild
new file mode 100644
index 000000000000..bf7fd325ae40
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.3.0_pre1311.ebuild
@@ -0,0 +1,143 @@
+# 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_pre1311.ebuild,v 1.1 2006/07/21 16:48:50 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 ~ppc-macos ~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=${ROOT}/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
+}