New minor bugfix release

Package-Manager: portage-2.1_pre3-r1

6 files changed, 144 insertions, 15 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 86500d3eabd5..683d098b2120 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.92 2006/01/05 23:35:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.93 2006/01/06 21:07:16 joem Exp $
+
+*totem-1.2.1 (06 Jan 2006)
+
+  06 Jan 2006; Joe McCann <joem@gentoo.org>
+  +files/totem-1.2.1-gecko-sdk.patch, +totem-1.2.1.ebuild:
+  New minor bugfix release
 
   05 Jan 2006; Joseph Jezak <josejx@gentoo.org> totem-1.2.0-r2.ebuild:
   Marked ~ppc.
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 3f593e69c366..ff6e72df084d 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5403e97fb29a52fafa9096130ec143a4 ChangeLog 12933
+MD5 96c5d1f4e664118db262f6f9401c40e6 ChangeLog 13090
 MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65
 MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r2 65
+MD5 9243ad12e8b83b84491d9ba44ddee684 files/digest-totem-1.2.1 65
 MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
 MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
 MD5 faed9bfdf2ea1835a17c9e56e7738ac1 files/totem-1.2.0-gmoduledep.patch 1535
 MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834
+MD5 bb48541b00fafc98142cfbbea5490e8b files/totem-1.2.1-gecko-sdk.patch 1118
 MD5 06e5959e07633fd5260c6935f547d0d4 files/totem-dbus-0.60.patch 562
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 MD5 6645b9eed7d922972cb815cadddf7d89 totem-1.0.4.ebuild 2709
 MD5 d7a1624ffff28b89921b884b1b2565cc totem-1.2.0-r1.ebuild 3200
