New release

8 files changed, 80 insertions, 119 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 6e1561599aa8..d10a2df28142 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.39 2004/11/29 14:22:40 foser Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.40 2005/01/08 23:31:16 foser Exp $
+
+*totem-0.100 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> totem-0.100.ebuild :
+  New release, dep fixes
 
   29 Nov 2004; foser <foser@gentoo.org> totem-0.99.{19,22-r1}.ebuild :
   Do the compile fix right #71960 -> #72124, thanks the Ed Catmur for the patch
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index ace10da9a785..172d70733e10 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -3,9 +3,11 @@ MD5 c844cbe6376059896095a29349689b61 totem-0.99.22-r1.ebuild 1924
 MD5 d491742489c165c2321c610b8abbdd68 totem-0.99.8-r2.ebuild 2023
 MD5 3a099802658c8b0f280b577253e04088 totem-0.99.15.1.ebuild 1585
 MD5 9daead0529a713fc78e554276567d5fb ChangeLog 5610
+MD5 c844cbe6376059896095a29349689b61 totem-0.100.ebuild 1924
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 MD5 8c12406bb21e95feaeb34355f9fd301b files/totem-0.99.22-gst_object_rename.patch 1290
 MD5 ffee6132520a471d092c6101e2cfcfc4 files/totem-0.99.8-curl.patch 762
+MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100 65
 MD5 eeba2ab1c3ed87a4a630addd709262ea files/digest-totem-0.99.19 67
 MD5 1c2c4aab10d4dbff69612b377a4aba0a files/digest-totem-0.99.22-r1 67
 MD5 f19c916fffc4e302cb84b4d6f50c8c03 files/totem-0.99.8-nvidia.patch 526
