Fix multi-line strings. vorbis is required. Fixes bug #32933.

6 files changed, 245 insertions, 68 deletions

diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog
index b5ea6d2699c4..da1c43f5c9fa 100644
--- a/media-sound/muse/ChangeLog
+++ b/media-sound/muse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/muse
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.3 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.4 2004/03/03 11:58:36 eradicator Exp $
+
+*muse-0.8.1-r1 (03 Mar 2004)
+
+  03 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.8.1-r1.ebuild,
+  files/muse-0.8.1-strings.patch:
+  Fix multi-line strings.  vorbis is required.  Fixes bug #32933.
+
+*muse-0.8.1 (27 Sep 2003)
 
   27 Sep 2003; jje <jje@gentoo.org> :
   Version bump.
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index fb35ba70d926..e2b45f55bbed 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,6 +1,7 @@
-MD5 36d8c7e9395ef7b4693ada17d3db2685 muse-0.8.1.ebuild 1667
-MD5 1fa07cc326cb11840f979e768b57f0df muse-0.7.2.ebuild 1671
-MD5 abaf18f016cfa1d92a5dec22eb61c2c2 ChangeLog 429
+MD5 35f648dacffc9ccc15fe77b300e82417 muse-0.7.2.ebuild 1673
+MD5 b325c5d32b6036454a97d0d1370265ac ChangeLog 673
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 67a56fef275a0119e7ec10c8f84924a6 muse-0.8.1-r1.ebuild 1165
+MD5 57ab2160f4cf8faa84742d1c0215ba3c files/muse-0.8.1-strings.patch 7961
+MD5 db2be964bea7450de6d4cbfb7f071c34 files/digest-muse-0.8.1-r1 62
 MD5 c8ff39e0c7d648cde748b5bc727f8622 files/digest-muse-0.7.2 62
