Moved to -amd64, -sparc as the package compiles but crashes at startup.

6 files changed, 35 insertions, 33 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index e6340831ce5c..940f5a3bf110 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,13 +1,25 @@
 # ChangeLog for media-sound/solfege
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.8 2004/10/07 03:30:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.9 2004/11/19 22:55:30 eradicator Exp $
+
+*solfege-2.0.6 (19 Nov 2004)
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -solfege-2.0.4.ebuild, solfege-2.0.5.ebuild, +solfege-2.0.6.ebuild:
+  Moved to -amd64, -sparc as the package compiles but crashes at startup.
+
+*solfege-2.0.6 (19 Nov 2004)
+
+  19 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -solfege-2.0.4.ebuild, solfege-2.0.5.ebuild, +solfege-2.0.6.ebuild:
+  Version bump.
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   solfege-2.0.5.ebuild:
   get_libdir fixes.
 
   03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.5.ebuild:
-  Stable amd64, x86.
+  Stable x86.
 
 *solfege-2.0.5 (30 Jul 2004)
 
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index e797c7335c98..3c7b7400dc55 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a087e42b48eb427ba96ea875b42f663f ChangeLog 1190
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 5b2b18d97334608f6a95735d2bf994c3 solfege-2.0.4.ebuild 2393
 MD5 57ac1d95098acbea35a2b2e46c8e627e solfege-2.0.5.ebuild 2328
+MD5 57ac1d95098acbea35a2b2e46c8e627e solfege-2.0.6.ebuild 2328
 MD5 a935b63a600c678e02199cb3e642981f files/digest-solfege-2.0.4 65
 MD5 4feeb666e6f701c7bb9f30077b9a75bd files/digest-solfege-2.0.5 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZOriArHZZzCEUG0RAsx4AJ9ZOt/N3gj0DlIfqw0WDSsbOKfGSwCggxJa
-SgTTv5yrizjsTUYZPwbFcVc=
-=N22j
------END PGP SIGNATURE-----
+MD5 1f6fe78cd9b8f64575cfa82ebbb4820f files/digest-solfege-2.0.6 65
diff --git a/media-sound/solfege/files/digest-solfege-2.0.4 b/media-sound/solfege/files/digest-solfege-2.0.4
deleted file mode 100644
index 9d6a6ade52bc..000000000000
--- a/media-sound/solfege/files/digest-solfege-2.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d93a3d7a03e4a76941f536dbe7041c8 solfege-2.0.4.tar.gz 498862
diff --git a/media-sound/solfege/files/digest-solfege-2.0.6 b/media-sound/solfege/files/digest-solfege-2.0.6
new file mode 100644
index 000000000000..701b08edc4d7
--- /dev/null
+++ b/media-sound/solfege/files/digest-solfege-2.0.6
@@ -0,0 +1 @@
+MD5 3a44e123c0b78996a07d59f5cc836c58 solfege-2.0.6.tar.gz 554448
diff --git a/media-sound/solfege/solfege-2.0.5.ebuild b/media-sound/solfege/solfege-2.0.5.ebuild
index 5086d19c0ff0..7ae3cb2fe234 100644
--- a/media-sound/solfege/solfege-2.0.5.ebuild
+++ b/media-sound/solfege/solfege-2.0.5.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.5.ebuild,v 1.4 2004/10/07 07:05:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.5.ebuild,v 1.5 2004/11/19 22:55:30 eradicator Exp $
+
+IUSE="gtkhtml gnome oss"
 
 inherit python eutils
 
-IUSE="gtkhtml gnome oss"
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="-amd64 x86"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.0
diff --git a/media-sound/solfege/solfege-2.0.4.ebuild b/media-sound/solfege/solfege-2.0.6.ebuild
index c0cb29c1b654..2233d8b72f59 100644
--- a/media-sound/solfege/solfege-2.0.4.ebuild
+++ b/media-sound/solfege/solfege-2.0.6.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.5 2004/07/20 06:33:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-2.0.6.ebuild,v 1.1 2004/11/19 22:55:30 eradicator Exp $
 
-inherit python
+IUSE="gtkhtml gnome oss"
+
+inherit python eutils
 
-IUSE="gtkhtml gnome" # see bug #43889 oss"
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
-HOMEPAGE="http://solfege.sourceforge.net/"
+HOMEPAGE="http://www.solfege.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="-amd64 -sparc ~x86"
 
-RDEPEND=">=dev-lang/python-2.2
+RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.0
 	>=dev-python/pygtk-2.0
 	gnome? ( >=dev-python/gnome-python-2.0 )
 	gtkhtml? ( =gnome-extra/libgtkhtml-2*
-	>=dev-python/gnome-python-2.0 )"
+	           >=dev-python/gnome-python-2.0 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -27,7 +28,7 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	dev-libs/libxslt
 	sys-apps/sed
-	=app-text/docbook-xsl-stylesheets-1.62*"
+	=app-text/docbook-xsl-stylesheets-1.6*"
 
 pkg_setup() {
 	# die if user wants gtkhtml but it is not enable in gnome-python
@@ -35,7 +36,7 @@ pkg_setup() {
 	#  which needs X11, and breaks in console)
 	use gtkhtml \
 		&& python_version \
-		&& [ ! -f ${ROOT}usr/lib/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
+		&& [ ! -f ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0/gtkhtml2.so ] \
 		&& eerror "Could not find the GTKHtml2 python module, whereas gtkhml is in your flags." \
 		&& eerror "Please re-emerge \"dev-python/gnome-python\" with \"gtkhtml\" USE flag on." \
 		&& die "You will have to re-emerge gnome-python."
@@ -54,26 +55,22 @@ src_unpack() {
 
 src_compile() {
 	# Try to figure out where is this damn stylesheet
-	local xslloc=$( ls /usr/share/sgml/docbook/xsl-stylesheets-1.62*/html/chunk.xsl | tail -n 1 )
+	local xslloc=$( ls /usr/share/sgml/docbook/xsl-stylesheets-1.6*/html/chunk.xsl | tail -n 1 )
 	[ -n "$xslloc" ] || die "XSL stylesheet not found"
 
 	econf --enable-docbook-stylesheet=${xslloc} \
 		`use_with gnome` \
 		`use_with gtkhtml` \
-		--enable-oss-sound \
+		`use_enable oss oss-sound` \
 		|| die "Configuration failed."
 
-		# See bug #43889
-		# `use_enable oss oss-sound` \
-
-
 	emake || die "Compilation failed."
 }
 
 src_install() {
-#borks	make DESTDIR=${D} install || die "Installation failed."
+#	make DESTDIR=${D} install || die "Installation failed."
 	einstall || die "Installation failed."
 	rm -f ${D}usr/bin/${PN}${PV}
-	dodoc AUTHORS changelog COPYING FAQ INSTALL README TODO TRANSLATING
+	dodoc AUTHORS changelog COPYING FAQ INSTALL README TODO
 }