Version bump.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 283 insertions, 4 deletions

diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index 075773074de3..23b60eb48bcf 100644
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/flumotion
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.15 2008/11/02 16:49:24 jmbsvicetto Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.16 2009/02/13 11:48:58 deathwing00 Exp $
+
+*flumotion-0.5.3 (13 Feb 2009)
+
+  13 Feb 2009; Ioannis Aslanidis <iaslanidis@gentoo.org>
+  +files/flumotion-0.5.3-missing-files.diff, +flumotion-0.5.3.ebuild:
+  Version bump. Added files that are missing in the default flumotion tarball
+  for version 0.5.3. Fixed problems with gconf.
 
   02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/media-video/flumotion/files/flumotion-0.5.3-missing-files.diff b/media-video/flumotion/files/flumotion-0.5.3-missing-files.diff
new file mode 100644
index 000000000000..aa8899339b55
--- /dev/null
+++ b/media-video/flumotion/files/flumotion-0.5.3-missing-files.diff
@@ -0,0 +1,163 @@
+Index: flumotion-0.5.3/flumotion/scenario/live/Makefile.am
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/live/Makefile.am	(revision 7757)
++++ flumotion-0.5.3/flumotion/scenario/live/Makefile.am	(working copy)
+@@ -4,6 +4,10 @@
+ component_PYTHON = \
+ 	__init__.py \
+ 	wizard_gtk.py
++
++component_DATA = \
++	live.xml
++
+ TAGS_FILES = $(component_PYTHON)
+ 
+ clean-local:
+Index: flumotion-0.5.3/flumotion/scenario/live/live.xml
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/live/live.xml	(revision 0)
++++ flumotion-0.5.3/flumotion/scenario/live/live.xml	(revision 0)
+@@ -0,0 +1,26 @@
++<registry>
++    <scenarios>
++        <scenario type="live-scenario"
++                  base="flumotion/scenario/live"
++                  _description="Creates a live stream.">
++            <entries>
++                <entry type="wizard" location="wizard_gtk.py"
++                       function="LiveAssistantPlugin" />
++            </entries>
++        </scenario>
++    </scenarios>
++    <bundles>
++        <bundle name="live-scenario-base">
++            <dependencies>
++                <dependency name="scenario-base"/>
++                <dependency name="scenario-steps"/>
++            </dependencies>
++            <directories>
++                <directory name="flumotion/scenario/live">
++                    <filename location="wizard_gtk.py" />
++                    <filename location="__init__.py" />
++                </directory>
++            </directories>
++        </bundle>
++    </bundles>
++</registry>
+Index: flumotion-0.5.3/flumotion/scenario/scenario.xml
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/scenario.xml	(revision 0)
++++ flumotion-0.5.3/flumotion/scenario/scenario.xml	(revision 0)
+@@ -0,0 +1,11 @@
++<registry>
++    <bundles>
++        <bundle name="scenario-base">
++            <directories>
++                <directory name="flumotion/scenario">
++                    <filename location="__init__.py" />
++                </directory>
++            </directories>
++        </bundle>
++    </bundles>
++</registry>
+Index: flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml	(revision 0)
++++ flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml	(revision 0)
+@@ -0,0 +1,26 @@
++<registry>
++    <scenarios>
++        <scenario type="ondemand-scenario"
++                  base="flumotion/scenario/ondemand"
++                  _description="Creates an ondemand stream.">
++            <entries>
++                <entry type="wizard" location="wizard_gtk.py"
++                       function="OndemandAssistantPlugin" />
++            </entries>
++        </scenario>
++    </scenarios>
++    <bundles>
++        <bundle name="ondemand-scenario-base">
++            <dependencies>
++                <dependency name="scenario-base" />
++                <dependency name="scenario-steps"/>
++            </dependencies>
++            <directories>
++                <directory name="flumotion/scenario/ondemand">
++                    <filename location="wizard_gtk.py" />
++                    <filename location="__init__.py" />
++                </directory>
++            </directories>
++        </bundle>
++    </bundles>
++</registry>
+Index: flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am	(revision 7757)
++++ flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am	(working copy)
+@@ -5,6 +5,9 @@
+ 		__init__.py \
+ 		wizard_gtk.py
+ 
++component_DATA = \
++	ondemand.xml
++
+ TAGS_FILES = $(component_PYTHON)
+ 
+ clean-local:
+Index: flumotion-0.5.3/flumotion/scenario/Makefile.am
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/Makefile.am	(revision 7757)
++++ flumotion-0.5.3/flumotion/scenario/Makefile.am	(working copy)
+@@ -4,6 +4,9 @@
+ component_PYTHON = \
+ 	__init__.py
+ 
++component_DATA = \
++	scenario.xml
++
+ TAGS_FILES = $(component_PYTHON)
+ 
+ clean-local:
+Index: flumotion-0.5.3/flumotion/scenario/steps/Makefile.am
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/steps/Makefile.am	(revision 7757)
++++ flumotion-0.5.3/flumotion/scenario/steps/Makefile.am	(working copy)
+@@ -13,6 +13,9 @@
+ 	shout2steps.py \
+ 	summarysteps.py
+ 
++component_DATA = \
++	steps.xml
++
+ TAGS_FILES = $(component_PYTHON)
+ 
+ clean-local:
+Index: flumotion-0.5.3/flumotion/scenario/steps/steps.xml
+===================================================================
+--- flumotion-0.5.3/flumotion/scenario/steps/steps.xml	(revision 0)
++++ flumotion-0.5.3/flumotion/scenario/steps/steps.xml	(revision 0)
+@@ -0,0 +1,23 @@
++<registry>
++    <bundles>
++        <bundle name="scenario-steps">
++            <dependencies>
++                <dependency name="scenario-base"/>
++            </dependencies>
++            <directories>
++                <directory name="flumotion/scenario/steps">
++                    <filename location="consumptionsteps.py"/>
++                    <filename location="conversionsteps.py"/>
++                    <filename location="diskersteps.py"/>
++                    <filename location="httpstreamersteps.py"/>
++                    <filename location="__init__.py"/>
++                    <filename location="ondemandstep.py"/>
++                    <filename location="productionsteps.py"/>
++                    <filename location="shout2steps.py"/>
++                    <filename location="summarysteps.py"/>
++                    <filename location="licensestep.py"/>
++                </directory>
++            </directories>
++        </bundle>
++    </bundles>
++</registry>
diff --git a/media-video/flumotion/flumotion-0.5.2.ebuild b/media-video/flumotion/flumotion-0.5.2.ebuild
index ceb6c78c95b8..a224cdd9f530 100644
--- a/media-video/flumotion/flumotion-0.5.2.ebuild
+++ b/media-video/flumotion/flumotion-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.5.2.ebuild,v 1.2 2008/10/28 02:08:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.5.2.ebuild,v 1.3 2009/02/13 11:48:58 deathwing00 Exp $
 
 inherit eutils gnome2
 
diff --git a/media-video/flumotion/flumotion-0.5.3.ebuild b/media-video/flumotion/flumotion-0.5.3.ebuild
new file mode 100644
index 000000000000..8f0fd7f63a8b
--- /dev/null
+++ b/media-video/flumotion/flumotion-0.5.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.5.3.ebuild,v 1.1 2009/02/13 11:48:58 deathwing00 Exp $
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Flumotion Streaming server"
+HOMEPAGE="http://www.flumotion.net"
+SRC_URI="http://www.flumotion.net/src/flumotion/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~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.10.11
+	>=media-libs/gst-plugins-base-0.10.11
+	=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.8.6
+	>=dev-python/twisted-2.0
+	>=dev-python/twisted-web-0.5.0-r1
+	>=dev-python/twisted-names-0.2.0
+	dev-python/imaging
+	dev-python/kiwi
+	"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL \
+	  LICENCE.Flumotion LICENCE.GPL \
+	  NEWS README TODO"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-missing-files.diff"
+	eautoreconf
+}
+
+src_compile() {
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	mkdir -p "${T}/home"
+	export HOME="${T}/home"
+	export GST_REGISTRY=${T}/home/registry.cache.xml
+	unset LINGUAS
+	econf --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
+	newinitd "${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
+}