Added metadata.xml. Fixed some install problems thanks to Alexander Gretencord <arutha@gmx.de> in bug #57389.

8 files changed, 57 insertions, 38 deletions

diff --git a/net-misc/shout/ChangeLog b/net-misc/shout/ChangeLog
index aeaf6628d09d..4167f37ac60e 100644
--- a/net-misc/shout/ChangeLog
+++ b/net-misc/shout/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/shout
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.9 2004/08/08 14:09:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.10 2004/09/05 22:35:01 eradicator Exp $
+
+*shout-0.8.0-r2 (05 Sep 2004)
+
+  05 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
+  files/variables.diff, -shout-0.8.0-r1.ebuild, +shout-0.8.0-r2.ebuild,
+  -shout-0.8.0.ebuild:
+  Added metadata.xml. Fixed some install problems thanks to Alexander Gretencord
+  <arutha@gmx.de> in bug #57389.
 
   08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> shout-0.8.0-r1.ebuild,
   shout-0.8.0.ebuild:
diff --git a/net-misc/shout/Manifest b/net-misc/shout/Manifest
index 8815893c3f30..fa7e4b198ee8 100644
--- a/net-misc/shout/Manifest
+++ b/net-misc/shout/Manifest
@@ -1,6 +1,9 @@
-MD5 f3545c29735161e9b9f4a0d2c6a9dab1 shout-0.8.0-r1.ebuild 850
 MD5 d42d1478a159ff94b9bf0d8fcfa2e826 ChangeLog 1380
+MD5 f3545c29735161e9b9f4a0d2c6a9dab1 shout-0.8.0-r1.ebuild 850
 MD5 0c15c3cbacd880c62f63c64b985b27e1 shout-0.8.0.ebuild 739
-MD5 cb0cb8ccd0256e8ee847bcc0f6df5aec files/variables.diff 470
-MD5 0b75f95937f0f8d238142c325a390e15 files/digest-shout-0.8.0-r1 62
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9beab8271a3977586c55a1d6776aace3 shout-0.8.0-r2.ebuild 996
 MD5 0b75f95937f0f8d238142c325a390e15 files/digest-shout-0.8.0 62
+MD5 0b75f95937f0f8d238142c325a390e15 files/digest-shout-0.8.0-r1 62
+MD5 7f1390e82e15f4e013b0018ab6de6c52 files/variables.diff 1142
+MD5 0b75f95937f0f8d238142c325a390e15 files/digest-shout-0.8.0-r2 62
diff --git a/net-misc/shout/files/digest-shout-0.8.0-r1 b/net-misc/shout/files/digest-shout-0.8.0-r1
deleted file mode 100644
index 96ea0563730a..000000000000
--- a/net-misc/shout/files/digest-shout-0.8.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d44604a2235532e31e10d2d0e4740f20 shout-0.8.0.tar.gz 66394
diff --git a/net-misc/shout/files/digest-shout-0.8.0 b/net-misc/shout/files/digest-shout-0.8.0-r2
index 96ea0563730a..96ea0563730a 100644
--- a/net-misc/shout/files/digest-shout-0.8.0
+++ b/net-misc/shout/files/digest-shout-0.8.0-r2
diff --git a/net-misc/shout/files/variables.diff b/net-misc/shout/files/variables.diff
index f0c71c4c661b..afaefbcb2cad 100644
--- a/net-misc/shout/files/variables.diff
+++ b/net-misc/shout/files/variables.diff
@@ -17,4 +17,29 @@ diff -urN shout-0.8.0/Makefile.in shout-0.8.0-modified/Makefile.in
 +logdir = /var/log/shout
  
  DEFS = -I. @DEFS@
+
+--- shout-0.8.0/configure	2000-04-20 09:41:45.000000000 +0200
++++ shout-0.8.0/configure	2004-07-17 17:17:40.000000000 +0200
+@@ -532,20 +532,10 @@
+         prefix=$prefix
+ fi
  
+-if test "x$enable_fsstd" = "xyes"; then
+         echo "FSSTD ENABLED"
+         BINDIR="/usr/bin"
+-        ETCDIR="/etc/icecast"
+-        LOGDIR="/var/log/icecast"
+-else
+-        echo "FSSTD DISABLED"
+-        BINDIR="${prefix}/icecast/bin"
+-        ETCDIR="${prefix}/icecast/etc"
+-        LOGDIR="${prefix}/icecast/log"
+-fi
+-
+-
+-
++        ETCDIR="/etc/shout"
++        LOGDIR="/var/log/shout"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/net-misc/shout/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/net-misc/shout/shout-0.8.0-r1.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
index 2407ad9d8785..3768770be674 100644
--- a/net-misc/shout/shout-0.8.0-r1.ebuild
+++ b/net-misc/shout/shout-0.8.0-r2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r1.ebuild,v 1.13 2004/08/08 14:09:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.1 2004/09/05 22:35:01 eradicator Exp $
 
 IUSE=""
+
+inherit eutils
+
 DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
 SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
 HOMEPAGE="http://www.icecast.org"
@@ -13,16 +16,15 @@ SLOT="0"
 DEPEND="virtual/libc"
 
 src_unpack() {
-
 	unpack ${A}
+
 	cd ${S}
-	patch -p1 < ${FILESDIR}/variables.diff
-	rm -f sock.o
+	epatch ${FILESDIR}/variables.diff
 
+	rm -f sock.o
 }
 
 src_compile() {
-
 	./configure --prefix=/usr \
 		--host=${CHOST} \
 		--sysconfdir=/etc/shout \
@@ -35,5 +37,10 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
+	keepdir /var/log/shout
+	fowners root:audio /var/log/shout
+	fperms 775 /var/log/shout
+	fperms 755 /etc/shout
+	fperms 644 /etc/shout/shout.conf.dist
 	dodoc BUGS CREDITS README.shout TODO
 }
diff --git a/net-misc/shout/shout-0.8.0.ebuild b/net-misc/shout/shout-0.8.0.ebuild
deleted file mode 100644
index 3120cfe375c4..000000000000
--- a/net-misc/shout/shout-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0.ebuild,v 1.14 2004/08/08 14:09:29 kloeri Exp $
-
-IUSE=""
-DESCRIPTION="Shout is a program for creating a mp3 stream for use with icecast or shoutcast"
-SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
-HOMEPAGE="http://www.icecast.org"
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	rm -f sock.o
-	./configure --prefix=/usr		\
-		--infodir=/usr/share/info   \
-				--mandir=/usr/share/man     \
-				--host=${CHOST} || die
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc BUGS CREDITS README.shout TODO
-}