diff --git a/media-video/totem/files/digest-totem-0.100 b/media-video/totem/files/digest-totem-0.100
new file mode 100644
index 000000000000..b18a963468ee
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.100
@@ -0,0 +1 @@
+MD5 885423cc7e1d5eb8ff62b7b8ec9c30bc totem-0.100.tar.bz2 1279913
diff --git a/media-video/totem/files/digest-totem-0.99.8-r2 b/media-video/totem/files/digest-totem-0.99.8-r2
deleted file mode 100644
index 84310a8ca54f..000000000000
--- a/media-video/totem/files/digest-totem-0.99.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc8c0fcf96bcea69a7c957ef1666cd7e totem-0.99.8.tar.bz2 786192
diff --git a/media-video/totem/files/totem-0.99.8-curl.patch b/media-video/totem/files/totem-0.99.8-curl.patch
deleted file mode 100644
index d7df476a5a32..000000000000
--- a/media-video/totem/files/totem-0.99.8-curl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.in	2003-11-09 02:07:19.000000000 +0100
-+++ /tmp/configure.in	2003-12-07 19:19:18.000000000 +0100
-@@ -87,7 +87,21 @@
- CURL_MAJOR_REQ=7
- CURL_MINOR_REQ=9
- CURL_MICRO_REQ=8
--AC_PATH_PROG(CURL_CONFIG, curl-config, no)
-+
-+AC_ARG_ENABLE(curl,     
-+	AC_HELP_STRING([--disable-curl],[disable curl support]),
-+		[case "${enableval}" in
-+			yes) WANT_CURL=yes ;;
-+			no)  WANT_CURL=no ;;
-+			*) AC_MSG_ERROR(bad value ${enableval} for --enable-curl) ;;
-+		esac],  
-+		[WANT_CURL=yes]) dnl Default value
-+if test x$WANT_CURL = xyes ; then
-+	AC_PATH_PROG(CURL_CONFIG, curl-config, no)
-+else
-+	CURL_CONFIG=no
-+fi
-+
- AC_MSG_CHECKING(for curl)
- if test "$CURL_CONFIG" = "no" ; then
-   AC_MSG_WARN(curl development libraries missing, no automatic DLL downloader)
diff --git a/media-video/totem/files/totem-0.99.8-nvidia.patch b/media-video/totem/files/totem-0.99.8-nvidia.patch
deleted file mode 100644
index 1657c87628a8..000000000000
--- a/media-video/totem/files/totem-0.99.8-nvidia.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/bacon-video-widget-xine.c.old	2003-12-08 15:21:56.000000000 +0100
-+++ src/bacon-video-widget-xine.c	2003-12-08 15:21:18.000000000 +0100
-@@ -581,10 +581,12 @@
- 	 * we need to try loading the other ones, skipping dxr3 */
- 
- 	/* The types are hardcoded for now */
-+	/*
- 	vo_driver = xine_open_video_driver (bvw->priv->xine, "xvmc",
- 			XINE_VISUAL_TYPE_X11, (void *) &vis);
- 	if (vo_driver)
- 		return vo_driver;
-+*/
- 
- 	vo_driver = xine_open_video_driver (bvw->priv->xine, "xv",
- 			XINE_VISUAL_TYPE_X11, (void *) &vis);
diff --git a/media-video/totem/totem-0.100.ebuild b/media-video/totem/totem-0.100.ebuild
new file mode 100644
index 000000000000..e5221dae83da
--- /dev/null
+++ b/media-video/totem/totem-0.100.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.100.ebuild,v 1.1 2005/01/08 23:31:16 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="gstreamer lirc mad debug"
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.4
+	<gnome-extra/nautilus-cd-burner-2.9
+	>=gnome-base/gnome-desktop-2.2
+	lirc? ( app-misc/lirc )
+	!gstreamer? ( >=media-libs/xine-lib-1_rc7
+			>=gnome-base/gconf-2 )
+	sparc? ( >=media-libs/xine-lib-1_rc7
+		>=gnome-base/gconf-2 )
+	!sparc? ( gstreamer? ( >=media-libs/gstreamer-0.8.7
+				>=media-libs/gst-plugins-0.8.5
+				>=media-plugins/gst-plugins-gnomevfs-0.8.5
+				>=media-plugins/gst-plugins-xvideo-0.8.5
+				=media-plugins/gst-plugins-ffmpeg-0.8.3
+				mad? ( >=media-plugins/gst-plugins-mad-0.8.5 )
+				) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+# xine is default for now
+use gstreamer && G2CONF="${G2CONF} --enable-gstreamer"
+
+# gtk only support broken
+#use gnome \
+#	&& G2CONF="${G2CONF} --disable-gtk" \
+#	|| G2CONF="${G2CONF} --enable-gtk"
+
+G2CONF="${G2CONF} \
+	$(use_enable lirc) \
+	$(use_enable debug) \
+	--disable-gtk \
+	--disable-mozilla"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# use the omf_fix for scrollkeeper sandbox
+	# violations, see bug #48800 <obz@gentoo.org>
+	gnome2_omf_fix
+
+#might be needed for #68087
+#	kernel_is 2 4 && \
+#		sed -i "s:#include <netinet/in.h>::" somefile
+
+}
+
+USE_DESTDIR="1"
diff --git a/media-video/totem/totem-0.99.8-r2.ebuild b/media-video/totem/totem-0.99.8-r2.ebuild
deleted file mode 100644
index b0000e470af2..000000000000
--- a/media-video/totem/totem-0.99.8-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.8-r2.ebuild,v 1.11 2004/08/19 19:18:37 foser Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Movie player for GNOME"
-HOMEPAGE="http://www.hadess.net/totem.php3"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64 ~sparc"
-IUSE="curl gstreamer lirc mad"
-
-# specific gtk dep is needed for a certain xfree patch (#21336)
-RDEPEND=">=dev-libs/glib-2.1
-	>=x11-libs/gtk+-2.2.2-r1
-	>=gnome-base/libgnomeui-2.1.1
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-desktop-2.2
-	lirc? ( app-misc/lirc )
-	!gstreamer? ( >=media-libs/xine-lib-1_rc0
-		curl? ( >=net-misc/curl-7.9.8 )
-	)
-	sparc? ( >=media-libs/xine-lib-1_rc0
-		curl? ( >=net-misc/curl-7.9.8 )
-	)
-	!sparc? ( gstreamer? ( =media-libs/gstreamer-0.6*
-		=media-libs/gst-plugins-0.6*
-		=media-plugins/gst-plugins-gnomevfs-0.6*
-		=media-plugins/gst-plugins-colorspace-0.6*
-		=media-plugins/gst-plugins-xvideo-0.6*
-		mad? ( =media-plugins/gst-plugins-mad-0.6* )
-		) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.20
-	>=dev-util/pkgconfig-0.12.0
-	>=sys-devel/autoconf-2.58"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# add enable/disable curl
-	epatch ${FILESDIR}/${P}-curl.patch
-
-	# Disables a videodriver that doesn't work with all nvidia drivers
-	# you can override it by putting xvmc in ~/.gnome2/totem_config
-	epatch ${FILESDIR}/${P}-nvidia.patch
-	export WANT_AUTOCONF=2.5
-	autoconf
-
-	#fixes sandbox violations
-	gnome2_omf_fix
-}
-
-
-# move this in the right order so stacking works. "fulhack"
-use curl \
-	&& G2CONF="${G2CONF} --enable-curl" \
-	|| G2CONF="${G2CONF} --disable-curl"
-
-# xine is default
-use gstreamer && G2CONF="${G2CONF} --enable-gstreamer --disable-curl"
-
-use lirc \
-	&& G2CONF="${G2CONF} --enable-lirc" \
-	|| G2CONF="${G2CONF} --disable-lirc"
-
-CFLAGS="${CFLAGS} \
-	-UGNOME_DISABLE_DEPRECATED \
-	-UGTK_DISABLE_DEPRECATED"