-MD5 d7342e70db056f27148a90bd480d377c totem-1.2.0-r2.ebuild 3161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDva02csIHjyDViGQRAt8VAKDOE3wei+ocyjVI6I3B+Ze0y8brywCg4WUa
-23sp7EtyQN484tHhh/CZiKQ=
-=89Qe
------END PGP SIGNATURE-----
+MD5 a6c5cda926beb5b7a47c63e650d74ae5 totem-1.2.0-r2.ebuild 3160
+MD5 89753bfe90d44357bf594cd8dfeaa7eb totem-1.2.1.ebuild 2929
diff --git a/media-video/totem/files/digest-totem-1.2.1 b/media-video/totem/files/digest-totem-1.2.1
new file mode 100644
index 000000000000..38d468e84957
--- /dev/null
+++ b/media-video/totem/files/digest-totem-1.2.1
@@ -0,0 +1 @@
+MD5 7915469973500dba01d51edfd9e49cf3 totem-1.2.1.tar.bz2 1411347
diff --git a/media-video/totem/files/totem-1.2.1-gecko-sdk.patch b/media-video/totem/files/totem-1.2.1-gecko-sdk.patch
new file mode 100644
index 000000000000..64387e443626
--- /dev/null
+++ b/media-video/totem/files/totem-1.2.1-gecko-sdk.patch
@@ -0,0 +1,29 @@
+--- configure.in.new	2005-12-13 18:13:21.000000000 -0600
++++ configure.in	2005-12-13 18:14:54.000000000 -0600
+@@ -211,7 +211,7 @@
+ 	AC_ARG_WITH([mozilla],
+ 		AS_HELP_STRING([--with-mozilla],[Which gecko engine to use (default: autodetect)]))
+ 
+-	GECKOS="firefox mozilla-firefox seamonkey mozilla xulrunner"
++	GECKOS="gecko-sdk firefox mozilla-firefox seamonkey mozilla xulrunner"
+ 	gecko=$with_mozilla
+ 
+ 	if test "x$gecko" = "x"; then
+@@ -241,6 +241,7 @@
+ 	AC_MSG_RESULT([$gecko])
+ 
+ 	case "$gecko" in
++      gecko-sdk) MOZILLA_VERSION_MIN=1.7 ;;
+ 		mozilla) MOZILLA_VERSION_MIN=1.7 ;;
+ 		seamonkey) MOZILLA_VERSION_MIN=1.0 ;;
+ 		*firefox) MOZILLA_VERSION_MIN=1.0 ;;
+@@ -284,7 +285,8 @@
+ 	MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+ 	MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-$MOZILLA_LIBDIR}"
+ 
+-	AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
++	AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no],
++                [$MOZILLA_LIBDIR:$MOZILLA_LIBDIR/../bin:$PATH])
+ 	if test "x$MOZILLA_XPIDL" = "xno"; then
+ 		ENABLE_MOZILLA=no
+ 		AC_MSG_WARN([xpidl compiler not found])
diff --git a/media-video/totem/totem-1.2.0-r2.ebuild b/media-video/totem/totem-1.2.0-r2.ebuild
index 38c003527953..4c358ab07173 100644
--- a/media-video/totem/totem-1.2.0-r2.ebuild
+++ b/media-video/totem/totem-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.7 2006/01/05 23:35:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.8 2006/01/06 21:07:16 joem Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -54,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.6.3
 		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) )
 	nsplugin? (
 		>=net-libs/gecko-sdk-1.7
-		>=sys-apps/dbus-0.35)"
+		>=sys-apps/dbus-0.35 )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
diff --git a/media-video/totem/totem-1.2.1.ebuild b/media-video/totem/totem-1.2.1.ebuild
new file mode 100644
index 000000000000..833a04e8fd15
--- /dev/null
+++ b/media-video/totem/totem-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.1.ebuild,v 1.1 2006/01/06 21:07:16 joem Exp $
+
+inherit autotools eutils multilib gnome2
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="a52 dvd flac gnome lirc mad mpeg nsplugin ogg theora vorbis win32codecs xine xv"
+
+RDEPEND=">=dev-libs/glib-2.6.3
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/gnome-vfs-2.9.92
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/libgnomeui-2.4
+	>=x11-themes/gnome-icon-theme-2.10
+	app-text/iso-codes
+	media-libs/musicbrainz
+	gnome? ( >=gnome-base/nautilus-2.10 )
+	lirc? ( app-misc/lirc )
+	xine? (
+		>=media-libs/xine-lib-1.0.1
+		>=gnome-base/gconf-2 )
+	!xine? (
+		|| ( =media-libs/gstreamer-0.8.10 =media-libs/gstreamer-0.8.11 )
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		=media-plugins/gst-plugins-pango-0.8*
+		|| ( =media-plugins/gst-plugins-ffmpeg-0.8.6
+			=media-plugins/gst-plugins-ffmpeg-0.8.7 )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		mpeg? ( =media-plugins/gst-plugins-mpeg2dec-0.8* )
+		ogg? ( =media-plugins/gst-plugins-ogg-0.8* )
+		xv? ( =media-plugins/gst-plugins-xvideo-0.8* )
+		vorbis? (
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-vorbis-0.8* )
+		a52? ( =media-plugins/gst-plugins-a52dec-0.8* )
+		flac? ( =media-plugins/gst-plugins-flac-0.8* )
+		theora? (
+			=media-plugins/gst-plugins-ogg-0.8*
+			=media-plugins/gst-plugins-theora-0.8* )
+		mad? ( =media-plugins/gst-plugins-mad-0.8* )
+		!sparc? ( dvd? (
+			=media-plugins/gst-plugins-a52dec-0.8*
+			=media-plugins/gst-plugins-dvdread-0.8*
+			=media-plugins/gst-plugins-mpeg2dec-0.8*
+			=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
+		win32codecs? ( =media-plugins/gst-plugins-pitfdll-0.8* ) )
+	nsplugin? (
+		>=net-libs/gecko-sdk-1.7
+		>=sys-apps/dbus-0.35 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+
+
+pkg_setup() {
+	G2CONF="--disable-gtk \
+		$(use_enable lirc)             \
+		$(use_enable gnome nautilus)   \
+		$(use_enable nsplugin mozilla) \
+		$(use_with nsplugin mozilla gecko-sdk)"
+
+	# gstreamer is default backend
+	use xine || G2CONF="${G2CONF} --enable-gstreamer"
+
+	# Use global nsplugins dir
+	G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Recognize gecko-sdk as a valid toolkit to compile the plugin
+	epatch ${FILESDIR}/${PN}-1.2.1-gecko-sdk.patch
+	eautoreconf
+
+	gnome2_omf_fix help/*/Makefile.in
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "Note that the default totem backend has switched to gstreamer."
+	einfo "DVD menus will only work with the xine backend."
+
+}