use ogg useflag instead of oggvorbis, Bug 94254.

Package-Manager: portage-2.0.51.19

5 files changed, 12 insertions, 46 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index 6cb69865e9a9..9c5c3b1a4e1b 100644
--- a/dev-tcltk/snack/ChangeLog
+++ b/dev-tcltk/snack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/snack
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.11 2005/04/02 23:39:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.12 2005/05/29 00:57:17 matsuu Exp $
+
+  29 May 2005; MATSUU Takuto <matsuu@gentoo.org> -snack-2.2.2.ebuild,
+  snack-2.2.9.ebuild:
+  use ogg useflag instead of oggvoribs, Bug 94254.
 
 *snack-2.2.9 (02 Apr 2005)
 
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index cbc8fbf5585e..f71078e4ac87 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,8 +1,6 @@
-MD5 1512d3dd6b6e29433468c28ece06326f snack-2.2.2.ebuild 842
-MD5 d54370d9a15165559b579e1ad7beaefd snack-2.2.9.ebuild 1266
+MD5 ce4b5e59c0d92eb9a331e94733aa3059 snack-2.2.9.ebuild 1243
 MD5 2f21c51233236e46b8e9b1edf51f8fe0 snack-2.2.4.ebuild 925
-MD5 3436030f8d6254ecea6c5aab12e4998b ChangeLog 1508
+MD5 8cd97b44828966f00a97a5341c845be7 ChangeLog 1652
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
-MD5 da83f504b7b5bde4548f3097547b7fb4 files/digest-snack-2.2.2 63
 MD5 8e813d1b26f44d74f03f10da53a8c125 files/digest-snack-2.2.4 63
 MD5 4616a4637186b5f1f11315a2b7e8748c files/digest-snack-2.2.9 63
diff --git a/dev-tcltk/snack/files/digest-snack-2.2.2 b/dev-tcltk/snack/files/digest-snack-2.2.2
deleted file mode 100644
index 07c4ed3f7dfd..000000000000
--- a/dev-tcltk/snack/files/digest-snack-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb042afec8f593ff20592a22986bd091 snack2.2.2.tar.gz 1187640
diff --git a/dev-tcltk/snack/snack-2.2.2.ebuild b/dev-tcltk/snack/snack-2.2.2.ebuild
deleted file mode 100644
index 8d9afe3b77ef..000000000000
--- a/dev-tcltk/snack/snack-2.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.2.ebuild,v 1.6 2005/01/01 13:16:20 corsair Exp $
-
-IUSE="alsa oggvorbis"
-
-DESCRIPTION="The Snack Sound Toolkit (Tcl)"
-HOMEPAGE="http://www.speech.kth.se/snack/"
-SRC_URI="http://www.speech.kth.se/~kare/${PN}${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">dev-lang/tcl-8.0.5
-	>dev-lang/tk-8.0.5
-	oggvorbis? ( media-libs/libogg )"
-
-S=${WORKDIR}/${PN}${PV}/unix
-
-src_compile() {
-	local myconf="--enable-threads"
-
-	use alsa && myconf="${myconf} --enable-alsa"
-
-	use oggvorbis && myconf="${myconf} --enable-ogg"
-
-	econf ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D}usr install || die "make install failed"
-}
diff --git a/dev-tcltk/snack/snack-2.2.9.ebuild b/dev-tcltk/snack/snack-2.2.9.ebuild
index b540b654afa2..2b31fe285175 100644
--- a/dev-tcltk/snack/snack-2.2.9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.9.ebuild,v 1.1 2005/04/02 23:39:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.9.ebuild,v 1.2 2005/05/29 00:57:17 matsuu Exp $
 
 inherit eutils
 
@@ -11,12 +11,12 @@ SRC_URI="http://www.speech.kth.se/~kare/${PN}${PV}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
 SLOT="0"
-IUSE="alsa oggvorbis python threads"
+IUSE="alsa ogg python threads"
 
 DEPEND=">dev-lang/tcl-8.4.3
 	>dev-lang/tk-8.4.3
 	alsa? ( media-libs/alsa-lib )
-	oggvorbis? ( media-libs/libogg media-libs/libvorbis )
+	ogg? ( media-libs/libogg media-libs/libvorbis )
 	python? ( virtual/python )"
 
 S="${WORKDIR}/${PN}${PV}"
@@ -27,8 +27,8 @@ src_compile() {
 	use alsa && myconf="${myconf} --enable-alsa"
 	use threads && myconf="${myconf} --enable-threads"
 
-	if use oggvorbis ; then
-		myconf="${myconf} --with-ogg-include=/usr/include/ogg"
+	if use ogg; then
+		myconf="${myconf} --with-ogg-include=/usr/include"
 		myconf="${myconf} --with-ogg-lib=/usr/$(get_libdir)"
 	fi