'Dont make use of the deprecated oggvorbis useflag any longer, see #94254. 0.9.1 stable on amd64.

(Portage version: 2.0.51.22-r1)

8 files changed, 22 insertions, 308 deletions

diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog
index edc0d3dfeb4f..e4e9e0be2397 100644
--- a/media-sound/muse/ChangeLog
+++ b/media-sound/muse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/muse
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.15 2005/01/29 14:01:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.16 2005/05/28 13:51:02 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/muse-0.8.1-strings.patch, -muse-0.7.2.ebuild,
+  -muse-0.8.1-r1.ebuild, muse-0.9.1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
+  0.9.1 stable on amd64.
 
   29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> muse-0.9.1.ebuild:
   added ~amd64 to KEYWORDS. fixes #79925
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 9041e6eb4847..102da2831ec4 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,14 +1,9 @@
 MD5 92720495f557964f0ed682102113bf9e muse-0.9.ebuild 1208
-MD5 408839a994f54226aedf712e7ce7c632 muse-0.9.1.ebuild 1284
-MD5 9f498ff5588bada98a349b751484d339 muse-0.7.2.ebuild 1683
-MD5 e7bf7045ee50aa478f33f691eba75bbe ChangeLog 1928
+MD5 fa040b5790fd4bd74827fb2d392c1a78 muse-0.9.1.ebuild 1327
+MD5 f5b02c3bebf9222e63833d9e3365ae0c ChangeLog 2181
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 5002f92e5fd0f22e6ef9a03ff8333157 muse-0.8.1-r1.ebuild 1154
 MD5 4ae600228fc21c5df407174af307f157 files/muse-0.9.1-miscfixes.patch 1914
 MD5 e3cdfa1976dbb65fae01a6e45ed737f8 files/muse-0.9-locale-Makefile.patch 267
 MD5 7c0ac892f30b155f79f3588857ab378f files/muse-0.9.1-include.patch 549
-MD5 ca45a20943701e9471058cb047e25b9a files/muse-0.8.1-strings.patch 7870
-MD5 db2be964bea7450de6d4cbfb7f071c34 files/digest-muse-0.8.1-r1 62
-MD5 c8ff39e0c7d648cde748b5bc727f8622 files/digest-muse-0.7.2 62
 MD5 7163bb4ec5bd71ef481511af79dfe698 files/digest-muse-0.9.1 63
 MD5 45c92a3f89ef7adfee831d69fe5ea32f files/digest-muse-0.9 61
diff --git a/media-sound/muse/files/digest-muse-0.7.2 b/media-sound/muse/files/digest-muse-0.7.2
deleted file mode 100644
index f3b004662f99..000000000000
--- a/media-sound/muse/files/digest-muse-0.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbeaf1f338fa004638ba1d719006a3ed MuSE-0.7.2.tar.gz 557168
diff --git a/media-sound/muse/files/digest-muse-0.8.1-r1 b/media-sound/muse/files/digest-muse-0.8.1-r1
deleted file mode 100644
index 57215dc55dbd..000000000000
--- a/media-sound/muse/files/digest-muse-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ca2c62aa2db10f92ee5a864da736e34 MuSE-0.8.1.tar.gz 624750
diff --git a/media-sound/muse/files/muse-0.8.1-strings.patch b/media-sound/muse/files/muse-0.8.1-strings.patch
deleted file mode 100644
index f41cc904653c..000000000000
--- a/media-sound/muse/files/muse-0.8.1-strings.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -Naur MuSE-0.8.1.orig/gtkgui/listpack.cpp MuSE-0.8.1/gtkgui/listpack.cpp
---- MuSE-0.8.1.orig/gtkgui/listpack.cpp	2003-03-28 09:27:34.000000000 -0800
-+++ MuSE-0.8.1/gtkgui/listpack.cpp	2004-03-03 04:04:05.000000000 -0800
-@@ -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;
-diff -Naur MuSE-0.8.1.orig/ncursesgui/about.cpp MuSE-0.8.1/ncursesgui/about.cpp
---- MuSE-0.8.1.orig/ncursesgui/about.cpp	2002-05-30 06:56:45.000000000 -0700
-+++ MuSE-0.8.1/ncursesgui/about.cpp	2004-03-03 04:04:05.000000000 -0800
-@@ -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.7.2.ebuild b/media-sound/muse/muse-0.7.2.ebuild
deleted file mode 100644
index 926e91bd4059..000000000000
--- a/media-sound/muse/muse-0.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.7.2.ebuild,v 1.8 2005/01/21 21:29:29 luckyduck 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/libc
-	>=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/libc
-	>=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 || die "econf failed"
-
-	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
-}
diff --git a/media-sound/muse/muse-0.8.1-r1.ebuild b/media-sound/muse/muse-0.8.1-r1.ebuild
deleted file mode 100644
index 434361207d97..000000000000
--- a/media-sound/muse/muse-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.4 2005/01/21 21:29:29 luckyduck 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.9.1.ebuild b/media-sound/muse/muse-0.9.1.ebuild
index 08eebeda534e..091664b420d4 100644
--- a/media-sound/muse/muse-0.9.1.ebuild
+++ b/media-sound/muse/muse-0.9.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.1.ebuild,v 1.2 2005/01/29 14:01:37 luckyduck Exp $
-
-IUSE="ncurses gtk debug"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.1.ebuild,v 1.3 2005/05/28 13:51:02 luckyduck Exp $
 
 inherit eutils
 
@@ -13,9 +11,10 @@ DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
 SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
 HOMEPAGE="http://muse.dyne.org/"
 
-KEYWORDS="~ppc sparc x86 ~amd64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc sparc x86 amd64"
+IUSE="ncurses gtk debug"
 
 DEPEND="media-sound/lame
 	media-libs/libvorbis
@@ -36,21 +35,24 @@ src_unpack() {
 
 src_compile() {
 	econf \
-	`use_with gtk x` \
-	`use_with ncurses rubik` \
-	`use_enable debug` || die "econf failed"
+		$(use_enable debug) \
+		$(use_with gtk x) \
+		$(use_with ncurses rubik) \
+		|| die "econf failed"
 
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" || die "emake failed"
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" \
+		|| die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	rm -rf ${D}/usr/doc
 	dodoc AUTHORS ChangeLog NEWS README TODO KNOWN-BUGS USAGE
 }
 
 pkg_postinst() {
 	einfo
-	einfo "You may want to have a look at /usr/share/doc/${PF}/README.gz for more info."
+	einfo "You may want to have a look at /usr/share/doc/${PF}/README.gz"
+	einfo "for more info."
 	einfo
 }