fresh release

8 files changed, 98 insertions, 56 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 6030617b5995..54bfbaa39c76 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2004/10/23 11:00:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.37 2004/11/22 01:07:30 foser Exp $
+
+*totem-0.99.22 (22 Nov 2004)
+
+  22 Nov 2004; foser <foser@gentoo.org> totem-0.99.22.ebuild :
+  Updated xine dep, added real USE=debug
+  Added compile fix from (#71960)
 
   23 Oct 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
   Corrected herd in metadata.xml. (media-video -> video)
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 630242c26578..a98762251eeb 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,12 +1,13 @@
-MD5 8665c4280f28ef9dd7654fae6bd35a99 totem-0.99.5.ebuild 1391
-MD5 cca2bfb5e52dd5b3775ccb4052991b8d totem-0.99.19.ebuild 1645
+MD5 6d4402f87be251454bcc8644c3a13056 totem-0.99.19.ebuild 1703
 MD5 d491742489c165c2321c610b8abbdd68 totem-0.99.8-r2.ebuild 2023
 MD5 3a099802658c8b0f280b577253e04088 totem-0.99.15.1.ebuild 1585
-MD5 e27f594d6898daa2f23e87fc6eea6d47 ChangeLog 5075
+MD5 0461dff3348ee547712976080767693d totem-0.99.22.ebuild 1755
+MD5 1667ab4a004c11f2ee38978500369300 ChangeLog 5241
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
-MD5 c24abb8ac12e32b2372e91d65343cc34 files/digest-totem-0.99.5 65
 MD5 ffee6132520a471d092c6101e2cfcfc4 files/totem-0.99.8-curl.patch 762
+MD5 9e38423894eaf7762dc1790bcf1ad543 files/totem-0.99.22-reorder_includes.patch 392
 MD5 eeba2ab1c3ed87a4a630addd709262ea files/digest-totem-0.99.19 67
+MD5 1c2c4aab10d4dbff69612b377a4aba0a files/digest-totem-0.99.22 67
 MD5 f19c916fffc4e302cb84b4d6f50c8c03 files/totem-0.99.8-nvidia.patch 526
 MD5 3d9e7881aa0ec7d110c1487cd95d6c40 files/digest-totem-0.99.15.1 69
 MD5 5555967d2623a7a6476864d9294bf323 files/digest-totem-0.99.8-r2 65
diff --git a/media-video/totem/files/digest-totem-0.99.22 b/media-video/totem/files/digest-totem-0.99.22
new file mode 100644
index 000000000000..c98860215f60
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.99.22
@@ -0,0 +1 @@
+MD5 7843368e1e61921b0ae87a751ad91079 totem-0.99.22.tar.bz2 1095821
diff --git a/media-video/totem/files/digest-totem-0.99.5 b/media-video/totem/files/digest-totem-0.99.5
deleted file mode 100644
index 6765aa9f6048..000000000000
--- a/media-video/totem/files/digest-totem-0.99.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 95ee9a5a543b0700d951b8b9a0701590 totem-0.99.5.tar.bz2 653202
diff --git a/media-video/totem/files/totem-0.99.22-reorder_includes.patch b/media-video/totem/files/totem-0.99.22-reorder_includes.patch
new file mode 100644
index 000000000000..9f6f3defb7bf
--- /dev/null
+++ b/media-video/totem/files/totem-0.99.22-reorder_includes.patch
@@ -0,0 +1,13 @@
+diff -Naur totem-0.99.22/src/video-utils.c totem-0.99.22.new/src/video-utils.c
+--- totem-0.99.22/src/video-utils.c	2004-10-14 14:55:46.000000000 +0200
++++ totem-0.99.22.new/src/video-utils.c	2004-11-21 01:08:54.553510768 +0100
+@@ -3,8 +3,8 @@
+ 
+ #include "video-utils.h"
+ 
+-#include <glib/gi18n.h>
+ #include <libintl.h>
++#include <glib/gi18n.h>
+ 
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
diff --git a/media-video/totem/totem-0.99.19.ebuild b/media-video/totem/totem-0.99.19.ebuild
index e9f7ac8bdc4b..bed54bc008f2 100644
--- a/media-video/totem/totem-0.99.19.ebuild
+++ b/media-video/totem/totem-0.99.19.ebuild
@@ -1,6 +1,6 @@
 # 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.19.ebuild,v 1.3 2004/11/15 16:48:07 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.19.ebuild,v 1.4 2004/11/22 01:07:30 foser Exp $
 
 inherit gnome2 eutils
 
@@ -57,6 +57,8 @@ src_unpack() {
 	# violations, see bug #48800 <obz@gentoo.org>
 	gnome2_omf_fix
 
+	epatch ${FILESDIR}/${PN}-0.99.22-reorder_includes.patch
+
 }
 
 USE_DESTDIR="1"
diff --git a/media-video/totem/totem-0.99.22.ebuild b/media-video/totem/totem-0.99.22.ebuild
new file mode 100644
index 000000000000..849039c09c6c
--- /dev/null
+++ b/media-video/totem/totem-0.99.22.ebuild
@@ -0,0 +1,69 @@
+# 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.22.ebuild,v 1.1 2004/11/22 01:07:30 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-base/gnome-desktop-2.2
+	>=gnome-extra/nautilus-cd-burner-2.8.1
+	lirc? ( app-misc/lirc )
+	!gstreamer? ( >=media-libs/xine-lib-1_rc5
+			>=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*
+				mad? ( >=media-plugins/gst-plugins-mad-0.8.5 )
+				) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	>=sys-devel/autoconf-2.58"
+
+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}
+	# fix #71863
+	epatch ${FILESDIR}/${P}-reorder_includes.patch
+	# use the omf_fix for scrollkeeper sandbox
+	# violations, see bug #48800 <obz@gentoo.org>
+	gnome2_omf_fix
+
+}
+
+USE_DESTDIR="1"
diff --git a/media-video/totem/totem-0.99.5.ebuild b/media-video/totem/totem-0.99.5.ebuild
deleted file mode 100644
index f3710cd423a5..000000000000
--- a/media-video/totem/totem-0.99.5.ebuild
+++ /dev/null
@@ -1,49 +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.5.ebuild,v 1.8 2004/08/19 19:18:37 foser Exp $
-
-inherit gnome2
-
-IUSE="curl gstreamer lirc mad"
-DESCRIPTION="Movie player for GNOME"
-HOMEPAGE="http://www.hadess.net/totem.php3"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-# 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
-	curl? ( >=net-misc/curl-7.9.8 )
-	lirc? ( app-misc/lirc )
-	!gstreamer? ( >=media-libs/xine-lib-1_beta12 )
-	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"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
-
-# xine is default
-use gstreamer && G2CONF="${G2CONF} --enable-gstreamer"
-use lirc \
-	&& G2CONF="${G2CONF} --enable-lirc" \
-	|| G2CONF="${G2CONF} --disable-lirc"
-
-CFLAGS="${CFLAGS} \
-	-UGNOME_DISABLE_DEPRECATED \
-	-UGTK_DISABLE_DEPRECATED \
-	-DUSE_STABLE_LIBGNOMEUI"