Add peercast-0.1216 as per bug #123432; ebuild based on the one provided by upstream. It's being built from sources now, so install in /usr instead of /opt and provide a wrapper script to run it, runs natively on amd64. Dropped x86 keyword waiting for testing, also remove -* as it's no more a binary.

(Portage version: 2.1_pre5-r4)

9 files changed, 165 insertions, 13 deletions

diff --git a/media-sound/peercast/ChangeLog b/media-sound/peercast/ChangeLog
index 6e842fdb7105..8a1d5b6e7706 100644
--- a/media-sound/peercast/ChangeLog
+++ b/media-sound/peercast/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/peercast
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.7 2005/06/20 18:15:08 chainsaw Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/ChangeLog,v 1.8 2006/03/07 18:11:19 flameeyes Exp $
+
+*peercast-0.1216 (07 Mar 2006)
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/peercast-0.1216-amd64.patch, +files/peercast-0.1216-makefile.patch,
+  +files/peercast.init.gpl, +files/peercast.wrapper.sh, metadata.xml,
+  +peercast-0.1216.ebuild:
+  Add peercast-0.1216 as per bug #123432; ebuild based on the one provided by
+  upstream. It's being built from sources now, so install in /usr instead of
+  /opt and provide a wrapper script to run it, runs natively on amd64. Dropped
+  x86 keyword waiting for testing, also remove -* as it's no more a binary.
 
   20 Jun 2005; Tony Vroon <chainsaw@gentoo.org> peercast-0.1212.ebuild:
   Change to Gentoo mirrors now that the distfile has propagated.
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
index 563b25e52b01..eaa749383745 100644
--- a/media-sound/peercast/Manifest
+++ b/media-sound/peercast/Manifest
@@ -1,15 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0dae886c1419164608685b1b6d7dc043 ChangeLog 1415
+RMD160 c13b2774fe0598ab5590f5ac988721444e17baad ChangeLog 1415
+SHA256 16db1b65a27455614abc7868b05155127a698a8bb361c9462f18c0a315337aab ChangeLog 1415
 MD5 9aa0a0713c5edcfc7e6a5dad02a2bb78 files/digest-peercast-0.1212 70
+RMD160 1956517a9a6faf32f3678358624223e5719fdda8 files/digest-peercast-0.1212 70
+SHA256 c87f067c6c7b5dfe4545265741c07a290f29c2e410a4060723e0c33489ae2d69 files/digest-peercast-0.1212 70
+MD5 d6efd63b8bcc1f45c17a7721e51bc5fc files/digest-peercast-0.1216 250
+RMD160 4fb25fa0853796361dbca9565040abe5615d380b files/digest-peercast-0.1216 250
+SHA256 144408db6c8fe9be59b5a26a0ead49a91098e8b02bfc1abc6cfeeae15eff3842 files/digest-peercast-0.1216 250
 MD5 46edc53a482f19af8574b644d6ba02ec files/peercast.init 890
+RMD160 b44c15a09ad043a07bec66e8529f36d6630b7768 files/peercast.init 890
+SHA256 b1241064c545fb4569cb8457446187d49038ca9a6088af565c4f03171047303c files/peercast.init 890
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 metadata.xml 160
+SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b metadata.xml 160
 MD5 f4851d46b0cf2a245e80c1a617fe610a peercast-0.1212.ebuild 1454
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0CBzI1lqEGTUzyQRAmphAKDHkZ8tJCUnUaQF8C3rV9s+d5LxtACgjkLX
-N0OCU44t44LK7i1mdvR79gw=
-=L7+P
------END PGP SIGNATURE-----
+RMD160 8a4c2b7f1a29e06efe05e3ba0eca358c6393c0c5 peercast-0.1212.ebuild 1454
+SHA256 be87f5c7077c8fcb69cf7dffddeb4960e3d2a88c08efb3088535d4f2b3948bd6 peercast-0.1212.ebuild 1454
+MD5 036687cd3ebab13e518d18909563cb1c peercast-0.1216.ebuild 1241
+RMD160 1e9a05b76343fcaee3820e852b0dcf895656676f peercast-0.1216.ebuild 1241
+SHA256 9147bb8343400f3fd1a435715e9dcde0f3df74251f0cb32d766d736afa102593 peercast-0.1216.ebuild 1241
diff --git a/media-sound/peercast/files/digest-peercast-0.1216 b/media-sound/peercast/files/digest-peercast-0.1216
new file mode 100644
index 000000000000..fca6bd6ad6ef
--- /dev/null
+++ b/media-sound/peercast/files/digest-peercast-0.1216
@@ -0,0 +1,3 @@
+MD5 79bca8377c4c21010a3323a61a5f2cd2 peercast-0.1216-src.tgz 536636
+RMD160 6b9053114aa4a40efeb8e6485d224aa011813f47 peercast-0.1216-src.tgz 536636
+SHA256 cfd4811b4b2dfbe2078da12de7812a84d4c6e8b31dcb503b9d448da53782e516 peercast-0.1216-src.tgz 536636
diff --git a/media-sound/peercast/files/peercast-0.1216-amd64.patch b/media-sound/peercast/files/peercast-0.1216-amd64.patch
new file mode 100644
index 000000000000..95144730d580
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1216-amd64.patch
@@ -0,0 +1,13 @@
+Index: work/core/common/sys.h
+===================================================================
+--- work.orig/core/common/sys.h
++++ work/core/common/sys.h
+@@ -322,7 +322,7 @@ public:
+ #define _BIG_ENDIAN 1
+ #endif
+ 

