Version bump. Several fixes to the ebuild together with zaheerm@gentoo.org.

Package-Manager: portage-2.1.4.4

5 files changed, 127 insertions, 6 deletions

diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index 837b4c9eb0ff..85011b2f5be1 100644
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/flumotion
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.13 2007/11/27 12:06:46 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.14 2008/10/27 19:49:49 deathwing00 Exp $
+
+  27 Oct 2008; Ioannis Aslanidis <iaslanidis@gentoo.org>
+  files/flumotion-init-0.2.0, metadata.xml, +flumotion-0.5.2.ebuild:
+  Version bump. Added fix for access violation of gconf. Added missing
+  dependency, dev-python/kiwi. All this done together with zaheerm.
+
+*flumotion-0.5.2 (27 Oct 2008)
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> flumotion-0.4.1.ebuild:
   Fixed quoting.
diff --git a/media-video/flumotion/Manifest b/media-video/flumotion/Manifest
index ce6008031331..2a378d4eec2d 100644
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@@ -1,5 +1,7 @@
-AUX flumotion-init-0.2.0 305 RMD160 df103ffae91c7a7f484dd4a5e3f6522889accfc4 SHA1 fb54adfb3a3e0f2791fd13c11e6ec56cb3438bc9 SHA256 19a471bcabb507c49951f9af807ce4811810c4b3316b99d7c46af34dfb7a2ace
+AUX flumotion-init-0.2.0 308 RMD160 29c6adb1376b3220e2f16ef9afc6ac61a3d30dc1 SHA1 a9ff20ef595db41111b8a5e2f70378e59f83b5a8 SHA256 841a5d9c6cd898c5c66143c64903930d62b7482c3b8ee5d38099b775178cba87
 DIST flumotion-0.4.1.tar.bz2 957882 RMD160 94148eaeed10a77c64a0ae09727d3475519d9412 SHA1 3f7524f69295606feba05a4e2b600ebd24f8450b SHA256 a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
+DIST flumotion-0.5.2.tar.bz2 1258968 RMD160 ffa0bc23be738e355473848e49e180c67f275d67 SHA1 6b6db9d0c87e121e1ba78b5edc4fc1c06f2aaaa0 SHA256 e900f701763db2f1d885b93ea1411351798239c292a19213b8e783d3df184f43
 EBUILD flumotion-0.4.1.ebuild 2871 RMD160 5c2430fa290db69955871f50bb6b5ae7fdb3e054 SHA1 dc3c2ca1b7d5d3a22d61c518064f1847797ffe08 SHA256 bf70257a14a27528aca20abc209715f627efa68cf5df733dfbf7938d0dc86c25
-MISC ChangeLog 1837 RMD160 c9760a5e884ede44bff4680e8f1b92758daacb37 SHA1 3efe7cac1f0ea73373c671fa1f6a2ccad3f7fbfa SHA256 a800ee2a21f8e5438913839d132602401899509c476fcd397af642f2bbd33994
-MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+EBUILD flumotion-0.5.2.ebuild 2934 RMD160 53ca8c0f198e23b50849c5ca92544f4a1bb41e23 SHA1 8a00fefc52abf65c262418e8176f24780c8eb716 SHA256 7c4fe70685eb88ca3692651c6ee2093430c525966f21b6b0e7d83fa7d879dbcc
+MISC ChangeLog 2142 RMD160 65febd019ffc6827d3404ee75ae720fc98dffc7f SHA1 ee169520bb17a9dc407e71b122ed236d3e62c89b SHA256 8173f020b1834939f48c0c1a5d782a086065a62b891cb7235ea8aadefffb4883
+MISC metadata.xml 350 RMD160 474c796c580f486207250514dece66c25fa99d9e SHA1 8be31989c6d80f29179ea6d7c7ec565538452e50 SHA256 6b686023bed568af85559e5db9e5324ae9514440e19f0c39989efbd4c912d091
diff --git a/media-video/flumotion/files/flumotion-init-0.2.0 b/media-video/flumotion/files/flumotion-init-0.2.0
index 50834f076d2d..de571785ff38 100755
--- a/media-video/flumotion/files/flumotion-init-0.2.0
+++ b/media-video/flumotion/files/flumotion-init-0.2.0
@@ -6,7 +6,7 @@ depend() {
 
 start() {
     ebegin "Starting Flumotion"
-    HOME=/usr/share/flumotion start-stop-daemon --start --chuid flumotion:flumotion --exec /usr/sbin/flumotion start 
+    HOME=/usr/share/flumotion start-stop-daemon -o --start --chuid flumotion:flumotion --exec /usr/sbin/flumotion start 
     eend $?
 }
 
diff --git a/media-video/flumotion/flumotion-0.5.2.ebuild b/media-video/flumotion/flumotion-0.5.2.ebuild
new file mode 100644
index 000000000000..d29b993e8348
--- /dev/null
+++ b/media-video/flumotion/flumotion-0.5.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 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.1 2008/10/27 19:49:49 deathwing00 Exp $
+
+inherit eutils gnome2
+
+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_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 --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
+	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
+}
+
diff --git a/media-video/flumotion/metadata.xml b/media-video/flumotion/metadata.xml
index 9e260ceca3e3..64409936b37f 100644
--- a/media-video/flumotion/metadata.xml
+++ b/media-video/flumotion/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gstreamer</herd>
+<maintainer>
+    <email>deathwing00@gentoo.org</email>
+    <name>deathwing00</name>
+</maintainer>
+<maintainer>
+    <email>zaheerm@gentoo.org</email>
+    <name>zaheerm</name>
+</maintainer>
 </pkgmetadata>