From 9f34f8057da1dd66e5982d23a078c85497f987f9 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Sun, 21 Mar 2004 04:53:14 +0000
Subject: Forcing oss as it is required... see bug #43889.  Stable x86.

---
 media-sound/solfege/ChangeLog            |  5 ++++-
 media-sound/solfege/Manifest             |  4 ++--
 media-sound/solfege/solfege-2.0.4.ebuild | 17 ++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'media-sound/solfege')

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 30744e91f114..6165b1839e88 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/solfege
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.2 2004/02/10 09:58:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.3 2004/03/21 04:53:14 eradicator Exp $
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
+  Forcing oss as it is required... see bug #43889.  Stable x86.
 
   10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
   Added sed to DEPEND
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index d927e4521477..5f71cde0b67b 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,4 +1,4 @@
-MD5 d98c45e25e271c92c8e2413f910206db solfege-2.0.4.ebuild 2368
-MD5 dcde4c149bb43a56330e7ab5c353c75d ChangeLog 610
+MD5 8f9531c6dada20a2c8117649f83d2257 solfege-2.0.4.ebuild 2415
+MD5 7847801cb0615e58ed6a5a26c1de0dbd ChangeLog 754
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 a935b63a600c678e02199cb3e642981f files/digest-solfege-2.0.4 65
diff --git a/media-sound/solfege/solfege-2.0.4.ebuild b/media-sound/solfege/solfege-2.0.4.ebuild
index 8fcf4203e5f4..34798c22fe27 100644
--- a/media-sound/solfege/solfege-2.0.4.ebuild
+++ b/media-sound/solfege/solfege-2.0.4.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.4.ebuild,v 1.2 2004/02/10 09:58:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.4.ebuild,v 1.3 2004/03/21 04:53:14 eradicator Exp $
 
 inherit python
 
-IUSE="gtkhtml gnome oss"
+IUSE="gtkhtml gnome" # see bug #43889 oss"
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
-HOMEPAGE="http://${PN}.sourceforge.net/"
+HOMEPAGE="http://solfege.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+
 RDEPEND=">=dev-lang/python-2.2
 	>=x11-libs/gtk+-2.0
 	>=dev-python/pygtk-2.0
@@ -29,8 +30,6 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	=app-text/docbook-xsl-stylesheets-1.62*"
 
-S=${WORKDIR}/${P}
-
 pkg_setup() {
 	# die if user wants gtkhtml but it is not enable in gnome-python
 	# (can't use a "python -c 'import gtkhtml2'" test because it imports gtk, 
@@ -62,9 +61,13 @@ src_compile() {
 	econf --enable-docbook-stylesheet=${xslloc} \
 		`use_with gnome` \
 		`use_with gtkhtml` \
-		`use_enable oss oss-sound` \
+		--enable-oss-sound \
 		|| die "Configuration failed."
 
+		# See bug #43889
+		# `use_enable oss oss-sound` \
+
+
 	emake || die "Compilation failed."
 }
 
-- 
cgit v1.2.3-65-gdbad