Add patch to build against latest version of live and do a bit of cleanup.

(Portage version: 2.1.2_rc4-r3)

4 files changed, 61 insertions, 17 deletions

diff --git a/media-sound/mimd/ChangeLog b/media-sound/mimd/ChangeLog
index 98342ca145eb..b607ccfb6814 100644
--- a/media-sound/mimd/ChangeLog
+++ b/media-sound/mimd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mimd
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/ChangeLog,v 1.1 2005/01/18 23:39:52 chriswhite Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/ChangeLog,v 1.2 2006/12/31 12:17:10 flameeyes Exp $
+
+  31 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mimd-0.30.1+live-2006.12.08.patch, mimd-0.30.1.ebuild:
+  Add patch to build against latest version of live and do a bit of cleanup.
 
 *mimd-0.30.1 (19 Jan 2005)
 
diff --git a/media-sound/mimd/files/digest-mimd-0.30.1 b/media-sound/mimd/files/digest-mimd-0.30.1
index c2748b367ef1..775189fdd560 100644
--- a/media-sound/mimd/files/digest-mimd-0.30.1
+++ b/media-sound/mimd/files/digest-mimd-0.30.1
@@ -1 +1,3 @@
 MD5 ca92ae704480dbe25b2797dda654c917 mimd-0.30.1.tar.bz2 16853
+RMD160 bca725a02da4cda40be6aaa67895a535334dcf88 mimd-0.30.1.tar.bz2 16853
+SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924 mimd-0.30.1.tar.bz2 16853
diff --git a/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch b/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
new file mode 100644
index 000000000000..96b94095e349
--- /dev/null
+++ b/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
@@ -0,0 +1,29 @@
+Index: mimd-0.30.1/Makefile.in
+===================================================================
+--- mimd-0.30.1.orig/Makefile.in
++++ mimd-0.30.1/Makefile.in
+@@ -1,10 +1,12 @@
+ LIVEDIR=@LIVEDIR@
+-XERCESDIR=@XERCESDIR@
++#XERCESDIR=@XERCESDIR@
++XERCESDIR=/usr
+ PREFIX=@PREFIX@
+ 
+-CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
++#CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
++CPPFLAGS += -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -Isrc/include -DVERSION="0301"
+ 
+-LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
++#LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
+ 
+ LDLIBS=-lxerces-c -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lliveMedia -lpthread
+ 
+@@ -32,7 +34,7 @@ OBJS= src/MediaStreamer.o\
+       src/parser.o
+ 
+ mimd: $(OBJS)
+-	g++ -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
++	$(CXX) -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
+ 
+ install: mimd
+ 	mkdir -p $(PREFIX)/doc $(PREFIX)/etc $(PREFIX)/bin $(PREFIX)/man/man1 > /dev/null
diff --git a/media-sound/mimd/mimd-0.30.1.ebuild b/media-sound/mimd/mimd-0.30.1.ebuild
index 851d5fb3f326..1e0edc34418b 100644
--- a/media-sound/mimd/mimd-0.30.1.ebuild
+++ b/media-sound/mimd/mimd-0.30.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/mimd-0.30.1.ebuild,v 1.2 2005/03/19 01:11:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mimd/mimd-0.30.1.ebuild,v 1.3 2006/12/31 12:17:10 flameeyes Exp $
+
+inherit eutils
 
 DESCRIPTION="Multicast streaming server for MPEG1/2 and MP3 files."
 
@@ -10,33 +12,40 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-DEPEND="sys-apps/sed
-		>=media-plugins/live-2004.03.05
-		dev-libs/xerces-c
-		dev-lang/perl"
+
+RDEPEND=">=media-plugins/live-2006.12.08
+		dev-libs/xerces-c"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+live-2006.12.08.patch"
+	cp Makefile.in Makefile
+}
 
 src_compile() {
-	sed -e 's!@PREFIX@!/!' -e 's!@LIVEDIR@!/usr/lib/live!' -e 's!@XERCESDIR@!/usr!' < ${S}/Makefile.in > ${S}/Makefile
 	emake || die
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe ${S}/mimd
-	dodoc ${S}/doc/mimd.pod
+	dobin mimd
+	dodoc doc/mimd.pod
 
 	if [ -x /usr/bin/pod2html ]; then
-		pod2html < ${S}/doc/mimd.pod > ${S}/doc/mimd.html
-		dohtml ${S}/doc/mimd.html
+		pod2html < doc/mimd.pod > doc/mimd.html
+		dohtml doc/mimd.html
 	fi
 
 	if [ -x /usr/bin/pod2man ]; then
-		pod2man < ${S}/doc/mimd.pod > ${S}/doc/mimd.1
-		doman ${S}/doc/mimd.1
+		pod2man < doc/mimd.pod > doc/mimd.1
+		doman doc/mimd.1
 	fi
 
 	insinto /usr/share/mimd
-	doins ${S}/etc/mimd.dtd ${S}/etc/sample.xml
+	doins etc/mimd.dtd etc/sample.xml
 }
 
 pkg_postinst() {