-MD5 db2be964bea7450de6d4cbfb7f071c34 files/digest-muse-0.8.1 62
diff --git a/media-sound/muse/files/digest-muse-0.8.1 b/media-sound/muse/files/digest-muse-0.8.1-r1
index 57215dc55dbd..57215dc55dbd 100644
--- a/media-sound/muse/files/digest-muse-0.8.1
+++ b/media-sound/muse/files/digest-muse-0.8.1-r1
diff --git a/media-sound/muse/files/muse-0.8.1-strings.patch b/media-sound/muse/files/muse-0.8.1-strings.patch
new file mode 100644
index 000000000000..100b49cbfda3
--- /dev/null
+++ b/media-sound/muse/files/muse-0.8.1-strings.patch
@@ -0,0 +1,180 @@
+--- gtkgui/listpack.cpp	2003-03-28 18:27:34.000000000 +0100
++++ gtkgui/listpack.cpp	2003-09-30 11:56:50.000000000 +0200
+@@ -49,9 +49,7 @@
+ 	item->container = container;
+ 	item->data = data;
+ 
+-	func("list_add:: item %p item->pos = %u
+-			item->container= %p item->data=%p", item, item->pos,
+-			item->container, item->data);
++	func("list_add:: item %p item->pos = %u item->container= %p item->data=%p", item, item->pos, item->container, item->data);
+ 	/**list = g_list_append(*list, (void *) item);*/
+ 	*list = g_list_insert(*list, (void *) item, pos-1);
+ 	return true;
+--- ncursesgui/about.cpp	2002-05-30 08:56:45.000000000 -0500
++++ ncursesgui/about.cpp	2003-08-15 11:12:11.000000000 -0500
+@@ -15,7 +15,7 @@
+  * this source code; if not, write to:
+  * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+- * $Id: muse-0.8.1-strings.patch,v 1.1 2004/03/03 11:58:36 eradicator Exp $
++ * $Id: muse-0.8.1-strings.patch,v 1.1 2004/03/03 11:58:36 eradicator Exp $
+  *
+  */
+ 
+@@ -58,81 +58,80 @@
+ 	warning ("aboutbox::setitem()");
+ 	char src[8192];
+ 	snprintf (src, sizeof(src),
+-"MuSE is a [ d y n e . o r g ] production! :)
+-		
+-MuSE <-------------------------------> Multiple Streaming Engine 
+-MuSE is an application for the mixing, encoding, and streaming of sound:
+-is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis
+-audio files from the hard drive or the network, where each channel of 
+-audio can be dynamicly adjusted for speed and volume plus a soundcard 
+-line-in channel. The resulting stream can be played locally on the sound 
+-card and/or encoded as an mp3 network stream to an icecast or shoutcast 
+-server (ready to be mixed and played again by other muses... ;)
+-
+-MuSE has been created and is mantained by 
+-Denis Rojo aka jaromil <jaromil@dyne.org>
+-The GTK+ graphical user interface is developed by 
+-nightolo <night@autistici.org>
+-The ncurses user interface is developed by
+-Luca Profico aka rubik <rubik@olografix.org>
+-
+-MuSE as it is now would have never existed without the contributions of:
+-= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming 
+-  multiple files
+-= August Black ( aug.ment.org ) for the original graphical user interface
+-= SERVUS.AT for trusting this project since the beginning and supporting it
+-= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new 
+-  horizons of use
+-= Asbesto Molesto ( freaknet.org ) for the extensive testing and 
+-  documentation
+-= Alex, Rasty and Martinez ( ! ) for the good karma
+-
+-also BIG THANKS to:
+-lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII 
+-squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO, 
+-bundes & didi, indymedia italy, neural.it, the autistici.org collective, 
+-mag-one, radio onda rossa and all the others i'm forgetting here!
+-	
+-MuSE redistributes, linking statically, the following libraries:
+-= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)
+-= libshout by Jack Moffit, Chad Armstrong and Scott Manley
+-= libcdk by Mike Glover
+-
+-(refer to documentation included into subdirectories for more informations)
+-
+-MuSE can link dinamically to the following libraries:
+-= libogg, libvorbis, libvorbisfile - www.xiph.org
+-= glib, libgdk, libgtk - www.gtk.org
+-= liblame - www.mp3dev.org/mp3
+-= libX11, libXext - www.xfree86.org
+-= other common GNU libraries
+-
+-MuSE sourcecode also got inspirations from:
+-= stream mixer code by Scott Manley
+-= buffered FIFO pipe code by Charles Samuels.
+-
+-
+-MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil
+-MuSE's GTK+ G.U.I. is (c) 2002 by nightolo
+-MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik
+-
+-
+-
+----------------------------------------------------------------
+-This source code is free software; you can redistribute it and/or
+-modify it under the terms of the GNU Public License as published 
+-by the Free Software Foundation; either version 2 of the License,
+-or (at your option) any later version.
+-
+-This source code is distributed in the hope that it will be useful,
+-but WITHOUT ANY WARRANTY; without even the implied warranty of
+-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-Please refer to the GNU Public License for more details.
+-
+-You should have received a copy of the GNU Public License along with
+-this source code; if not, write to:
+-Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-");
++"MuSE is a [ d y n e . o r g ] production! :)"
++" "
++"MuSE <-------------------------------> Multiple Streaming Engine" 
++"MuSE is an application for the mixing, encoding, and streaming of sound:"
++"is an engine that can simultaniously mix up to 6 separate MP3 or OggVorbis"
++"audio files from the hard drive or the network, where each channel of"
++"audio can be dynamicly adjusted for speed and volume plus a soundcard"
++"line-in channel. The resulting stream can be played locally on the sound"
++"card and/or encoded as an mp3 network stream to an icecast or shoutcast"
++"server (ready to be mixed and played again by other muses... ;)"
++" "
++"MuSE has been created and is mantained by"
++"Denis Rojo aka jaromil <jaromil@dyne.org>"
++"The GTK+ graphical user interface is developed by"
++"nightolo <night@autistici.org>"
++"The ncurses user interface is developed by"
++"Luca Profico aka rubik <rubik@olografix.org>"
++" "
++"MuSE as it is now would have never existed without the contributions of:"
++"= Markus Seidl ( funda.ment.org ) for the idea of mixing and streaming"
++"  multiple files"
++"= August Black ( aug.ment.org ) for the original graphical user interface"
++"= SERVUS.AT for trusting this project since the beginning and supporting it"
++"= PUBLIC VOICE Lab ( pvl.at ) for recently giving MuSE support and new"
++"  horizons of use"
++"= Asbesto Molesto ( freaknet.org ) for the extensive testing and "
++"  documentation"
++"= Alex, Rasty and Martinez ( ! ) for the good karma"
++" "
++"also BIG THANKS to:"
++"lobo, voyager, void, blicero, saiborg, the freaknet medialab, the ASCII"
++"squat, henk, the imc-audio collective, jeff, the LOA hacklab, the TPO,"
++"bundes & didi, indymedia italy, neural.it, the autistici.org collective,"
++"mag-one, radio onda rossa and all the others i'm forgetting here!"
++" "	
++"MuSE redistributes, linking statically, the following libraries:"
++"= libmpeg by Woo-jae Jung (now mantained by Mikael Hedin)"
++"= libshout by Jack Moffit, Chad Armstrong and Scott Manley"
++"= libcdk by Mike Glover"
++" "
++"(refer to documentation included into subdirectories for more informations)"
++" "
++"MuSE can link dinamically to the following libraries:"
++"= libogg, libvorbis, libvorbisfile - www.xiph.org"
++"= glib, libgdk, libgtk - www.gtk.org"
++"= liblame - www.mp3dev.org/mp3"
++"= libX11, libXext - www.xfree86.org"
++"= other common GNU libraries"
++" "
++"MuSE sourcecode also got inspirations from:"
++"= stream mixer code by Scott Manley"
++"= buffered FIFO pipe code by Charles Samuels."
++" "
++" "
++"MuSE is copyright (c) 2000, 2001, 2002 by Denis Rojo aka jaromil"
++"MuSE's GTK+ G.U.I. is (c) 2002 by nightolo"
++"MuSE's ncurses console U.I is (c) 2002 by Luca Profico aka rubik"
++" "
++" "
++" "
++"---------------------------------------------------------------"
++"This source code is free software; you can redistribute it and/or"
++"modify it under the terms of the GNU Public License as published"
++"by the Free Software Foundation; either version 2 of the License,"
++"or (at your option) any later version."
++" "
++"This source code is distributed in the hope that it will be useful,"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++"Please refer to the GNU Public License for more details."
++" "
++"You should have received a copy of the GNU Public License along with"
++"this source code; if not, write to:"
++"Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.");
+ 
+ 	item = splitstring(src);
+ }
diff --git a/media-sound/muse/muse-0.8.1-r1.ebuild b/media-sound/muse/muse-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..7febfecbe4bf
--- /dev/null
+++ b/media-sound/muse/muse-0.8.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.8.1-r1.ebuild,v 1.1 2004/03/03 11:58:36 eradicator Exp $
+
+inherit eutils
+
+MY_P=${PN/muse/MuSE}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+SRC_URI="http://savannah.nongnu.org/download/muse/${MY_P}.tar.gz"
+HOMEPAGE="http://muse.dyne.org/"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="ncurses gtk debug"
+
+DEPEND="media-sound/lame
+	media-libs/libvorbis
+	sys-libs/zlib
+	sys-apps/sed
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( =x11-libs/gtk+-1*
+	>=dev-libs/glib-1 )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-strings.patch
+}
+
+src_compile() {
+	econf \
+	`use_with gtk x` \
+	`use_with ncurses rubik` \
+	`use_enable debug` || die "econf failed"
+
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin muse
+	dodoc AUTHORS ChangeLog NEWS README TODO USAGE
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You may want to have a look at /usr/share/doc/${PF}/USAGE.gz for more info."
+	einfo
+}
diff --git a/media-sound/muse/muse-0.8.1.ebuild b/media-sound/muse/muse-0.8.1.ebuild
deleted file mode 100644
index d3efefdc258e..000000000000
--- a/media-sound/muse/muse-0.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.8.1.ebuild,v 1.2 2004/03/01 05:37:15 eradicator Exp $
-
-IUSE="ncurses oggvorbis X"
-
-S=${WORKDIR}/${P/muse/MuSE}
-
-DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
-SRC_URI="http://savannah.nongnu.org/download/muse/${P/muse/MuSE}.tar.gz"
-HOMEPAGE="http://muse.dyne.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="virtual/glibc
-	>=sys-apps/portage-2.0.45-r3
-	>=media-sound/lame-3.92
-	>=sys-apps/sed-4.0.5
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	oggvorbis? ( >=media-libs/libogg-1.0 >=media-libs/libvorbis-1.0-r1 )
-	X? ( =x11-libs/gtk+-1* )"
-
-RDEPEND="virtual/glibc
-	>=media-sound/lame-3.92
-	ncurses? ( >=sys-libs/ncurses-5.2 )
-	oggvorbis? ( >=media-libs/libogg-1.0 >=media-libs/libvorbis-1.0-r1 )
-	X? ( =x11-libs/gtk+-1* )"
-
-src_compile() {
-	local xcmd
-
-	# if media-libs/{libogg,libvorbis} are installed, the configure script
-	# will automatically enable oggvorbis support
-	if ! use oggvorbis; then
-		xcmd="s:\"\$have_\(ogg\|vorbis\)\":\"no\":;"
-	fi
-
-	# if sys-libs/ncurses is installed, the configure script will
-	# automatically build the ncurses GUI
-	if ! use ncurses; then
-		xcmd="$xcmd /^GUI_RUBIK/s:true:false:"
-	fi
-
-	[ "$xcmd" ] && sed -i "$xcmd" configure
-
-	econf	`use_with X x` \
-		--disable-debug
-
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "Make failed"
-}
-
-src_install() {
-	dobin muse
-	dodoc AUTHORS ChangeLog NEWS README TODO USAGE
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You may want to have a look at /usr/share/doc/${PF}/USAGE.gz for more info."
-	einfo
-}