Bump to EAPI=5. Switch to python-r1, bug #528538. Fixes build with system interpreter...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index a6d1dcffd1457b5c792ef2be8a35c12030a72e29..ff01b3367b30aef47c82051135ff2024136c2f33 100644 (file)
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/flumotion
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.26 2014/01/08 06:04:33 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.27 2015/01/05 23:35:15 eva Exp $
+
+*flumotion-0.8.1-r1 (05 Jan 2015)
+
+  05 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  +flumotion-0.8.1-r1.ebuild, +files/flumotion-init-3:
+  Bump to EAPI=5. Switch to python-r1, bug #528538. Fixes build with system
+  interpreter not being python2, bug #431522. Move /var/run/flumotion
+  management to init script, bug #450900. Unittests should now pass, bug
+  #330535.
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> flumotion-0.8.1.ebuild:
   Inherit the user eclass for enewuser/etc...

diff --git a/media-video/flumotion/Manifest b/media-video/flumotion/Manifest
index e42a6e89d52e70d6bc61f489f68d789d6d2ecdb3..2b5789025959972af07f6a3dafdbf6c0186d7b42 100644 (file)
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@@ -2,24 +2,16 @@
 Hash: SHA256
 
 AUX flumotion-init-0.2.0 308 SHA256 841a5d9c6cd898c5c66143c64903930d62b7482c3b8ee5d38099b775178cba87 SHA512 768fc204022f3bec694483cbbd69d75c61ef4c4f3196a8915d44b6ebf2f18f1ec572abf140330a1f310dc1999607ca118645c04242fad85c623925ac50a5cc09 WHIRLPOOL 07aa7e6522e2af8a108a892579479767bc1b804ca72decc313e1e65f9583ed6adc62caf588c136144d9ea33c69743cd67d9f960aeb1a678177e729e808743866
-DIST flumotion-0.8.1.tar.bz2 1516513 SHA256 ae53684e504ef8793a08e70d17892a090c53ebf9bd470f8081b9c9949d53db4d
+AUX flumotion-init-3 454 SHA256 e4b7f702e2dcebedd5c7aab8f020726e525b682d18c94208da0e44ed6b5253c2 SHA512 4760325a266817ac9029cf0ba7b514af307c04d236c85428c67d454e16ab06b9ced01bbe94395fd8df78c78492c6dddcdca628fe9c9e94129baf0f0b62193841 WHIRLPOOL 3615652747ec151b40c9c65b2559b2c16e38f9a167f53ab5c9539ba6e2b883b7cd0f722dad048bdefaff3aa20975bddbf8d76d2d94f8b2050e656148f06a9135
+DIST flumotion-0.8.1.tar.bz2 1516513 SHA256 ae53684e504ef8793a08e70d17892a090c53ebf9bd470f8081b9c9949d53db4d SHA512 87fa4b517d9ab59d0fc624e1047aad26d4319cedd36c6cfaab751fc3c984281b18c640caa8a363b39b3df1c2a6d5a4adbe627525dac155ef263b635884300994 WHIRLPOOL 9ceca56fd9d63b0bcceff9354f5f90d7d724d6fc37e218031d4124ee19bad07ed18aca39407d3b75a1cd1f2c54d0892bafc13fb04d8f6208119e463f52239b8b
+EBUILD flumotion-0.8.1-r1.ebuild 3307 SHA256 44d27e4207fe51396c12a9ad2d829625cf58f5df75176d5b14dcdcda4e96630c SHA512 d77d1b2eb5b0fac510118b584b6f7f6034f32ad285238bd51189e1d45fe4db14b0bb7da2f5e33aa2f951151da4c07832dfa3d11e5511e5bd196f064a40c9d07d WHIRLPOOL bd340fd8bdcd4b4c918cdd27e673cd3b15d7ca99f996d5555ad09023d3ee0d684f4fcd40a8d8c6687926ee80b519f0c4d1dc3c7cd1f0f4a8e6163cea6fe0180a
 EBUILD flumotion-0.8.1.ebuild 2820 SHA256 68e05e7a0e641f7010645c986fa30a179f61badc2b9790d9b1bcb326fcf46a38 SHA512 b1aed29f4206613e1f11bc1530604022cee05b67d24d56b75f95ddeeeb5084815c1e94a1c58911ac67b6dfc5f875282db39f5c97226a1d6cbe7a3843a5d94a1f WHIRLPOOL 42641897fd56b1b509607467f646e1d3bf7df9537967dd5b2d2acd6609054a4c474ba8109967bacf191d93282922ae9a61f6fba05a52d292137c73c70e0b4588