+-typedef long long int64_t;
++#include <stdint.h>
+ 
+ typedef int (*THREAD_FUNC)(ThreadInfo *);
+ #define THREAD_PROC int 
diff --git a/media-sound/peercast/files/peercast-0.1216-makefile.patch b/media-sound/peercast/files/peercast-0.1216-makefile.patch
new file mode 100644
index 000000000000..e54c4ae622de
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1216-makefile.patch
@@ -0,0 +1,26 @@
+Index: work/ui/linux/makefile
+===================================================================
+--- work.orig/ui/linux/makefile
++++ work/ui/linux/makefile
+@@ -79,10 +79,10 @@ clean:
+ 	rm  -f $(LINUXOBJ) $(COREOBJ) $(TARGET) ${LIBOBJSTATIC} ${LIBOBJSHARED} $(COREOBJSTATIC)
+ 
+ %.o: %.cpp
+-	$(CC) $(INCLUDES) $(CPPFLAGS) -fPIC -c $< -o $@
++	$(CC) $(CXXFLAGS) $(INCLUDES) $(CPPFLAGS) -fPIC -c $< -o $@
+ 
+ %.a: %.cpp
+-	$(CC) $(INCLUDES) $(CPPFLAGS) -c $< -o $@
++	$(CC) $(CXXFLAGS) $(INCLUDES) $(CPPFLAGS) -c $< -o $@
+ 
+ DEPENDFILE = makedepend
+ 
+@@ -92,7 +92,7 @@ depend: 
+ 	$(CC) $(INCLUDES) $(CPPFLAGS) -MD $(CORESOURCE) $(LINUXSOURCE) >> $(DEPENDFILE)
+ 
+ peercast-so: $(COREOBJSTATIC) $(COREOBJ) $(LINUXOBJ)
+-	$(LD) $(LDSOFLAGS),$(LIBSONAME) -o ${LIBOBJSHARED} $(COREOBJ) -lc
++	$(LD) $(LDFLAGS) $(LDSOFLAGS),$(LIBSONAME) -o ${LIBOBJSHARED} $(COREOBJ) -lc
+ 	$(LD) $(LDFLAGS) -o $@ $(LINUXOBJ) $(LIBOBJSHARED) -ldl
+ 	${AR} rcs $(LIBOBJSTATIC) $(COREOBJSTATIC)
+ 
diff --git a/media-sound/peercast/files/peercast.init.gpl b/media-sound/peercast/files/peercast.init.gpl
new file mode 100644
index 000000000000..4615bd010f48
--- /dev/null
+++ b/media-sound/peercast/files/peercast.init.gpl
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/files/peercast.init.gpl,v 1.1 2006/03/07 18:11:19 flameeyes Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting peercast"
+
+	start-stop-daemon --start --chuid nobody \
+		--pidfile /var/run/peercast.pid --background \
+		--exec /usr/sbin/peercast
+	
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping peercast"
+
+	start-stop-daemon --stop --retry 20 --pidfile /var/run/peercast.pid
+
+	eend $?
+}
diff --git a/media-sound/peercast/files/peercast.wrapper.sh b/media-sound/peercast/files/peercast.wrapper.sh
new file mode 100644
index 000000000000..052d9b612daa
--- /dev/null
+++ b/media-sound/peercast/files/peercast.wrapper.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd /usr/share/peercast
+exec /usr/libexec/peercast "$@"
+echo "$!" > /var/run/peercast.pid
+
diff --git a/media-sound/peercast/metadata.xml b/media-sound/peercast/metadata.xml
index 3bf6bcfeb512..e1774e3d9ad7 100644
--- a/media-sound/peercast/metadata.xml
+++ b/media-sound/peercast/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/peercast/peercast-0.1216.ebuild b/media-sound/peercast/peercast-0.1216.ebuild
new file mode 100644
index 000000000000..ae6e1a609fae
--- /dev/null
+++ b/media-sound/peercast/peercast-0.1216.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/peercast/peercast-0.1216.ebuild,v 1.1 2006/03/07 18:11:19 flameeyes Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+IUSE=""
+
+S=${WORKDIR}
+
+DESCRIPTION="A client and server for Peercast P2P-radio network"
+HOMEPAGE="http://www.peercast.org"
+
+SRC_URI="http://www.peercast.org/src/${P}-src.tgz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+}
+
+src_compile() {
+	append-ldflags -pthread
+
+	cd ${S}/ui/linux
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
+		LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	cd ${S}/ui/linux
+
+	exeinto /usr/sbin
+	newexe "${FILESDIR}/peercast.wrapper.sh" peercast
+
+	exeinto /usr/libexec
+	doexe peercast
+
+	dodir /usr/share/peercast
+	cd ${S}/ui
+	cp -R html ${D}/usr/share/peercast/
+
+	newinitd "${FILESDIR}/peercast.init.gpl" peercast
+}
+
+pkg_postinst() {
+	einfo "Start Peercast with '/etc/init.d/peercast start' and point your"
+	einfo "webbrowser to 'http://localhost:7144' to start using Peercast."
+	einfo
+	einfo "You can also run 'rc-update add peercast default' to make Peercast"
+	einfo "start at boot."
+}