Removing old versions.

9 files changed, 7 insertions, 374 deletions

diff --git a/media-sound/daapd/ChangeLog b/media-sound/daapd/ChangeLog
index 86564bfaf350..6f4a825663b2 100644
--- a/media-sound/daapd/ChangeLog
+++ b/media-sound/daapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/daapd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.7 2004/10/05 08:49:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.8 2004/10/20 05:19:49 eradicator Exp $
+
+  19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/0.2.1d-makefile-gentoo.patch, -files/0.2.1d-zeroconf-gentoo.patch,
+  -files/daapd-0.2.3b-gentoo.patch, -files/daapd-0.2.3b-mpeg4.patch,
+  -daapd-0.2.1d.ebuild, -daapd-0.2.3b.ebuild:
+  Removing old versions.
 
 *daapd-0.2.3d (05 Oct 2004)
 
diff --git a/media-sound/daapd/daapd-0.2.1d.ebuild b/media-sound/daapd/daapd-0.2.1d.ebuild
deleted file mode 100644
index 7039fc53fccb..000000000000
--- a/media-sound/daapd/daapd-0.2.1d.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.1d.ebuild,v 1.2 2004/06/24 23:56:25 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="daapd scans a directory for mp3 files and makes them available via the Apple proprietary protocol DAAP"
-HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
-SRC_URI="http://www.deleet.de/projekte/daap/daapd/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="sys-libs/zlib
-	>=media-libs/libid3tag-0.15.0b
-	>=net-libs/libhttpd-persistent-1.3p-r6
-	media-libs/daaplib
-	>=net-misc/howl-0.9"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-makefile-gentoo.patch
-	epatch ${FILESDIR}/${PV}-zeroconf-gentoo.patch
-}
-
-src_compile() {
-	if eval [ -d "/usr/include/howl-*" ]; then
-		INCPATH="-I "`echo /usr/include/howl-*` || die "Can't find howl includes."
-	fi
-
-	emake INCPATH="${INCPATH}" || die
-}
-
-src_install() {
-	# Not an automake build :(
-	dobin daapd
-
-	dodoc COPYING INSTALL.irix README daapd-example.conf
-
-	insinto /etc
-	newins daapd-example.conf daapd.conf
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/daapd.conf.d daapd || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/daapd.init.d daapd || die
-}
diff --git a/media-sound/daapd/daapd-0.2.3b.ebuild b/media-sound/daapd/daapd-0.2.3b.ebuild
deleted file mode 100644
index ae5c8214cd85..000000000000
--- a/media-sound/daapd/daapd-0.2.3b.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.3b.ebuild,v 1.5 2004/10/05 08:49:45 eradicator Exp $
-
-IUSE="mpeg4"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="daapd scans a directory for mp3 files and makes them available via the Apple proprietary protocol DAAP"
-HOMEPAGE="http://www.deleet.de/projekte/daap/daapd/"
-SRC_URI="http://www.deleet.de/projekte/daap/daapd/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="sys-libs/zlib
-	=net-misc/howl-0.9.5
-	>=media-libs/libid3tag-0.15.0b
-	mpeg4? ( media-libs/faad2 )
-	>=net-libs/libhttpd-persistent-1.3p-r8
-	>=media-libs/daaplib-0.1.1a"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	if use mpeg4; then
-		epatch ${FILESDIR}/${P}-mpeg4.patch
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-
-#	emake DESTDIR=${D} DEPLOY=${D}usr install || die "emake install failed"
-
-	dobin daapd
-#	dolib daaplib/src/libdaaplib.a
-#	dolib libhttpd/src/libhttpd-persistent.a
-
-	dodoc COPYING README* daapd-example.conf
-	doman ${PN}.8
-
-#	insinto /usr/include
-#	doins libhttpd/src/httpd-persistent.h
-
-	insinto /etc
-	newins daapd-example.conf daapd.conf
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/daapd.conf.d daapd || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/daapd.init.d daapd || die
-}
-
diff --git a/media-sound/daapd/files/0.2.1d-makefile-gentoo.patch b/media-sound/daapd/files/0.2.1d-makefile-gentoo.patch
deleted file mode 100644
index 67945ea94462..000000000000
--- a/media-sound/daapd/files/0.2.1d-makefile-gentoo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -u daapd-0.2.1d.orig/makefile daapd-0.2.1d/makefile
---- daapd-0.2.1d.orig/makefile	2003-12-02 16:43:14.000000000 -0500
-+++ daapd-0.2.1d/makefile	2003-12-19 15:38:10.000000000 -0500
-@@ -1,4 +1,4 @@
--CC = c++
-+CC = g++
- TARGET = daapd
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
- LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
diff --git a/media-sound/daapd/files/0.2.1d-zeroconf-gentoo.patch b/media-sound/daapd/files/0.2.1d-zeroconf-gentoo.patch
deleted file mode 100644
index f2a5c1980dc6..000000000000
--- a/media-sound/daapd/files/0.2.1d-zeroconf-gentoo.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -u daapd-0.2.1d.makefile/daapd.cc daapd-0.2.1d/daapd.cc
---- daapd-0.2.1d.makefile/daapd.cc	2003-12-02 16:43:55.000000000 -0500
-+++ daapd-0.2.1d/daapd.cc	2003-12-20 17:22:08.000000000 -0500
-@@ -38,6 +38,12 @@
- #include <daap/tagoutput.h>
- #include <daap/registry.h>
- 
-+#ifdef HOWL_DNSREGISTRATION
-+#include <rendezvous/rendezvous.h>
-+#include <rendezvous/text_record.h>
-+#include <salt/salt.h>
-+#endif
-+
- 
- const int   DAAP_OK	  = 200;
- const char* DAAPD_VERSION = "daapd 0.2.1b";
-@@ -775,6 +781,39 @@
- 	return &initParams;
- }
- 
-+#ifdef HOWL_DNSREGISTRATION
-+static sw_result
-+my_service_reply(
-+		sw_rendezvous_publish_handler	handler,
-+		sw_rendezvous			rendezvous,
-+		sw_rendezvous_publish_status	status,
-+		sw_rendezvous_publish_id	id,
-+		sw_opaque			extra)
-+{
-+	static sw_string
-+		status_text[] =
-+		{
-+			"Started",
-+			"Stopped",
-+			"Name Collision",
-+			"Invalid"
-+		};
-+
-+	fprintf(stderr, "publish reply: %s\n", status_text[status]);
-+	return SW_OKAY;
-+}
-+
-+int addTextRecord( sw_text_record text_record, sw_const_string key, sw_const_string val )
-+{
-+	sw_result	result;
-+	if ((result = sw_text_record_add_key_and_string_value(text_record, key, val)) != SW_OKAY)
-+	{
-+		fprintf(stderr, "sw_text_record_add_string(%s, %s) failed with: %lu\n", key, val, result);
-+		return result;
-+	}
-+	return 0;
-+}
-+#endif
- 
- ////////////
- // main
-@@ -786,6 +825,14 @@
- 	int buflen = 255;
- 	char buffer[buflen];
- 
-+#ifdef HOWL_DNSREGISTRATION
-+	sw_rendezvous			session;
-+	sw_salt				salt;
-+	sw_text_record			text_record;
-+	sw_result			result;
-+	sw_rendezvous_publish_id	id;
-+#endif
-+
- 	if( gethostname( buffer, buflen ) == 0 ) {
- 		initParams.serverName = (char *)buffer;
- 		initParams.dbName = (char *)buffer;
-@@ -800,6 +847,25 @@
- 		initParams.dirs->push_back( dir );
- 	}
- 
-+#ifdef HOWL_DNSREGISTRATION
-+	if (sw_rendezvous_init(&session) != SW_OKAY)
-+	{
-+		fprintf(stderr, "sw_rendezvous_init() failed\n");
-+		return -1;
-+	}
-+	if (sw_rendezvous_salt(session, &salt) != SW_OKAY)
-+	{
-+		fprintf(stderr, "sw_rendezvous_salt() failed\n");
-+		return -1;
-+	}
-+
-+	if (sw_text_record_init(&text_record) != SW_OKAY)
-+	{
-+		fprintf(stderr, "sw_text_record_init() failed\n");
-+		return -1;
-+	}
-+#endif
-+
- 	cout << "scanning " << initParams.dirs << " for mp3s... " << flush;
- 	Database db( initParams );
- 	cout << "done. " << endl;
-@@ -818,12 +884,67 @@
- 	httpdAddCSiteContent( server, parseRequest, (void*)&db );
- 	httpdSetContentType( server, "application/x-dmap-tagged" );
- 
-+#ifdef HOWL_DNSREGISTRATION
-+	// Set up the DNS-SD TXT records
-+	if ((result = addTextRecord(text_record, "txtvers", "1")) != SW_OKAY)
-+	{
-+		return result;
-+	}
-+
-+	if ((result = addTextRecord(text_record, "Version", "131072")) != SW_OKAY)
-+	{
-+		return result;
-+	}
-+
-+	char tmpstr[16];
-+	sprintf(tmpstr, "%i", db.id);
-+	if ((result = addTextRecord(text_record, "Database ID", tmpstr)) != SW_OKAY)
-+	{
-+		return result;
-+	}
-+
-+	// TODO Add 'Machine ID' record like iTunes does.
-+
-+	if ((result = addTextRecord(text_record, "Machine Name", initParams.serverName.c_str())) != SW_OKAY)
-+	{
-+		return result;
-+	}
-+
-+	if ((result = addTextRecord(text_record, "Password", (initParams.password.length() > 0) ? "true" : "false")) != SW_OKAY)
-+	{
-+		return result;
-+	}
-+
-+	if ((result = sw_rendezvous_publish(session,
-+					initParams.serverName.c_str(),
-+					"_daap._tcp",
-+					NULL,
-+					NULL,
-+					initParams.port,
-+					sw_text_record_bytes(text_record),
-+					sw_text_record_len(text_record),
-+					NULL,
-+					my_service_reply,
-+					NULL,
-+					&id)) != SW_OKAY)
-+	{
-+		fprintf(stderr, "sw_rendezvous_publish() failed: %ld\n", result);
-+		return -1;
-+	}
-+#endif
-+
-+
- 	struct timeval timeout;
- 
- 	timeout.tv_sec  = 10;
- 	timeout.tv_usec = 0;
- 
- 	while( true ) {
-+#ifdef HOWL_DNSREGISTRATION
-+		sw_ulong msecs = 0; // Tells sw_salt_step to simply poll
-+		sw_salt_step(salt, &msecs);
-+#endif
-+
- 		httpdSelectLoop( server, timeout );
- 		// stuff like regular db updates could be added here
- 	}
-diff -u daapd-0.2.1d.makefile/makefile daapd-0.2.1d/makefile
---- daapd-0.2.1d.makefile/makefile	2003-12-19 15:38:10.000000000 -0500
-+++ daapd-0.2.1d/makefile	2003-12-20 17:26:20.000000000 -0500
-@@ -1,22 +1,24 @@
- CC = g++
- TARGET = daapd
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
--LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
--LIBPATH = -L. -L/usr/local/lib
--INCPATH = -I. -I/usr/local/include
-+OBJS2 = /usr/lib/libsalt.so /usr/lib/libcorby.so /usr/lib/librendezvous.so
-+LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lcorby -lsalt -lrendezvous -lpthread
-+LIBPATH = -L. -L/usr/lib -L/usr/local/lib
-+INCPATH = -I. -I/usr/local/include -I/usr/include/howl-0.9
- DEPLOY = /usr/local/bin
- CFLAGS = -Wall -Wno-multichar
-+DEFS = -DHOWL_DNSREGISTRATION # Comment this out to disable Howl DNS-SD Registration
- 
- .cc.o:
--	$(CC) $(CFLAGS) $(INCPATH) -c $<
-+	$(CC) $(CFLAGS) $(DEFS) $(INCPATH) -c $<
- 
- $(TARGET): $(OBJS)
--	$(CC) $(CFLAGS) $(LIBPATH) -o $(TARGET) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(DEFS) $(LIBPATH) -o $(TARGET) $(OBJS) $(OBJS2) $(LIBS)
- 
- $(OBJS): types.h dboutput.h songcache.h parsemp3.h
- 
- clean:
--	rm $(OBJS) $(TARGET)
-+	rm -f $(OBJS) $(TARGET)
- 
- install: $(TARGET)
- 	cp $(TARGET) $(DEPLOY)
diff --git a/media-sound/daapd/files/daapd-0.2.3b-gentoo.patch b/media-sound/daapd/files/daapd-0.2.3b-gentoo.patch
deleted file mode 100644
index 5da7cb36dbfd..000000000000
--- a/media-sound/daapd/files/daapd-0.2.3b-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN daapd-0.2.3b/makefile daapd-0.2.3b.makefile/makefile
---- daapd-0.2.3b/makefile	2004-06-20 16:07:31.000000000 +0200
-+++ daapd-0.2.3b.makefile/makefile	2004-07-10 22:18:15.694502696 +0200
-@@ -11,19 +11,19 @@
- CC = g++
- MAKE = $(MAKE_COMMAND)
- TARGET = daapd
--DEPS = daaplib_ libhttpd_
-+DEPS = 
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
- LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread 
--LIBPATH = -L. -L./daaplib/src -L./libhttpd/src  -L/usr/local/lib
--INCPATH = -I. -I./daaplib/include -I./libhttpd/src  -I/usr/local/include
--DEPLOY = /usr/local
-+LIBPATH = -L. -L/usr/lib
-+INCPATH = -I. -I/usr/include
-+DEPLOY = /usr
- CFLAGS = -Wall -Wno-multichar
- 
- # HOWL
- ifeq ($(HOWL_ENABLE),1)
--	HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
-+	HOWLDIRS := $(sort $(wildcard /usr/include/howl*) )
- ifeq ($(words $(HOWLDIRS) ), 0)
--$(error howl not found in /usr/local/include. Install howl or disable it in the makefile)
-+$(error howl not found in /usr/include. Install howl or disable it in the makefile)
- endif
- 	HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
- 	INCPATH := $(INCPATH) -I$(HOWLRECENT)
-diff -urN daapd-0.2.3b/types.h daapd-0.2.3b.types.h/types.h
---- daapd-0.2.3b/types.h	2004-06-19 17:40:04.000000000 +0200
-+++ daapd-0.2.3b.types.h/types.h	2004-07-10 22:32:53.584043200 +0200
-@@ -20,6 +20,10 @@
- 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#ifndef UINT64_TO_DOUBLE
-+#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
-+#endif
-+
- #ifndef DAAP_TYPES_H
- #define DAAP_TYPES_H
- 
diff --git a/media-sound/daapd/files/daapd-0.2.3b-mpeg4.patch b/media-sound/daapd/files/daapd-0.2.3b-mpeg4.patch
deleted file mode 100644
index 1e2b06615df7..000000000000
--- a/media-sound/daapd/files/daapd-0.2.3b-mpeg4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN daapd-0.2.3b/makefile daapd-0.2.3b.makefile/makefile
---- daapd-0.2.3b/makefile	2004-07-10 22:10:51.784987200 +0200
-+++ daapd-0.2.3b.makefile/makefile	2004-07-10 22:13:10.216942344 +0200
-@@ -2,7 +2,7 @@
- 
- HOWL_ENABLE = 1
- ZLIB_ENABLE = 1
--MPEG4_ENABLE = 0
-+MPEG4_ENABLE = 1
- 
- 
- # no need to touch anything below this line
diff --git a/media-sound/daapd/files/digest-daapd-0.2.1d b/media-sound/daapd/files/digest-daapd-0.2.1d
deleted file mode 100644
index baaec5219412..000000000000
--- a/media-sound/daapd/files/digest-daapd-0.2.1d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f69299a099920694d7ddf78a1dcea49 daapd-0.2.1d.tgz 30023
diff --git a/media-sound/daapd/files/digest-daapd-0.2.3b b/media-sound/daapd/files/digest-daapd-0.2.3b
deleted file mode 100644
index e5dfc2815029..000000000000
--- a/media-sound/daapd/files/digest-daapd-0.2.3b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19e9dd184e01ac5b035f48f58daa5f06 daapd-0.2.3b.tgz 201985