-MISC ChangeLog 3887 SHA256 78305e1b8fd8c05e2e5760ae0690d84e136f6982f656b2c70e1b16a473b4d35f SHA512 89fc1ee4a07fab7d6a55339b1df6b9891115564b992d0f50459586efb65d183929923f16859a8394d986a4423eef182d597550e6aa5ab120636620ca96c4a601 WHIRLPOOL bd90fcda7fb199f1d156c832649ec2a778261c8585338cff9fc6760b35c89e395ad1ae83c80188a30dec30904563e941a78423c62a4e15514b94e46854845b05
+MISC ChangeLog 4259 SHA256 f72bf9eaeb4d92cf6dd12a7965290150d61d9ccf0f07731199127bfb7bf969d5 SHA512 1f2826b3011bd7308955e6a8a72307242fbc6748fb88f2731646a8db06104121076b34d16d1a8f1ee411886f56afc7a7ad3c8ea0e930c6cf16b16b952cc4d657 WHIRLPOOL 9a0a8bdab2fa358526ed390e1282209745d2b1b08820f8b0eae64c0734b4e450bc6da092e6fb04c8861c809955b234209eafde9656ea3dc59f11b8a8b8894146
 MISC metadata.xml 164 SHA256 63f0c98dbf90a122aa2c9bd6088d3b8a7de6b79f90558e53d175603207f1b01d SHA512 5de3dc5635ad165cdd027b8674ceddb630c486e2458c83fc5f543db675005ca535a4ddcba8b5578861be1ecb358cee1606f7864f20324b41df555006e005afc6 WHIRLPOOL 829c750ce54be5edbc6496df4d4ff40c572d432b8860a237b1c3d3f2e40a44dad2316c44c848a48a1a0583e5155e979dd3a4dfecb2cb6b911d054d31d3b2219d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSzOp5AAoJEPGu1DbS6WIAFPsP/0uoKaSuxYrs6bW5kUF0BWNR
-4wi7hAMZlMIxM17nkNmjnBpkpRt9/WnxX7de6Nw7mPhW1a3pZN676fHu09LYxMwH
-u65JJcTKY/pjhPaDkITLD4drj9m+RND5rkSSDyQ2OSK5KI5mYJahzlBjShzJkht5
-1y+V4h1ZiUYlT4Mc3tWuCfrcmqECEuskHeai9gHrelUufi9PlWQa9yWinKcPlAR+
-aXneGR4+5KHKypWBJ6P7hTP9aa3H/Um+GTpo5RFuCnju5NBrSj22Docl1Ud9PR7i
-FbbQtWXTmUQ/Iwakccxdm52Qjg3CZ3z15Mw9Q8lRnyXVoZh1I66X3tGwDfxOWFNT
-ZliROodSsYJloLM97NmScPCbd9t04ZiEPegx3744wyKWzLjxEKAeKHT7T+AOZg0z
-i9j6EayNuE8+dToCeXUnsNy5On+3komZ8bvWKlAZbJ3nndf23vlrb1FnpxvyOFj3
-iElLBl9coLXAmEGnHkFqmthcYQlAFTSQk7QYU+CP2v915EVRSDk6I8DGsu+m4FcE
-fxbm5pfU9eCizoWJQdzWXGU1l/EJ8RKkzZx9kaRL0KlUegtM48DMD77z37EHpqlq
-HknjeuXx6Hez2k24eTQrG3TSltomp9QNGWa9de1UcDdevcc9VDRgjX5UHdQezy2m
-h10z6tN1Kbgt4WmtKjpU
-=gIOo
+iEYEAREIAAYFAlSrH7QACgkQ1fmVwcYIWAb5sQCfXSpnBDTuUfMXxTSQBCw3dOQV
+N4oAniQmWGl3C2wxWFB09IK1FiuZCOy1
+=acRw
 -----END PGP SIGNATURE-----

