Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 55 insertions, 57 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index eaa3d4d597c6..7208a9fa3ad0 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/solfege
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.28 2008/12/04 20:48:57 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.29 2009/05/11 13:06:44 ssuominen Exp $
+
+*solfege-3.15.1 (11 May 2009)
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +solfege-3.15.1.ebuild:
+  Version bump wrt #250818 and #250819, thanks to Gokdeniz Karadag for
+  reporting.
 
   04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> solfege-3.8.2.ebuild,
   solfege-3.10.3.ebuild, solfege-3.10.4.ebuild:
@@ -14,15 +21,15 @@
 
 *solfege-3.10.3 (17 Apr 2008)
 
-  17 Apr 2008; Samuli Suominen <drac@gentoo.org> -solfege-3.10.2.ebuild,
+  17 Apr 2008; Samuli Suominen <ssuominen@gentoo.org> -solfege-3.10.2.ebuild,
   +solfege-3.10.3.ebuild:
   Version bump wrt #215666, thanks to Tim Harder for reporting. Make sure
   python doesn't get byte-compiled at install time wrt #210305.
 
 *solfege-3.10.2 (15 Feb 2008)
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org> +solfege-3.10.2.ebuild:
-  Version bump wrt 209788 by Tim H.
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> +solfege-3.10.2.ebuild:
+  Version bump wrt 209788 by Tim Harder.
 
   24 Nov 2007; Dawid Węgliński <cla@gentoo.org> -solfege-3.6.0.ebuild,
   solfege-3.8.2.ebuild:
@@ -30,12 +37,12 @@
 
 *solfege-3.8.2 (17 Oct 2007)
 
-  17 Oct 2007; Samuli Suominen <drac@gentoo.org> +solfege-3.8.2.ebuild:
+  17 Oct 2007; Samuli Suominen <ssuominen@gentoo.org> +solfege-3.8.2.ebuild:
   Version bump for bug 196135, thanks to Tim Harder for reporting.
 
 *solfege-3.8.1 (26 Jun 2007)
 
-  26 Jun 2007; Samuli Suominen <drac@gentoo.org> +solfege-3.8.1.ebuild:
+  26 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> +solfege-3.8.1.ebuild:
   Version bump for bug 183189, thanks to Tim Harder for reporting.
 
 *solfege-3.8.0 (12 Jun 2007)
@@ -46,9 +53,6 @@
   25 Mar 2007; Raúl Porcel <armin76@gentoo.org> solfege-3.6.0.ebuild:
   x86 stable wrt bug 147432
 
-  25 Mar 2007; Samuli Suominen <drac@gentoo.org> solfege-3.6.0.ebuild:
-  Remove redudant || die from end of econf, emptylines, TODO from dodoc.
-
   05 Feb 2007; Alexis Ballier <aballier@gentoo.org> solfege-3.6.0.ebuild:
   Update docbook-xsl-stylesheets deps, thanks to Bruno Roggeri for the patch,
   bug #159611
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/solfege/metadata.xml
+++ b/media-sound/solfege/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/solfege/solfege-3.10.4.ebuild b/media-sound/solfege/solfege-3.10.4.ebuild
deleted file mode 100644
index 3c2e612ba4f9..000000000000
--- a/media-sound/solfege/solfege-3.10.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.10.4.ebuild,v 1.2 2008/12/04 20:48:57 eva Exp $
-
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="oss"
-
-# FIXME: there is probably some missing python deps, please fill bugs.
-RDEPEND=">=dev-python/pygtk-2.6
-	>=dev-python/libgnome-python-2.20
-	>=dev-python/gtkhtml-python-2.19"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	=dev-lang/swig-1.3*
-	sys-devel/gettext
-	sys-apps/texinfo
-	dev-libs/libxslt
-	>=app-text/docbook-xsl-stylesheets-1.60"
-
-src_unpack() {
-	unpack ${A}
-	# Make sure it doesn't compile python at install time for bug 210305.
-	sed -i -e 's:compileall::' "${S}"/Makefile.in || die "sed failed."
-}
-
-src_compile() {
-	# Try to figure out where is this damn stylesheet.
-	local xslloc=$( xmlcatalog /etc/xml/catalog	http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl | sed 's@file://@@' )
-
-	econf --enable-docbook-stylesheet=${xslloc} \
-		$(use_enable oss oss-sound) \
-		--disable-pygtk-test
-
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS *hange*og FAQ README
-}
diff --git a/media-sound/solfege/solfege-3.15.1.ebuild b/media-sound/solfege/solfege-3.15.1.ebuild
new file mode 100644
index 000000000000..d3be3f4133df
--- /dev/null
+++ b/media-sound/solfege/solfege-3.15.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.15.1.ebuild,v 1.1 2009/05/11 13:06:44 ssuominen Exp $
+
+EAPI=2
+
+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-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="oss"
+
+RDEPEND=">=dev-lang/python-2.5
+	gnome-base/librsvg
+	virtual/ghostscript
+	>=dev-python/pygtk-2.12"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	sys-devel/gettext
+	sys-apps/texinfo
+	dev-util/pkgconfig
+	dev-libs/libxslt
+	app-text/txt2man
+	>=app-text/docbook-xsl-stylesheets-1.60"
+
+src_configure() {
+	local xslloc=$( xmlcatalog /etc/xml/catalog	http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl | sed 's@file://@@' )
+
+	econf \
+		--enable-docbook-stylesheet=${xslloc} \
+		$(use_enable oss oss-sound)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS *hange*og FAQ README
+}