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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

5 files changed, 31 insertions, 12 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/Manifest b/media-sound/solfege/Manifest
index beea0649c6eb..f404e277accd 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST solfege-3.10.3.tar.gz 3039116 RMD160 9433ac6cad3c8b5bb213a8ad8b60b8d7048dd697 SHA1 1043c53541bdf868784e6b5b22e23d101822dd14 SHA256 6a8fb7a3434f88fb4c9204be1fe1098b0e25adaed29c3f28c001ae10caf0ba7f
 DIST solfege-3.10.4.tar.gz 3224645 RMD160 083d829df7551bf79df50f8dc6f6ab03530ee5a1 SHA1 8fab6608f6de9f63c1b23ca2b380c1016f5ab733 SHA256 f0765fc64a97c228768c3117ede4e2c5454683db026070838844add3361f69ec
 DIST solfege-3.8.2.tar.gz 2603743 RMD160 be9da5d12871981892d5d73b921e96c5c3b6b20b SHA1 2dc8eec412bca3ad2e898e09ac3d34ea7c811422 SHA256 e1e7f39dfa93726cc5bc72b53240946a92f769265efc6d24394e027310a63938
-EBUILD solfege-3.10.3.ebuild 1292 RMD160 bcf079f9638827c03e92ed3c6e3c52b733c60282 SHA1 b15c7c14dd55daf7e9f4c05a2b5fb7a6c0adca04 SHA256 cb39e61b4f1c8603dfa44de49d6cf66045d3e011b54633baf4d7e020f4492034
-EBUILD solfege-3.10.4.ebuild 1296 RMD160 4f1b66f6a83746e174e7eb382ab357fcf1c9bd2c SHA1 e986540ccb9442f9eb3c1acfd6d9796de47a8a7e SHA256 874dc2f51d4c73f1b5f702482d99b857b906b472b7f6ceb023b8378eff522abf
-EBUILD solfege-3.8.2.ebuild 1200 RMD160 ae0c294e7d5626e6c8b069428c82c98d42f1f98a SHA1 8f432b3f0ed3f50be1b7e6d0751421a155a08b43 SHA256 abae1e32538ff7bf7d77465bd25c423d227f6b7452864ade982b57079bed53ec
-MISC ChangeLog 3921 RMD160 7c1c60232acfc1deb9b2d8fecec09442d56d42d4 SHA1 ac5a9506ea15515827f258f1bcd0166ba7cbd2f6 SHA256 1493a0cee94fa4eb303cd3fd0e6b055930c292c21b1b6cd4ef09319d9004de04
+EBUILD solfege-3.10.3.ebuild 1337 RMD160 b9550144d0541839bd551d4ecc3e451263498156 SHA1 cbd7c4f04e189e7ddef6862fc9ae14a5d617a764 SHA256 e4c83e942b80363f6f44cd91b14bc726ebdbcc318ad65ecb713d77543bec0607
+EBUILD solfege-3.10.4.ebuild 1406 RMD160 0d7e752d1abe3c15efee08c4d5c393f515c901d7 SHA1 5fae7d1474802b006f36d6baf395bf263cfec4cd SHA256 bbbb2f48f0cf414174308100c643c1667f7d8561e1a884274381f780b31de11e
+EBUILD solfege-3.8.2.ebuild 1246 RMD160 922d169beaf73b6140176723baf416a149f2a71b SHA1 3cc9359a3ffb16457e94f9992e59cb0c21460e62 SHA256 9a79b57a73266be511dbb651442cd299d482668cd379ee014dccf3fde213a349
+MISC ChangeLog 4121 RMD160 d3f8e9d8f5b4f769c7e06d0b3c9ac5997cc9e6a2 SHA1 a5de4cc5839897f267d3059890f1d78731f61123 SHA256 27fdd87a6f7d101dd740d942689d06d380c2b6bc481d7b971462b39e405a49a8
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk4Qj4ACgkQ1fmVwcYIWAYqYwCeI55mpVIgO40FRvggVWq90ED8
+u3sAn0Mmw2hWklBm5EABn8Ft8utAx/Uq
+=DOWm
+-----END PGP SIGNATURE-----
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*