summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/timidity++/ChangeLog8
-rw-r--r--media-sound/timidity++/timidity++-2.11.1-r1.ebuild6
-rw-r--r--profiles/default-1.0_rc6/make.defaults2
-rw-r--r--profiles/default-1.0_rc6/use.defaults27
4 files changed, 24 insertions, 19 deletions
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 115a1e5dc4cb..b2352b8c0a18 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/timidity++
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.2 2002/03/28 23:11:12 seemant Exp $
+
+*timidity++-2.11.1-r1 (28 Mar 2002)
+
+ 28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> timidity++-2.11.1-r1.ebuild:
+
+ ogg and vorbis USE flags are now just oggvorbis USE flag.
*timidity++-2.11.1-r1 (1 Feb 2002)
diff --git a/media-sound/timidity++/timidity++-2.11.1-r1.ebuild b/media-sound/timidity++/timidity++-2.11.1-r1.ebuild
index 3930dd72c762..ebce356eea06 100644
--- a/media-sound/timidity++/timidity++-2.11.1-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.11.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.11.1-r1.ebuild,v 1.1 2002/01/15 01:27:50 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.11.1-r1.ebuild,v 1.2 2002/03/28 23:11:12 seemant Exp $
PN=TiMidity++-${PV}
S=${WORKDIR}/${PN}
@@ -18,7 +18,7 @@ DEPEND=">=sys-libs/ncurses-5.0
esd? ( >=media-sound/esound-0.2.22 )
gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
slang? ( >=sys-libs/slang-1.4 )
- vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+ oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
src_compile() {
local myconf
@@ -45,7 +45,7 @@ src_compile() {
myconf="${myconf} --with-default-output=alsa"
fi
[ "`use esd`" ] && audios="${audios},esd"
- [ "`use vorbis`" ] && audios="${audios},vorbis"
+ [ "`use oggvorbis`" ] && audios="${audios},vorbis"
[ "`use nas`" ] && audios="${audios},nas"
./configure --prefix=/usr --host=${CHOST} --mandir=/usr/share/man\
diff --git a/profiles/default-1.0_rc6/make.defaults b/profiles/default-1.0_rc6/make.defaults
index 7c25e802e35b..c025b40ba53c 100644
--- a/profiles/default-1.0_rc6/make.defaults
+++ b/profiles/default-1.0_rc6/make.defaults
@@ -2,5 +2,5 @@
# System-wide defaults for the Portage system
USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl
-python esd gif imlib sdl vorbis ogg gnome gtk X qt kde motif opengl
+python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl
arts cups lame xv"
diff --git a/profiles/default-1.0_rc6/use.defaults b/profiles/default-1.0_rc6/use.defaults
index fee9eec3fef5..a66e1356c059 100644
--- a/profiles/default-1.0_rc6/use.defaults
+++ b/profiles/default-1.0_rc6/use.defaults
@@ -20,35 +20,34 @@ berkdb sys-libs/db
slang sys-libs/slang
readline sys-libs/readline
arts kde-base/kdelibs
-tex app-text/tetex
+tex app-text/tetex
aalib media-libs/aalib
-nas media-libs/nas
+nas media-libs/nas
bonobo gnome-base/bonobo
svga media-libs/svgalib
-ggi media-libs/libggi
+ggi media-libs/libggi
tcltk dev-lang/tcl dev-lang/tk
java virtual/jre
guile dev-util/guile
ruby dev-lang/ruby
mysql dev-db/mysql
postgres dev-db/postgresql
-X x11-base/xfree
-sdl media-libs/libsdl
-gpm sys-libs/gpm
+X x11-base/xfree
+sdl media-libs/libsdl
+gpm sys-libs/gpm
tcpd sys-apps/tcp-wrappers
-pam sys-libs/pam
+pam sys-libs/pam
libwww net-libs/libwww
-ssl dev-libs/openssl
+ssl dev-libs/openssl
perl sys-devel/perl
python dev-lang/python
-esd media-sound/esound
+esd media-sound/esound
imlib media-libs/imlib
-vorbis media-libs/libvorbis
-ogg media-libs/libogg
+oggvorbis media-libs/libvorbis
gnome gnome-base/gnome
-gtk x11-libs/gtk+
-qt x11-libs/qt
-kde kde-base/kde
+gtk x11-libs/gtk+
+qt x11-libs/qt
+kde kde-base/kde
motif x11-libs/openmotif
opengl virtual/opengl
mozilla net-www/mozilla