Fix bug 224547, depend on gtk-sharp with fixed api (b.gnome.o 558312 b.novell.c 445370) and update deps for mono-2.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

6 files changed, 37 insertions, 57 deletions

diff --git a/media-video/gnome-subtitles/ChangeLog b/media-video/gnome-subtitles/ChangeLog
index d03e3ed2736d..c030212856eb 100644
--- a/media-video/gnome-subtitles/ChangeLog
+++ b/media-video/gnome-subtitles/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/gnome-subtitles
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/ChangeLog,v 1.16 2008/05/30 23:22:24 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/ChangeLog,v 1.17 2008/11/26 22:50:26 loki_val Exp $
+
+*gnome-subtitles-0.8-r1 (26 Nov 2008)
+
+  26 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> metadata.xml,
+  -gnome-subtitles-0.7.2.ebuild, -gnome-subtitles-0.7.2-r1.ebuild,
+  -gnome-subtitles-0.8.ebuild, +gnome-subtitles-0.8-r1.ebuild:
+  Fix bug 224547, depend on gtk-sharp with fixed api (b.gnome.o 558312
+  b.novell.c 445370) and update deps for mono-2.
 
 *gnome-subtitles-0.8 (30 May 2008)
 
diff --git a/media-video/gnome-subtitles/Manifest b/media-video/gnome-subtitles/Manifest
index 1fe930894f4b..4d73cd73dc81 100644
--- a/media-video/gnome-subtitles/Manifest
+++ b/media-video/gnome-subtitles/Manifest
@@ -1,11 +1,8 @@
 DIST gnome-subtitles-0.3.tar.gz 351554 RMD160 ca582a2f82f2bb8324878122194cb07dbb4c37c4 SHA1 4d4ec8a6c32efe1f77fb05f353a12bf8ab5360d6 SHA256 0c778320f5dca10e37e65b68d9243f358c348dc2a34ef21cb57405669ff7ba4c
 DIST gnome-subtitles-0.6.tar.gz 502874 RMD160 b26a2cd490ce9e57dba14aa2e7ab403844244fe3 SHA1 f04971bbbb7506acde84826dbb9bdd1bbb3ab824 SHA256 b0c41c9111b0d9615f77dff1d5166c3c15adf2f4822090e72e3b9eb2e7b59c62
-DIST gnome-subtitles-0.7.2.tar.gz 856112 RMD160 a9e54faed80f2c8e192dbfb4f23b8fd7e91da500 SHA1 0c484af7934a6a2fbed41139221489fbcd687000 SHA256 bea8bb09088202f5fc7936f0b44624fe63c342d9ccac042d5817e39981ab3fa7
 DIST gnome-subtitles-0.8.tar.gz 756247 RMD160 e326876698ddb052e0a78090e78ee84195722417 SHA1 14fe9eabf4288fc23072988f4423b5f447642352 SHA256 aea492b878cb417f9610a6118ff05f8b1d398edaa2c30fed426b0ab00513e81c
 EBUILD gnome-subtitles-0.3.ebuild 722 RMD160 37681e05cf03ead73ba3b7f833b1ecdf2567a8a6 SHA1 7f9a56ff12c736652f717b812b77e05cbb972206 SHA256 e33fdec1844926670d18e5c651f81836090172558aa0f9833dad1018a8b4c6cd
 EBUILD gnome-subtitles-0.6.ebuild 725 RMD160 12f54a2cedfc82526934561018275155caf5c0f8 SHA1 31a4a7099842eb8395e3bbf33b42699c60fb324c SHA256 70b24e3b55a8fb00812640247c96e3aa9f1d0ddc74eace4b0922cf620eb71f29
