From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Sun, 31 Dec 2006 12:17:10 +0000 (+0000)
Subject: Add patch to build against latest version of live and do a bit of cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d6124733ec613e0319a25013743815672ae4058;p=gentoo.git

Add patch to build against latest version of live and do a bit of cleanup.
Package-Manager: portage-2.1.2_rc4-r3
---

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/Manifest b/media-sound/mimd/Manifest
index fe1c8cb379db..526e2eabdaf3 100644
--- a/media-sound/mimd/Manifest
+++ b/media-sound/mimd/Manifest
@@ -1,14 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 be2ee9f7c3673757152fe69b122f0dc9 mimd-0.30.1.ebuild 1474
-MD5 4d8c570a08400dd08870a2ef604913ce ChangeLog 424
+AUX mimd-0.30.1+live-2006.12.08.patch 1516 RMD160 98b320c44929c84ac6f6ffbad90ca3118631a9a2 SHA1 39e96ec35b59511047128b8816ade6d3bb5bcef4 SHA256 8680d4fd0b0b26bd8827ebe4428e77b11c6bfbc8b346e79663dfb94d1ea9b611
+MD5 4396e34b5c4bc96f37a8737c4451251e files/mimd-0.30.1+live-2006.12.08.patch 1516
+RMD160 98b320c44929c84ac6f6ffbad90ca3118631a9a2 files/mimd-0.30.1+live-2006.12.08.patch 1516
+SHA256 8680d4fd0b0b26bd8827ebe4428e77b11c6bfbc8b346e79663dfb94d1ea9b611 files/mimd-0.30.1+live-2006.12.08.patch 1516
+DIST mimd-0.30.1.tar.bz2 16853 RMD160 bca725a02da4cda40be6aaa67895a535334dcf88 SHA1 527632d3898fe00ee35e96bf84442337c3529407 SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924
+EBUILD mimd-0.30.1.ebuild 1430 RMD160 2da20efe893207f86aa91e98a38059d5643cbe8c SHA1 c277c2dc778488617ce8c7727a4e53998097c92e SHA256 ce55e521716302d7e204ee53b1dff5647bbb75cdfb709d129572f0dd16b51ad0
+MD5 d192de933259007b794fc10b6b9ed5c6 mimd-0.30.1.ebuild 1430
+RMD160 2da20efe893207f86aa91e98a38059d5643cbe8c mimd-0.30.1.ebuild 1430
+SHA256 ce55e521716302d7e204ee53b1dff5647bbb75cdfb709d129572f0dd16b51ad0 mimd-0.30.1.ebuild 1430
+MISC ChangeLog 618 RMD160 31dfc74910485aaa380123e5334b0387e7b9ab09 SHA1 1b9741083a924394f1ed08b86f1e6ae2019c6404 SHA256 4dde1d7027838de2903a70fd32539c6d258fb9d8566cfbccc495a7af52c752f8
+MD5 392f378b1dba6b488ee69edd98ab79dc ChangeLog 618
+RMD160 31dfc74910485aaa380123e5334b0387e7b9ab09 ChangeLog 618
+SHA256 4dde1d7027838de2903a70fd32539c6d258fb9d8566cfbccc495a7af52c752f8 ChangeLog 618
+MISC metadata.xml 219 RMD160 1311be2ec3797b97e67acd02afa5083523d06721 SHA1 8d1e8571dd1d104255107dd46473ddc08e0de932 SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c
 MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
-MD5 c7bbbe3d74e59b00c50be012c04f184f files/digest-mimd-0.30.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCO3xlI1lqEGTUzyQRAtBqAKDW40OBD/XNV81LcOSJB6awnRYaAACfcnFH
-dWlo9hzBxH6gsmWN9U5RsIc=
-=0lsW
------END PGP SIGNATURE-----
+RMD160 1311be2ec3797b97e67acd02afa5083523d06721 metadata.xml 219
+SHA256 5cceaad9e92392f27e672ac3a4c7127bf5b8f60a737788cd6d4856568e2f795c metadata.xml 219
+MD5 d93e17996604e79f886e89902b5ebc03 files/digest-mimd-0.30.1 235
+RMD160 5995bc068b89f59948147d1b14cbfb8861fc183e files/digest-mimd-0.30.1 235
+SHA256 bc0b45a977563b60097beaddc294d92210f52b2225b00b04d1867eaf10c8ae21 files/digest-mimd-0.30.1 235
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() {