new release

5 files changed, 104 insertions, 2 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 266954d65af5..7ae78f96d983 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.41 2005/01/09 22:24:35 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.42 2005/01/12 14:07:02 foser Exp $
+
+*totem-0.100-r2 (12 Jan 2005)
+
+  12 Jan 2005; foser <foser@gentoo.org> totem-0.100-r2.ebuild :
+  Redo the kernel 2.4 cdrom/header fix (#68087)
+  Add scrollkeeper dep (#77631)
 
 *totem-0.100-r1 (09 Jan 2005)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index ef192dfa9fb1..d2f2bec68686 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,12 +1,15 @@
 MD5 2fa9295189faf40791670a895cb1d171 totem-0.99.19.ebuild 1739
 MD5 c844cbe6376059896095a29349689b61 totem-0.99.22-r1.ebuild 1924
 MD5 3a099802658c8b0f280b577253e04088 totem-0.99.15.1.ebuild 1585
+MD5 8a4c5d8d17c5f73ea9ca6e97519da215 totem-0.100-r2.ebuild 1900
 MD5 0eb2827444cd5b1814c137542b5bfd52 totem-0.100-r1.ebuild 1851
-MD5 504eea3f74589e75197d44e9880034a4 ChangeLog 5851
+MD5 42fd42016718f9f3bd397a9208ddf819 ChangeLog 6027
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 MD5 50a343412446e05871e042a7b5958c93 files/totem-0.100-fix_desktop_item.patch 558
 MD5 8c12406bb21e95feaeb34355f9fd301b files/totem-0.99.22-gst_object_rename.patch 1290
 MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100-r1 65
+MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100-r2 65
+MD5 8ab6b544e88eb5901e71820c8b41a477 files/totem-0.100-cdrom_include.patch 413
 MD5 eeba2ab1c3ed87a4a630addd709262ea files/digest-totem-0.99.19 67
 MD5 1c2c4aab10d4dbff69612b377a4aba0a files/digest-totem-0.99.22-r1 67
 MD5 572a285ceed98dcaa61cf9520e7e59f7 files/totem-0.99.22-x_includes.patch 1330
diff --git a/media-video/totem/files/digest-totem-0.100-r2 b/media-video/totem/files/digest-totem-0.100-r2
new file mode 100644
index 000000000000..b18a963468ee
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.100-r2
@@ -0,0 +1 @@
+MD5 885423cc7e1d5eb8ff62b7b8ec9c30bc totem-0.100.tar.bz2 1279913
diff --git a/media-video/totem/files/totem-0.100-cdrom_include.patch b/media-video/totem/files/totem-0.100-cdrom_include.patch
new file mode 100644
index 000000000000..acbf9f6f11a3
--- /dev/null
+++ b/media-video/totem/files/totem-0.100-cdrom_include.patch
@@ -0,0 +1,17 @@
+--- totem-0.100/src/totem-disc.c	2005-01-10 12:41:50.247009280 +0100
++++ totem-0.100-cdrom_include/src/totem-disc.c	2005-01-10 12:42:39.911459136 +0100
+@@ -30,12 +30,13 @@
+ 
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+-#include <linux/cdrom.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs.h>
+ 
++#include <linux/cdrom.h>
++
+ #include "totem-disc.h"
+ 
+ typedef struct _CdCache {
diff --git a/media-video/totem/totem-0.100-r2.ebuild b/media-video/totem/totem-0.100-r2.ebuild
new file mode 100644
index 000000000000..d03dc1d414ad
--- /dev/null
+++ b/media-video/totem/totem-0.100-r2.ebuild
@@ -0,0 +1,75 @@
+# 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-r2.ebuild,v 1.1 2005/01/12 14:07:02 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}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/automake"
+
+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
+
+	# order the cdrom include (#68087)
+	epatch ${FILESDIR}/${P}-cdrom_include.patch
+	# fix the desktop item (#77204)
+	epatch ${FILESDIR}/${P}-fix_desktop_item.patch
+
+	WANT_AUTOMAKE=1.4 automake
+
+}
+
+USE_DESTDIR="1"