Fixed wrong use flag and $ROOT missing, Bug 101874.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 23 insertions, 15 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index 9c5c3b1a4e1b..0be89255d058 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.12 2005/05/29 00:57:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.13 2005/09/04 12:25:40 matsuu Exp $
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> snack-2.2.4.ebuild,
+  snack-2.2.9.ebuild:
+  Fixed wrong use flag and $ROOT missing, Bug 101874.
 
   29 May 2005; MATSUU Takuto <matsuu@gentoo.org> -snack-2.2.2.ebuild,
   snack-2.2.9.ebuild:
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index f71078e4ac87..678591d7c81b 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,6 +1,6 @@
-MD5 ce4b5e59c0d92eb9a331e94733aa3059 snack-2.2.9.ebuild 1243
-MD5 2f21c51233236e46b8e9b1edf51f8fe0 snack-2.2.4.ebuild 925
-MD5 8cd97b44828966f00a97a5341c845be7 ChangeLog 1652
+MD5 bb27e43ff35208fd8b12cd3ceef0d737 snack-2.2.9.ebuild 1248
+MD5 5a4052c7684071e031fdb4f86525a74f snack-2.2.4.ebuild 1034
+MD5 12b4fcddb9d48b03c42484b4df680a57 ChangeLog 1798
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 MD5 8e813d1b26f44d74f03f10da53a8c125 files/digest-snack-2.2.4 63
 MD5 4616a4637186b5f1f11315a2b7e8748c files/digest-snack-2.2.9 63
diff --git a/dev-tcltk/snack/snack-2.2.4.ebuild b/dev-tcltk/snack/snack-2.2.4.ebuild
index 43bd106c65fb..785c032bff71 100644
--- a/dev-tcltk/snack/snack-2.2.4.ebuild
+++ b/dev-tcltk/snack/snack-2.2.4.ebuild
@@ -1,8 +1,9 @@
 # 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.4.ebuild,v 1.8 2005/03/05 08:49:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.4.ebuild,v 1.9 2005/09/04 12:25:40 matsuu Exp $
 
-IUSE="alsa oggvorbis"
+inherit eutils
+IUSE="alsa vorbis"
 
 DESCRIPTION="The Snack Sound Toolkit (Tcl)"
 HOMEPAGE="http://www.speech.kth.se/snack/"
@@ -14,7 +15,7 @@ SLOT="0"
 
 DEPEND=">dev-lang/tcl-8.4.3
 	>dev-lang/tk-8.4.3
-	oggvorbis? ( media-libs/libogg )"
+	vorbis? ( media-libs/libvorbis )"
 
 S=${WORKDIR}/${PN}${PV}/unix
 
@@ -23,7 +24,10 @@ src_compile() {
 
 	use alsa && myconf="${myconf} --enable-alsa"
 
-	use oggvorbis && myconf="${myconf} --enable-ogg"
+	if use vorbis ; then
+		myconf="${myconf} --with-ogg-include=${ROOT}/usr/include"
+		myconf="${myconf} --with-ogg-lib=${ROOT}/usr/$(get_libdir)"
+	fi
 
 	econf ${myconf} || die "configure failed"
 
diff --git a/dev-tcltk/snack/snack-2.2.9.ebuild b/dev-tcltk/snack/snack-2.2.9.ebuild
index 2b31fe285175..0f60dbd26cdf 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.2 2005/05/29 00:57:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.9.ebuild,v 1.3 2005/09/04 12:25:40 matsuu Exp $
 
 inherit eutils
 
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/~kare/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
-IUSE="alsa ogg python threads"
+IUSE="alsa python threads vorbis"
 
 DEPEND=">dev-lang/tcl-8.4.3
 	>dev-lang/tk-8.4.3
 	alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	python? ( virtual/python )"
 
 S="${WORKDIR}/${PN}${PV}"
@@ -27,9 +27,9 @@ src_compile() {
 	use alsa && myconf="${myconf} --enable-alsa"
 	use threads && myconf="${myconf} --enable-threads"
 
-	if use ogg; then
-		myconf="${myconf} --with-ogg-include=/usr/include"
-		myconf="${myconf} --with-ogg-lib=/usr/$(get_libdir)"
+	if use vorbis ; then
+		myconf="${myconf} --with-ogg-include=${ROOT}/usr/include"
+		myconf="${myconf} --with-ogg-lib=${ROOT}/usr/$(get_libdir)"
 	fi
 
 	cd ${S}/unix