new version, mark 0.99.1 x86

9 files changed, 42 insertions, 90 deletions

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 971fdbc9eb81..68db77b18d33 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,11 +1,8 @@
-MD5 7ecb24b0799920add69ea87f9e2fe8ae files/digest-totem-0.98.0 65
-MD5 4816d34e3f9fb6cb02c2988588adaa16 files/digest-totem-0.96.0 65
-MD5 c934da39c2b9a903e7c8de872c576d6d files/totem-0.96.0-thumbnailer_thread_fix.patch 454
-MD5 29461991750ef9918d7c69628d7b84b2 files/digest-totem-0.99.0 65
-MD5 a34eba707248ed75430185ae674a1723 files/digest-totem-0.99.1 65
-MD5 b9626e464a982a4d707709c683834813 totem-0.98.0.ebuild 727
-MD5 6b08aecae9956b51ed24bf85f40e9ddb totem-0.96.0.ebuild 813
 MD5 1509e783c1dc5ac6766ad41addba54c9 totem-0.99.0.ebuild 909
+MD5 cda9f53131e43cf5e1d879702848bd6f totem-0.99.2.ebuild 911
+MD5 3ebd6f0bbfc6561f49b216c3f570f459 totem-0.99.1.ebuild 910
 MD5 5c54a4418c0b017289d7bf48b74bc4aa ChangeLog 2374
-MD5 ed8b05951e1fa43937eb7d667a3b8ad4 totem-0.99.1.ebuild 911
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 29461991750ef9918d7c69628d7b84b2 files/digest-totem-0.99.0 65
+MD5 a34eba707248ed75430185ae674a1723 files/digest-totem-0.99.1 65
+MD5 583fa3fd2729b78fb923b226805c54d2 files/digest-totem-0.99.2 65
diff --git a/media-video/totem/files/digest-totem-0.96.0 b/media-video/totem/files/digest-totem-0.96.0
deleted file mode 100644
index 849503b84c19..000000000000
--- a/media-video/totem/files/digest-totem-0.96.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbfe2180901e36e17f968b9c53ba9b1f totem-0.96.0.tar.bz2 374905
diff --git a/media-video/totem/files/digest-totem-0.98.0 b/media-video/totem/files/digest-totem-0.98.0
deleted file mode 100644
index 22c44875898c..000000000000
--- a/media-video/totem/files/digest-totem-0.98.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 698f94a30a05e5baa04d8d66734a8126 totem-0.98.0.tar.bz2 448326
diff --git a/media-video/totem/files/digest-totem-0.99.2 b/media-video/totem/files/digest-totem-0.99.2
new file mode 100644
index 000000000000..0c2de86e762f
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.99.2
@@ -0,0 +1 @@
+MD5 e20104c07b892d182b16815e860db13e totem-0.99.2.tar.bz2 549797
diff --git a/media-video/totem/files/totem-0.96.0-thumbnailer_thread_fix.patch b/media-video/totem/files/totem-0.96.0-thumbnailer_thread_fix.patch
deleted file mode 100644
index d1cf12d6fbd3..000000000000
--- a/media-video/totem/files/totem-0.96.0-thumbnailer_thread_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- totem-0.96.0/src/totem-video-thumbnailer.c	2003-03-17 20:34:04.000000000 +0100
-+++ totem/src/totem-video-thumbnailer.c	2003-04-11 14:31:32.000000000 +0200
-@@ -2,6 +2,7 @@
- #include "config.h"
- 
- #include <gnome.h>
-+#include <string.h>
- #include "bacon-video-widget.h"
- 
- /* #define THUMB_DEBUG */
-@@ -165,6 +166,9 @@
- 	GdkPixbuf *pixbuf;
- 	int i;
- 
-+	if(!g_thread_supported())
-+		g_thread_init (NULL);
-+
- 	gtk_init (&argc, &argv);
- 
- 	if (argc != 3)
diff --git a/media-video/totem/totem-0.96.0.ebuild b/media-video/totem/totem-0.96.0.ebuild
deleted file mode 100644
index 851ddf94831d..000000000000
--- a/media-video/totem/totem-0.96.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.96.0.ebuild,v 1.4 2003/04/30 11:02:48 foser Exp $
-
-inherit gnome2 eutils
-
-IUSE=""
-DESCRIPTION="Totem is simple movie player for the Gnome2 desktop based on xine"
-HOMEPAGE="http://www.hadess.net/totem.php3"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/libglade-2
-	>=media-libs/xine-lib-1_beta9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.20
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING*  README* INSTALL NEWS"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-thumbnailer_thread_fix.patch
-}
diff --git a/media-video/totem/totem-0.98.0.ebuild b/media-video/totem/totem-0.98.0.ebuild
deleted file mode 100644
index 93291b109926..000000000000
--- a/media-video/totem/totem-0.98.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.98.0.ebuild,v 1.2 2003/07/12 21:12:53 aliz Exp $
-
-inherit gnome2 eutils
-
-IUSE=""
-DESCRIPTION="Totem is simple movie player for the Gnome2 desktop based on xine"
-HOMEPAGE="http://www.hadess.net/totem.php3"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/libglade-2
-	>=media-libs/xine-lib-1_beta11"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.20
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING*  README* INSTALL NEWS"
diff --git a/media-video/totem/totem-0.99.1.ebuild b/media-video/totem/totem-0.99.1.ebuild
index dc85266204e4..0c6ad435d20c 100644
--- a/media-video/totem/totem-0.99.1.ebuild
+++ b/media-video/totem/totem-0.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.1.ebuild,v 1.1 2003/06/23 19:11:38 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.1.ebuild,v 1.2 2003/07/25 21:21:27 foser Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ DESCRIPTION="Movie player for the GNOME 2"
 HOMEPAGE="http://www.hadess.net/totem.php3"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 RDEPEND=">=dev-libs/glib-2.1
diff --git a/media-video/totem/totem-0.99.2.ebuild b/media-video/totem/totem-0.99.2.ebuild
new file mode 100644
index 000000000000..ca8fbeaa564b
--- /dev/null
+++ b/media-video/totem/totem-0.99.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.2.ebuild,v 1.1 2003/07/25 21:21:27 foser Exp $
+
+inherit gnome2
+
+IUSE="gstreamer"
+DESCRIPTION="Movie player for the GNOME 2"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+
+RDEPEND=">=dev-libs/glib-2.1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnomeui-2.1.1
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	!gstreamer? ( >=media-libs/xine-lib-1_beta12 )
+	gstreamer? ( >=media-libs/gstreamer-0.6.1 
+		>=media-libs/gst-plugins-0.6.1 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.20
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog COPYING*  README* INSTALL NEWS"
+
+# xine is default
+if [ `use gstreamer` ]; then
+	G2CONF="${G2CONF} --enable-gstreamer"
+fi