diff --git a/media-video/flumotion/files/flumotion-init-3 b/media-video/flumotion/files/flumotion-init-3
new file mode 100644 (file)
index 0000000..898eae0
--- /dev/null
+++ b/media-video/flumotion/files/flumotion-init-3
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting Flumotion"
+    if [ ! -d /var/run/flumotion ] ; then
+        mkdir /var/run/flumotion
+        chown flumotion:flumotion /var/run/flumotion
+        chmod 755 /var/run/flumotion
+    fi
+
+    start-stop-daemon -o --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.8.1-r1.ebuild b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
new file mode 100644 (file)
index 0000000..309331d
--- /dev/null
+++ b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.8.1-r1.ebuild,v 1.1 2015/01/05 23:35:15 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user virtualx # AC_CHECK_PROG for Xvfb
+
+DESCRIPTION="Flumotion Streaming server"
+HOMEPAGE="http://www.flumotion.net/"
+SRC_URI="http://www.flumotion.net/src/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2" # LICENSE.Flumotion
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO:
+
+# These would be from 0.6.2's ebuild
+# media-plugins/gst-plugins-libpng:0.10
+# dev-python/twisted-web
+# dev-python/twisted-names
+# dev-python/imaging
+
+# These are from README
+RDEPEND="
+       dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+       dev-python/kiwi[${PYTHON_USEDEP}]
+       dev-python/pycairo[${PYTHON_USEDEP}]
+       dev-python/pygtk:2[${PYTHON_USEDEP}]
+       dev-python/twisted-core[${PYTHON_USEDEP}]
+       media-libs/gstreamer:0.10
+       media-libs/gst-plugins-base:0.10
+       media-libs/gst-plugins-good:0.10
+       media-plugins/gst-plugins-ogg:0.10
+       media-plugins/gst-plugins-theora:0.10
+       media-plugins/gst-plugins-vorbis:0.10
+"
+# These are from README and error and trial FEATURES="test" Import's
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPEND}
+       dev-util/intltool
+       sys-devel/gettext
+       virtual/pkgconfig
+       doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+       test? ( dev-python/icalendar[${PYTHON_USEDEP}]
+               dev-python/pychecker[${PYTHON_USEDEP}]
+               dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+       # Fix .desktop file
+       sed -e 's/.png//' -i data/flumotion-admin.desktop.in || die
+
+       # Fix shebangs
+       sed -e '1 s:.*:#!/usr/bin/env python:' \
+               -i bin/flu*.in bin/runtest.in misc/flu*.in || die
+       python_fix_shebang bin/flu*.in bin/runtest.in misc/flu*.in
+}
+
+src_configure() {
+       append-cflags -fno-strict-aliasing
+
+       econf \
+               --localstatedir=/var \
+               $(use_enable doc docs)
+}
+
+src_compile() {
+       emake -j1 fdpass_so_LINK="$(tc-getCC) ${LDFLAGS} -shared -o fdpass.so"
+}
+
+src_test() {
+       # FIXME: restrict unittests to flumotion source folder
+       # other tests are failing in weird ways and does not seem to test much of flumotion
+       Xemake -j1 check -C flumotion
+}
+
+src_install() {
+       emake -j1 DESTDIR="${D}" install
+       einstalldocs
+       dodoc RELEASE
+
+       keepdir /var/log/flumotion
+
+       newinitd "${FILESDIR}"/flumotion-init-3 flumotion
+
+       # /usr/share/hal/fdi/policy/20thirdparty/91-flumotion-device-policy.fdi
+       rm -rf "${D}"/usr/share/hal || die
+
+       dodir /etc/flumotion
+       dodir /etc/flumotion/managers
+       dodir /etc/flumotion/managers/default
+       dodir /etc/flumotion/managers/default/flows
+       dodir /etc/flumotion/workers
+
+       pushd 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
+       popd
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+
+       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 ; do
+               chown -R flumotion:flumotion "${dir}"
+               chmod -R 755 "${dir}"
+       done
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+}