Version bump closes bug #58535.

4 files changed, 86 insertions, 2 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 73888c6c5471..2c831d94ca1a 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2004/07/20 06:33:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.6 2004/07/31 01:39:50 eradicator Exp $
+
+*solfege-2.0.5 (30 Jul 2004)
+
+  30 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +solfege-2.0.5.ebuild:
+  Version bump closes bug #58535.
 
   19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> solfege-2.0.4.ebuild:
   Added ~amd64
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index ba95554f666a..ccad090abb65 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,4 +1,6 @@
-MD5 ed696bebc563fbc01dbf440919a864e4 ChangeLog 840
+MD5 6cbda95458277dbaca18c97f0cf9568c ChangeLog 987
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 5b2b18d97334608f6a95735d2bf994c3 solfege-2.0.4.ebuild 2393
+MD5 486125bbe20162b3db03be81a7dee693 solfege-2.0.5.ebuild 2313
 MD5 a935b63a600c678e02199cb3e642981f files/digest-solfege-2.0.4 65
+MD5 4feeb666e6f701c7bb9f30077b9a75bd files/digest-solfege-2.0.5 65
diff --git a/media-sound/solfege/files/digest-solfege-2.0.5 b/media-sound/solfege/files/digest-solfege-2.0.5
new file mode 100644
index 000000000000..0009baae1d17
--- /dev/null
+++ b/media-sound/solfege/files/digest-solfege-2.0.5
@@ -0,0 +1 @@
+MD5 6cf3ebb6088674e8f174b21276b9003c solfege-2.0.5.tar.gz 501368
diff --git a/media-sound/solfege/solfege-2.0.5.ebuild b/media-sound/solfege/solfege-2.0.5.ebuild
new file mode 100644
index 000000000000..b31c143ee868
--- /dev/null
+++ b/media-sound/solfege/solfege-2.0.5.ebuild
@@ -0,0 +1,75 @@
+# 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.1 2004/07/31 01:39:50 eradicator Exp $
+
+inherit python
+
+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"
+
+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 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	=dev-lang/swig-1.3*
+	sys-devel/gettext
+	sys-apps/texinfo
+	dev-libs/libxslt
+	sys-apps/sed
+	=app-text/docbook-xsl-stylesheets-1.6*"
+
+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, 
+	#  which needs X11, and breaks in console)
+	use gtkhtml \
+		&& python_version \
+		&& [ ! -f ${ROOT}usr/lib/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."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv Makefile.in Makefile.in.orig
+	sed -e 's:gnome/apps/Applications:applications:' \
+		< Makefile.in.orig > Makefile.in
+
+	echo 'Categories=Application;AudioVideo;' >> solfege.desktop
+	echo 'Comments=The GNU ear training program' >> solfege.desktop
+}
+
+src_compile() {
+	# Try to figure out where is this damn stylesheet
+	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` \
+		`use_enable oss oss-sound` \
+		|| die "Configuration failed."
+
+	emake || die "Compilation failed."
+}
+
+src_install() {
+#	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
+}
+