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

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64)

5 files changed, 34 insertions, 51 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/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>