Replace dependency on gtkhtml by real deps on python packages, bug #247636.

(Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 17 insertions, 8 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 191874abf1c9..eaa3d4d597c6 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2008/09/28 07:21:51 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.28 2008/12/04 20:48:57 eva Exp $
+
+  04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> solfege-3.8.2.ebuild,
+  solfege-3.10.3.ebuild, solfege-3.10.4.ebuild:
+  Replace dependency on gtkhtml by real deps on python packages, bug
+  #247636.
 
 *solfege-3.10.4 (28 Sep 2008)
 
diff --git a/media-sound/solfege/solfege-3.10.3.ebuild b/media-sound/solfege/solfege-3.10.3.ebuild
index 190891efe494..a20099913d10 100644
--- a/media-sound/solfege/solfege-3.10.3.ebuild
+++ b/media-sound/solfege/solfege-3.10.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2008/04/17 16:59:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.10.3.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"
@@ -12,7 +12,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="oss"
 
 RDEPEND=">=dev-python/pygtk-2.6
-	>=gnome-extra/gtkhtml-2"
+	>=dev-python/gnome-python-2.20
+	>=dev-python/gnome-python-extras-2.19"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	=dev-lang/swig-1.3*
diff --git a/media-sound/solfege/solfege-3.10.4.ebuild b/media-sound/solfege/solfege-3.10.4.ebuild
index 37ae504c577d..3c2e612ba4f9 100644
--- a/media-sound/solfege/solfege-3.10.4.ebuild
+++ b/media-sound/solfege/solfege-3.10.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/09/28 07:21:51 loki_val Exp $
+# $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"
@@ -11,8 +11,10 @@ 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
-	>=gnome-extra/gtkhtml-2"
+	>=dev-python/libgnome-python-2.20
+	>=dev-python/gtkhtml-python-2.19"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	=dev-lang/swig-1.3*
diff --git a/media-sound/solfege/solfege-3.8.2.ebuild b/media-sound/solfege/solfege-3.8.2.ebuild
index ef7eb8c78619..3407a9ee07d4 100644
--- a/media-sound/solfege/solfege-3.8.2.ebuild
+++ b/media-sound/solfege/solfege-3.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.8.2.ebuild,v 1.2 2007/11/24 12:27:10 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.8.2.ebuild,v 1.3 2008/12/04 20:48:57 eva Exp $
 
 inherit python eutils
 
@@ -16,7 +16,8 @@ IUSE="oss"
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.6
 	>=dev-python/pygtk-2.6
-	>=gnome-extra/gtkhtml-2"
+	>=dev-python/gnome-python-2.20
+	>=dev-python/gnome-python-extras-2.19"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	=dev-lang/swig-1.3*