media-gfx/drqueue: 0.64.4

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 199 insertions, 5 deletions

diff --git a/media-gfx/drqueue/ChangeLog b/media-gfx/drqueue/ChangeLog
index 34448b648351..45ed998be250 100644
--- a/media-gfx/drqueue/ChangeLog
+++ b/media-gfx/drqueue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/drqueue
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v 1.6 2012/06/01 02:37:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v 1.7 2012/10/29 16:18:41 sping Exp $
+
+*drqueue-0.64.4 (29 Oct 2012)
+
+  29 Oct 2012; Sebastian Pipping <sping@gentoo.org> +drqueue-0.64.4.ebuild,
+  +files/drqueue-0.64.4-fpic.patch, +files/drqueue-0.64.4-git.patch:
+  Bump to 0.64.4
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> drqueue-0.64.3-r1.ebuild,
   drqueue-9999.ebuild:
diff --git a/media-gfx/drqueue/Manifest b/media-gfx/drqueue/Manifest
index 436fe5b7a431..4da9851fe42f 100644
--- a/media-gfx/drqueue/Manifest
+++ b/media-gfx/drqueue/Manifest
@@ -8,15 +8,19 @@ AUX drqueue-0.64.3-etc-envd-02drqueue 127 RMD160 781c6d3bd9a00a474d4b49a162137da
 AUX drqueue-0.64.3-etc-initd-drqmd 557 RMD160 ae9cc4ce1fa9bf19caeddcc825c4c711ccd41f84 SHA1 7336a4de4faf2892587042a8f40c32cda1e7598d SHA256 bf90a1610eaf3ed14d4f6f22be42320a4c22d2e7dd2c38bacfdbce22b3e47bf0
 AUX drqueue-0.64.3-etc-initd-drqsd 547 RMD160 ee6e959e6039f0634df647ffdaecf0767535e00b SHA1 08bc00e155d74efca7a43c6a2255741340a874a3 SHA256 2d9c4bf4b9d2f1e81196b03e85c7dd5a6be3bc2daa619e47fde49c438e782369
 AUX drqueue-0.64.3-sconstruct.patch 522 RMD160 4fe48917b88933f102cd71fc895487b537242df3 SHA1 416920c760d541cf03096dd74e8a29a951b94fa4 SHA256 cb52627a1c4cec6ef0cd8b6c4b140e81305ff7c834ac772a88c44286e9625e43
+AUX drqueue-0.64.4-fpic.patch 473 RMD160 2a9976f95c2ddcac645669cba6065708b7f48f71 SHA1 4296ba0dfee387646f5afd46678561df4c02ab0c SHA256 57495187142826765b45b54f39e51a934c5a034318a1cfe362ab12138de26d9a
+AUX drqueue-0.64.4-git.patch 611 RMD160 c268d5599f0b576c54a1352130823faacb608e9e SHA1 1cdf6d6f99dacd47f328f080e31d80e7ccb202d8 SHA256 5df316cd4439135d330a1126693cb26c4c96ed96e1ab35d19a9a927f3c9021f5
 DIST drqueue.0.64.3.tgz 336767 RMD160 a8205276e4420417e55e59df2f2a04a98641328d SHA1 bd7fc072591a8a34b43ab5041ae02b71f7f5eb55 SHA256 d26e9434b9551ca542b5fa4aaf4740b2faac55b9dca28d335913b7d065ccd127
+DIST drqueue.0.64.4.tgz 619577 RMD160 e33b7d89ccccb7725120fb1306e3a91647e9e2cd SHA1 4d5d810fb327955b40fe77514a9c0ba95f9841ad SHA256 a8753a41558e2d5af48a10071cb4a201b5e12f674d25127593bcf8a4bd1f634d
 EBUILD drqueue-0.64.3-r1.ebuild 3811 RMD160 1e2a51387bf1f0d1d70ff579a539127a85bb287f SHA1 835acecaaecd357c59a8e03b23b9c9fd3de25fe2 SHA256 1eed68b70b071a36043b7e87cb262b051221f496443b36f30ac81168888c6bb5
+EBUILD drqueue-0.64.4.ebuild 3894 RMD160 8558cad4386e62433f014fc8679bbcc733eedb56 SHA1 3ef7fab7565a77b96e64bbbbb5380dab77579598 SHA256 be942318d776e0e8a61cf9460986a0d6f49c812becfedf303744c11923d9fc7e
 EBUILD drqueue-9999.ebuild 3694 RMD160 c894bef14e6edd82c9c8c9e512dfb602bdb8137c SHA1 41a28dbd42c0013c5ffc82849d12b31f2a134caf SHA256 db800b6a4a5d4e0e4ae63aee210f468d6500997c40d4cfa03b4a73e3d62c9f60