-EBUILD gnome-subtitles-0.7.2-r1.ebuild 782 RMD160 12d60544fa808c2b8098ee8950df56faeef9c6d6 SHA1 d2a80c817b27261200c641dd14276c3af1219ebb SHA256 5746ddad39c5778e614baa904002f5e749452563985919f10d74039af5ce6039
-EBUILD gnome-subtitles-0.7.2.ebuild 738 RMD160 ee6e24db2746936493f7bf499f93b3aa69d2f5f8 SHA1 f54af0f4a6273500c14171fcbcbb16361b6e84c5 SHA256 c177c6108a665a69dee29fb6cad3e46f44707acc7f0f55a2b55c41ddd0f56a5a
-EBUILD gnome-subtitles-0.8.ebuild 775 RMD160 0f1464e1b124c0d8d05157d927539519604ff6b8 SHA1 223fac3b3414540d09f7ef27c2ce7fa01b233b8c SHA256 d84b19784933be40b088752616204dae5bcc32c4c9ced8ef7865fef20bdaf848
-MISC ChangeLog 2609 RMD160 c5375baff7b25432a3acc68424e37634bf3a4a8b SHA1 282e8b001c8888c37607973829c029b14212a82f SHA256 ba277a0062bdcbd792503fd4bd132ca658eb0f4a2b2734b3c464b57d89ee0ea2
-MISC metadata.xml 267 RMD160 2e111e996e0cb2f48d4b2cc407daf447ed4d7898 SHA1 343bba178206c248591a6d481f09dc7cd439a380 SHA256 c79df604f0c57258a4b7c9aa47d168e7d585572a00b816d910be6c0293d16843
+EBUILD gnome-subtitles-0.8-r1.ebuild 1121 RMD160 b953589d68fe651fdb2795546f164c3e52514b23 SHA1 489c003a72b247f9472ad2d2188b9d7499314738 SHA256 b8184da48aece0cf01463879e16577397fa30ee17a12ae3448d8274756b23a9e
+MISC ChangeLog 2969 RMD160 793f4dc621eebf046450994ddee8d804535a0bd9 SHA1 ae827cb3bae17daea1765b278156dc2b4ca4b72d SHA256 7e188b50043e44186a2e7436fd4a3bcefafad76f7ad11304dadfcec1fcccd805
+MISC metadata.xml 306 RMD160 72cb467ad10546efc4e9a18bdd0c342dc3907680 SHA1 5c97890d8a84da1d46fb9983a0832700716aa596 SHA256 23bf7e6cf8a432da87c571c47debcaebf9694e22315443d7fa7453888e65d7fa
diff --git a/media-video/gnome-subtitles/gnome-subtitles-0.7.2.ebuild b/media-video/gnome-subtitles/gnome-subtitles-0.7.2.ebuild
deleted file mode 100644
index 56ada137ea9f..000000000000
--- a/media-video/gnome-subtitles/gnome-subtitles-0.7.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/gnome-subtitles-0.7.2.ebuild,v 1.1 2008/01/06 20:55:54 beandog Exp $
-
-inherit mono gnome2
-
-DESCRIPTION="Video subtitling for the Gnome desktop"
-HOMEPAGE="http://gnome-subtitles.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnome-subtitles/${P}.tar.gz"
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=dev-lang/mono-1.1
-	>=dev-dotnet/gtk-sharp-2.8
-	>=dev-dotnet/gnome-sharp-2.8
-	>=dev-dotnet/glade-sharp-2.8
-	>=dev-dotnet/gconf-sharp-2.8
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-base-0.10"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
diff --git a/media-video/gnome-subtitles/gnome-subtitles-0.7.2-r1.ebuild b/media-video/gnome-subtitles/gnome-subtitles-0.8-r1.ebuild
index feff5200bd9a..e08e732e9ed6 100644
--- a/media-video/gnome-subtitles/gnome-subtitles-0.7.2-r1.ebuild
+++ b/media-video/gnome-subtitles/gnome-subtitles-0.8-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/gnome-subtitles-0.7.2-r1.ebuild,v 1.1 2008/04/14 03:30:58 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/gnome-subtitles-0.8-r1.ebuild,v 1.1 2008/11/26 22:50:26 loki_val Exp $
+
+EAPI=2
 
 inherit mono gnome2
 
@@ -14,11 +16,29 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-lang/mono-1.1
 	>=dev-dotnet/gtk-sharp-2.8
 	>=dev-dotnet/gnome-sharp-2.8
-	>=dev-dotnet/glade-sharp-2.8
+	|| (
+		>=dev-dotnet/gtk-sharp-2.12.6-r1[glade]
+		( >=dev-dotnet/glade-sharp-2.8 >=dev-dotnet/gtk-sharp-2.8 )
+	)
 	>=dev-dotnet/gconf-sharp-2.8
 	>=media-libs/gstreamer-0.10
+	>=media-libs/sublib-0.9
+	>=app-text/gtkspell-2.0
+	>=app-text/enchant-1.3
 	>=media-libs/gst-plugins-base-0.10"
 DEPEND="${RDEPEND}
+	app-text/scrollkeeper
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
+#Can be removed in 0.9, upstream say it's fixed in SVN
+MAKEOPTS=${MAKEOPTS} -j1
+
+src_configure() {
+	gnome2_src_configure
+}
+
+src_compile() {
+	default
+}
diff --git a/media-video/gnome-subtitles/gnome-subtitles-0.8.ebuild b/media-video/gnome-subtitles/gnome-subtitles-0.8.ebuild
deleted file mode 100644
index e599a286d8d7..000000000000
--- a/media-video/gnome-subtitles/gnome-subtitles-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-subtitles/gnome-subtitles-0.8.ebuild,v 1.1 2008/05/30 23:22:24 jurek Exp $
-
-inherit mono gnome2
-
-DESCRIPTION="Video subtitling for the Gnome desktop"
-HOMEPAGE="http://gnome-subtitles.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnome-subtitles/${P}.tar.gz"
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RDEPEND=">=dev-lang/mono-1.1
-	>=dev-dotnet/gtk-sharp-2.8
-	>=dev-dotnet/gnome-sharp-2.8
-	>=dev-dotnet/glade-sharp-2.8
-	>=dev-dotnet/gconf-sharp-2.8
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-base-0.10"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
diff --git a/media-video/gnome-subtitles/metadata.xml b/media-video/gnome-subtitles/metadata.xml
index 80ec5b1b4633..7c933cc52d1e 100644
--- a/media-video/gnome-subtitles/metadata.xml
+++ b/media-video/gnome-subtitles/metadata.xml
@@ -4,7 +4,8 @@
 <herd>video</herd>
 <herd>dotnet</herd>
 <maintainer>
-<email>mail@pedrocastro.org</email>
-<name>Pedro Castro</name>
+	<email>mail@pedrocastro.org</email>
+	<name>Pedro Castro</name>
+	<description>Upstream</description>
 </maintainer>
 </pkgmetadata>