10 files changed, 148 insertions, 188 deletions
diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index d332159427a1..dcea0ce84dc0 100644
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/flumotion
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.7 2005/12/06 07:21:38 zaheerm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.8 2006/03/03 19:18:10 zaheerm Exp $
+
+*flumotion-0.2.0 (03 Mar 2006)
+
+  03 Mar 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/flumotion-init-0.2.0, +flumotion-0.2.0.ebuild:
+  version bump
 
   06 Dec 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
   flumotion-0.1.6.ebuild, flumotion-0.1.7.ebuild, flumotion-0.1.8.ebuild:
diff --git a/media-video/flumotion/Manifest b/media-video/flumotion/Manifest
index bcb3c14c3332..6a2dfe16c6f6 100644
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@@ -1,10 +1,9 @@
-MD5 a06d85689a7116b7c9f52093df2daeb4 ChangeLog 1106
-MD5 f421d5bbf35e1bda4cde73c86517fbd3 files/digest-flumotion-0.1.6 68
-MD5 423fb37f9e1c267e6d5836e73b651d73 files/digest-flumotion-0.1.7 68
+MD5 1a7823f4303cc888a819d50d5ede7318 ChangeLog 1266
 MD5 5ca0386f44527ee15b57cc2883c95815 files/digest-flumotion-0.1.8 68
+MD5 dc4f60c50f91400eeb2023c59d6289ca files/digest-flumotion-0.2.0 68
 MD5 580aa0b30c3ddad180dcf614364f9dbb files/flumotion-init 1019
 MD5 64fe71faf82cc8e8ab2fd47c3dedb02b files/flumotion-init-0.1.8 952
-MD5 d1c45f6dac39d5c38cdde16dfcab7768 flumotion-0.1.6.ebuild 2315
-MD5 d59d41cbb82e7d28f7c74cf14297629d flumotion-0.1.7.ebuild 2313
-MD5 a86097db4f75c9a97d22e87bb7ca1f4c flumotion-0.1.8.ebuild 2740
+MD5 59b6edc4e3318fd608410bc42960917e files/flumotion-init-0.2.0 305
+MD5 c3170945226ce150c43f00ec3212a8e2 flumotion-0.1.8.ebuild 2738
+MD5 01495343c67ff44b2479a26655e310ad flumotion-0.2.0.ebuild 3440
 MD5 6050196ef420c3e4025029ebee5a813f metadata.xml 162