-MISC ChangeLog 1434 RMD160 b8621c2f4a79130b25d3c8905581ddd2a27fa843 SHA1 ec20632bd8cea4b4e5269d761c5fe3ecac26134a SHA256 c497200363f963cb85c55f745311f7b43037a57b8d264f5f78d9e929a3969430
+MISC ChangeLog 1626 RMD160 e4690ba5ea48f1eea1d969a1a0fef0209f60c4e9 SHA1 345504a69a3b3e54039dc7c6cc766851aee45f8a SHA256 179e2e9b773496d4a9fc1bc8222e4a22823180f9a82974dc694b9b4670f1dce0
 MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/IKuEACgkQ/ejvha5XGaMhrACgxwrDLKgSIpTK0Iinc2QZSI4u
-mLYAniXy1L3/ixnpDAa7GmdVdJTKk4H5
-=zV13
+iEYEARECAAYFAlCOrGoACgkQsAvGakAaFgCjRgCgnmVtxLLlvjfcOqobR/J2z0gu
+wsYAn3aG45lCrjORigmaPqhLYN3dZWTD
+=qSpR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/drqueue/drqueue-0.64.4.ebuild b/media-gfx/drqueue/drqueue-0.64.4.ebuild
new file mode 100644
index 000000000000..bea50ef03566
--- /dev/null
+++ b/media-gfx/drqueue/drqueue-0.64.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-0.64.4.ebuild,v 1.1 2012/10/29 16:18:41 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit eutils distutils user
+
+DESCRIPTION="Render farm managing software"
+HOMEPAGE="http://www.drqueue.org/"
+SRC_URI="http://drqueue.org/files/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X python ruby"
+
+RDEPEND="X? ( x11-libs/gtk+:2 )
+	 ruby? ( dev-lang/ruby )
+	 app-shells/tcsh"
+
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	python? ( dev-python/setuptools )
+	>=dev-util/scons-0.97"
+
+S=${WORKDIR}/DrQueue-${PV}
+
+pkg_setup() {
+	enewgroup drqueue
+	enewuser drqueue -1 /bin/bash /dev/null daemon,drqueue
+
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fpic.patch
+	epatch "${FILESDIR}"/${P}-git.patch
+
+	# Workaround broken SWIG path
+	ln -s ../libdrqueue python/libdrqueue || die
+}
+
+src_compile() {
+	python --version
+
+	if use X; then
+		scons ${MAKEOPTS} build_drman=yes || die "scons failed"
+	else
+		scons ${MAKEOPTS} build_drqman=no || die "scons failed"
+	fi
+
+	if use python; then
+		einfo "compiling python bindings"
+		cd "${S}"/python/
+		distutils_src_compile
+	fi
+
+	if use ruby; then
+		einfo "compiling ruby bindings"
+		cd "${S}"/ruby/
+		ruby extconf.rb
+		emake || die "emake failed"
+	fi
+}
+
+pkg_preinst() {
+	# stop daemons since script is being updated
+	[ -n "$(pidof drqsd)" -a -x /etc/init.d/drqsd ] && \
+			/etc/init.d/drqsd stop
+	[ -n "$(pidof drqmd)" -a -x /etc/init.d/drqmd ] && \
+			/etc/init.d/drqmd stop
+}
+
+src_install() {
+	dodir /var/lib
+	scons PREFIX="${D}"/var/lib install || die "install failed"
+
+	# not really needed
+	rm -R "${D}"/var/lib/drqueue/bin/viewcmd || die "rm failed"
+
+	# install {conf,init,env}.d files
+	for i in drqmd drqsd ; do
+		newinitd "${FILESDIR}"/${PN}-0.64.3-etc-initd-${i} ${i} || die "newinitd failed"
+		newconfd "${FILESDIR}"/${PN}-0.64.3-etc-confd-${i} ${i} || die "newconfd failed"
+	done
+	newenvd "${FILESDIR}"/${PN}-0.64.3-etc-envd-02drqueue 02drqueue || die "newenvd failed"
+
+	# create the drqueue pid directory
+	dodir /var/run/drqueue
+	keepdir /var/run/drqueue
+
+	# move logs dir to /var/log
+	dodir /var/log
+	mv "${D}"/var/lib/drqueue/logs "${D}"/var/log/drqueue
+
+	# fix bins and make links for /usr/bin
+	dodir /usr/bin
+	local commands=( blockhost cjob jobfinfo \
+			jobinfo master requeue sendjob slave )
+	if use X ; then
+		commands=( ${commands[@]} drqman )
+	else
+		# Remove drqman leftovers
+		for i in etc/drqman.rc etc/drqman.conf bin/drqman ; do
+			rm -v "${D}"/var/lib/drqueue/$i || die "rm failed"
+		done
+	fi
+	for cmd in ${commands[@]} ; do
+		dosed 's|SHLIB=\$DRQUEUE_ROOT/bin/shlib|SHLIB=/var/lib/drqueue/bin/shlib|' \
+				/var/lib/drqueue/bin/${cmd} || die "dosed failed"
+		dosym /var/lib/drqueue/bin/${cmd} /usr/bin/ \
+				|| die "dosym failed"
+	done
+
+	# install documentation
+	dodoc AUTHORS ChangeLog INSTALL \
+			NEWS README README.mentalray \
+			README.python setenv || die "dodoc failed"
+
+	if use python; then
+		cd "${S}"/python/
+		distutils_src_install
+		dodir /var/lib/${PN}/python
+
+		# Install DRKeewee web service and example python scripts
+		insinto /var/lib/${PN}/python
+		doins -r DrKeewee examples || die "doins failed"
+		python_convert_shebangs -r 2 "${ED}var/lib/${PN}/python"
+	fi
+
+	if use ruby; then
+		cd "${S}"/ruby/
+		emake DESTDIR="${D}" install || die "emake failed"
+	fi
+}
+
+pkg_postinst() {
+	einfo "Edit /etc/conf.d/drqsd /etc/env.d/02drqueue"
+	einfo "and /etc/conf.d/drqmd DRQUEUE_MASTER=\"hostname\""
+	einfo "to reflect your master's hostname."
+	if use python ; then
+		einfo
+		einfo "DrKeewee can be found in /var/lib/drqueue/python"
+
+		distutils_pkg_postinst
+	fi
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/media-gfx/drqueue/files/drqueue-0.64.4-fpic.patch b/media-gfx/drqueue/files/drqueue-0.64.4-fpic.patch
new file mode 100644
index 000000000000..217728f181a2
--- /dev/null
+++ b/media-gfx/drqueue/files/drqueue-0.64.4-fpic.patch
@@ -0,0 +1,11 @@
+--- DrQueue-0.64.4/SConstruct	2012-10-29 17:11:02.462831439 +0100
++++ DrQueue-0.64.4/SConstruct	2012-10-29 17:11:08.746752880 +0100
+@@ -141,7 +141,7 @@
+ 
+ print "Platform is: ",sys.platform
+ if sys.platform == "linux2":
+-  env_lib.Append (CPPDEFINES = Split ('-D__LINUX'))
++  env_lib.Append (CPPDEFINES = Split ('-D__LINUX'),CFLAGS = Split ('-fPIC'))
+ elif sys.platform == "darwin":
+   env_lib.Append (CPPDEFINES = Split ('-D__OSX'))
+   if env_lib.get('universal_binary'):
diff --git a/media-gfx/drqueue/files/drqueue-0.64.4-git.patch b/media-gfx/drqueue/files/drqueue-0.64.4-git.patch
new file mode 100644
index 000000000000..3d87ceef6345
--- /dev/null
+++ b/media-gfx/drqueue/files/drqueue-0.64.4-git.patch
@@ -0,0 +1,17 @@
+--- DrQueue-0.64.4/SConstruct	2012-10-29 16:40:29.396747920 +0100
++++ DrQueue-0.64.4/SConstruct	2012-10-29 16:49:00.676356045 +0100
+@@ -79,8 +79,12 @@
+ 		print("Not a Git repository. Can't fetch commit id.")
+ 		commit_string = ""
+ 	else:
+-		commit_string = gitlog.communicate()[0].split("\n")[0].split(" ")[1]
+-		print("Current Git commit id is: "+commit_string)
++		output = gitlog.communicate()[0]
++		if output:
++			commit_string = output.split("\n")[0].split(" ")[1]
++			print("Current Git commit id is: "+commit_string)
++		else:
++			commit_string = ""
+ 	return commit_string
+ 
+ def write_git_rev(commit_id):