diff --git a/media-video/flumotion/files/digest-flumotion-0.1.6 b/media-video/flumotion/files/digest-flumotion-0.1.6
deleted file mode 100644
index 20bf22bf741a..000000000000
--- a/media-video/flumotion/files/digest-flumotion-0.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaaa93f8d2696164849c19d0c466fab9 flumotion-0.1.6.tar.bz2 574448
diff --git a/media-video/flumotion/files/digest-flumotion-0.1.7 b/media-video/flumotion/files/digest-flumotion-0.1.7
deleted file mode 100644
index 575aede66715..000000000000
--- a/media-video/flumotion/files/digest-flumotion-0.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 badba6b3c35a62b42920f5c35964017e flumotion-0.1.7.tar.bz2 600684
diff --git a/media-video/flumotion/files/digest-flumotion-0.2.0 b/media-video/flumotion/files/digest-flumotion-0.2.0
new file mode 100644
index 000000000000..1c8da4893b2d
--- /dev/null
+++ b/media-video/flumotion/files/digest-flumotion-0.2.0
@@ -0,0 +1 @@
+MD5 f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 786656
diff --git a/media-video/flumotion/files/flumotion-init-0.2.0 b/media-video/flumotion/files/flumotion-init-0.2.0
new file mode 100755
index 000000000000..50834f076d2d
--- /dev/null
+++ b/media-video/flumotion/files/flumotion-init-0.2.0
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting Flumotion"
+    HOME=/usr/share/flumotion start-stop-daemon --start --chuid flumotion:flumotion --exec /usr/sbin/flumotion start 
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping Flumotion"
+    /usr/sbin/flumotion stop
+    eend $?
+}
diff --git a/media-video/flumotion/flumotion-0.1.6.ebuild b/media-video/flumotion/flumotion-0.1.6.ebuild
deleted file mode 100644
index f21caa35ef3b..000000000000
--- a/media-video/flumotion/flumotion-0.1.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.6.ebuild,v 1.5 2006/01/09 22:17:03 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Flumotion Streaming server"
-HOMEPAGE="http://www.fluendo.com"
-SRC_URI="http://www.flumotion.net/src/flumotion/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="v4l speex jpeg dv"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.4
-	>=gnome-base/libglade-2
-	|| ( =media-libs/gstreamer-0.8.9-r2
-	=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*
-	v4l? ( =media-plugins/gst-plugins-v4l-0.8* )
-	=media-plugins/gst-plugins-ogg-0.8*
-	=media-plugins/gst-plugins-theora-0.8*
-	=media-plugins/gst-plugins-vorbis-0.8*
-	=media-plugins/gst-plugins-libpng-0.8*
-	speex? ( =media-plugins/gst-plugins-speex-0.8* )
-	dv? ( =media-plugins/gst-plugins-dv-0.8*
-	      =media-plugins/gst-plugins-raw1394-0.8* )
-	>=dev-python/pygtk-2.4.0
-	=dev-python/gst-python-0.8*
-	>=dev-python/twisted-1.3.0
-	dev-python/imaging
-	"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL \
-	  LICENCE.Flumotion LICENCE.GPL \
-	  NEWS README TODO"
-
-src_compile() {
-	econf --localstatedir=/var || die
-
-	emake || die
-
-}
-
-src_install() {
-	einstall
-
-	dodir /etc/flumotion
-	dodir /etc/flumotion/managers
-	dodir /etc/flumotion/managers/default
-	dodir /etc/flumotion/managers/default/flows
-	dodir /etc/flumotion/workers
-
-	insinto /etc/flumotion/managers/default/flows
-	cd ${S}/conf
-	doins managers/default/flows/ogg-test-theora.xml
-	insinto /etc/flumotion/managers/default
-	doins managers/default/planet.xml
-	insinto /etc/flumotion/workers
-	doins workers/default.xml
-
-	insinto /etc/flumotion
-	doins default.pem
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/flumotion-init flumotion
-
-	keepdir /var/run/flumotion
-	keepdir /var/log/flumotion
-}
-
-pkg_postinst() {
-	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
-		die "Unable to add flumotion user and flumotion group."
-	fi
-
-	for dir in /usr/share/flumotion /var/log/flumotion /var/run/flumotion; do
-		chown -R flumotion:flumotion ${dir}
-		chmod -R 755 ${dir}
-	done
-}
diff --git a/media-video/flumotion/flumotion-0.1.7.ebuild b/media-video/flumotion/flumotion-0.1.7.ebuild
deleted file mode 100644
index 5182c4614a0f..000000000000
--- a/media-video/flumotion/flumotion-0.1.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.7.ebuild,v 1.3 2005/12/06 07:21:38 zaheerm Exp $
-
-inherit eutils
-
-DESCRIPTION="Flumotion Streaming server"
-HOMEPAGE="http://www.fluendo.com"
-SRC_URI="http://www.flumotion.net/src/flumotion/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="v4l speex jpeg dv"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.4
-	>=gnome-base/libglade-2
-	|| ( =media-libs/gstreamer-0.8.9-r2
-	=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*
-	v4l? ( =media-plugins/gst-plugins-v4l-0.8* )
-	=media-plugins/gst-plugins-ogg-0.8*
-	=media-plugins/gst-plugins-theora-0.8*
-	=media-plugins/gst-plugins-vorbis-0.8*
-	=media-plugins/gst-plugins-libpng-0.8*
-	speex? ( =media-plugins/gst-plugins-speex-0.8* )
-	dv? ( =media-plugins/gst-plugins-dv-0.8*
-	      =media-plugins/gst-plugins-raw1394-0.8* )
-	>=dev-python/pygtk-2.4.0
-	=dev-python/gst-python-0.8*
-	>=dev-python/twisted-1.3.0
-	dev-python/imaging
-	"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL \
-	  LICENCE.Flumotion LICENCE.GPL \
-	  NEWS README TODO"
-
-src_compile() {
-	econf --localstatedir=/var || die
-
-	emake || die
-
-}
-
-src_install() {
-	einstall
-
-	dodir /etc/flumotion
-	dodir /etc/flumotion/managers
-	dodir /etc/flumotion/managers/default
-	dodir /etc/flumotion/managers/default/flows
-	dodir /etc/flumotion/workers
-
-	insinto /etc/flumotion/managers/default/flows
-	cd ${S}/conf
-	doins managers/default/flows/ogg-test-theora.xml
-	insinto /etc/flumotion/managers/default
-	doins managers/default/planet.xml
-	insinto /etc/flumotion/workers
-	doins workers/default.xml
-
-	insinto /etc/flumotion
-	doins default.pem
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/flumotion-init flumotion
-
-	keepdir /var/run/flumotion
-	keepdir /var/log/flumotion
-}
-
-pkg_postinst() {
-	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
-		die "Unable to add flumotion user and flumotion group."
-	fi
-
-	for dir in /usr/share/flumotion /var/log/flumotion /var/run/flumotion; do
-		chown -R flumotion:flumotion ${dir}
-		chmod -R 755 ${dir}
-	done
-}
diff --git a/media-video/flumotion/flumotion-0.1.8.ebuild b/media-video/flumotion/flumotion-0.1.8.ebuild
index 789de801ad07..f5dfc6520da2 100644
--- a/media-video/flumotion/flumotion-0.1.8.ebuild
+++ b/media-video/flumotion/flumotion-0.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.8.ebuild,v 1.4 2006/01/09 22:17:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.8.ebuild,v 1.5 2006/03/03 19:18:10 zaheerm Exp $
 
 inherit eutils
 
diff --git a/media-video/flumotion/flumotion-0.2.0.ebuild b/media-video/flumotion/flumotion-0.2.0.ebuild
new file mode 100644
index 000000000000..5771ce30c7c2
--- /dev/null
+++ b/media-video/flumotion/flumotion-0.2.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.2.0.ebuild,v 1.1 2006/03/03 19:18:10 zaheerm Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Flumotion Streaming server"
+HOMEPAGE="http://www.fluendo.com"
+SRC_URI="http://www.flumotion.net/src/flumotion/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="v4l speex jpeg dv gstreamer08"
+SLOT="0"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=dev-libs/glib-2.4
+	>=gnome-base/libglade-2
+	gstreamer08? ( =media-libs/gstreamer-0.8*
+		=media-libs/gst-plugins-0.8*
+		=media-plugins/gst-plugins-gnomevfs-0.8*
+		=media-plugins/gst-plugins-ogg-0.8*
+		=media-plugins/gst-plugins-theora-0.8*
+		=media-plugins/gst-plugins-vorbis-0.8*
+		=media-plugins/gst-plugins-libpng-0.8*
+		=dev-python/gst-python-0.8*
+		v4l? ( =media-plugins/gst-plugins-v4l-0.8* )
+		speex? ( =media-plugins/gst-plugins-speex-0.8* )
+		dv? ( =media-plugins/gst-plugins-dv-0.8* ) )
+	!gstreamer08? ( =media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-base-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		=media-plugins/gst-plugins-gnomevfs-0.10*
+		=media-plugins/gst-plugins-ogg-0.10*
+		=media-plugins/gst-plugins-theora-0.10*
+		=media-plugins/gst-plugins-vorbis-0.10*
+		=media-plugins/gst-plugins-libpng-0.10*
+		=dev-python/gst-python-0.10*
+		v4l? ( =media-plugins/gst-plugins-v4l-0.10* )
+		speex? ( =media-plugins/gst-plugins-speex-0.10* )
+		dv? ( =media-plugins/gst-plugins-dv-0.10*
+			=media-plugins/gst-plugins-raw1394-0.10* ) )
+	>=dev-python/pygtk-2.4.0
+	|| ( ( >=dev-python/twisted-2.0
+			>=dev-python/twisted-web-0.5.0-r1
+			>=dev-python/twisted-names-0.2.0 )
+			=dev-python/twisted-1.3* )
+	dev-python/imaging
+	"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL \
+	  LICENCE.Flumotion LICENCE.GPL \
+	  NEWS README TODO"
+
+src_compile() {
+	mkdir -p "${T}/home"
+	export HOME="${T}/home"
+	export GST_REGISTRY=${T}/home/registry.cache.xml
+	addpredict /root/.gconfd
+	addpredict /root/.gconf
+	addpredict /var/lib/cache/gstreamer-0.8
+	econf --disable-install-schemas --localstatedir=/var || die
+
+	emake || die
+	# fix ${exec_prefix} not being expanded
+	cd ${S}/bin
+	cp flumotion-manager flumotion-manager.orig
+	sed -e 's:${exec_prefix}:/usr':g flumotion-manager.orig \
+		> flumotion-manager
+	cp flumotion-worker flumotion-worker.orig
+	sed -e 's:${exec_prefix}:/usr':g flumotion-worker.orig \
+		> flumotion-worker
+	cp flumotion-admin flumotion-admin.orig
+	sed -e 's:${exec_prefix}:/usr':g flumotion-admin.orig \
+		> flumotion-admin
+}
+
+src_install() {
+	einstall
+
+	dodir /etc/flumotion
+	dodir /etc/flumotion/managers
+	dodir /etc/flumotion/managers/default
+	dodir /etc/flumotion/managers/default/flows
+	dodir /etc/flumotion/workers
+
+	cd ${S}/conf
+	insinto /etc/flumotion/managers/default
+	doins managers/default/planet.xml
+	insinto /etc/flumotion/workers
+	doins workers/default.xml
+
+	insinto /etc/flumotion
+	doins default.pem
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/flumotion-init-0.2.0 flumotion
+
+	keepdir /var/run/flumotion
+	keepdir /var/log/flumotion
+}
+
+pkg_postinst() {
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
+		die "Unable to add flumotion user and flumotion group."
+	fi
+
+	for dir in /usr/share/flumotion /var/log/flumotion /var/run/flumotion; do
+		chown -R flumotion:flumotion ${dir}
+		chmod -R 755 ${dir}
+	done
+}