idella4 15/03/14 05:11:45 Modified: drqueue-9999.ebuild ChangeLog Added: drqueue-0.64.4-r1.ebuild Log: revbump; conversion -> distutils-r1 wrt bug #541328 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.7 media-gfx/drqueue/drqueue-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild?r1=1.6&r2=1.7 Index: drqueue-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- drqueue-9999.ebuild 1 Jun 2012 02:37:10 -0000 1.6 +++ drqueue-9999.ebuild 14 Mar 2015 05:11:45 -0000 1.7 @@ -1,13 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.6 2012/06/01 02:37:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/drqueue-9999.ebuild,v 1.7 2015/03/14 05:11:45 idella4 Exp $ -EAPI="3" -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" +EAPI=5 -inherit distutils git-2 user +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 git-2 user DESCRIPTION="Render farm managing software" HOMEPAGE="http://www.drqueue.org/"; @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) - python? ( dev-python/setuptools ) + python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) >=dev-util/scons-0.97" pkg_setup() { @@ -44,8 +44,9 @@ if use python; then einfo "compiling python bindings" - cd "${S}"/python/ - distutils_src_compile + pushd "${S}"/python/ > /dev/null + distutils-r1_src_compile + popd > /dev/null fi if use ruby; then @@ -99,8 +100,8 @@ 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" + sed -e 's|SHLIB=\$DRQUEUE_ROOT/bin/shlib|SHLIB=/var/lib/drqueue/bin/shlib|' \ + -i "${D}"var/lib/drqueue/bin/${cmd} || die "sed failed" dosym /var/lib/drqueue/bin/${cmd} /usr/bin/ \ || die "dosym failed" done @@ -113,13 +114,13 @@ if use python; then cd "${S}"/python/ - distutils_src_install + distutils-r1_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" + python_fix_shebang "${ED}var/lib/${PN}/python" fi if use ruby; then @@ -135,11 +136,5 @@ 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 -} 1.8 media-gfx/drqueue/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 29 Oct 2012 16:18:41 -0000 1.7 +++ ChangeLog 14 Mar 2015 05:11:45 -0000 1.8 @@ -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.7 2012/10/29 16:18:41 sping Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/drqueue/ChangeLog,v 1.8 2015/03/14 05:11:45 idella4 Exp $ + +*drqueue-0.64.4-r1 (14 Mar 2015) + + 14 Mar 2015; Ian Delaney <[email protected]> +drqueue-0.64.4-r1.ebuild, + drqueue-9999.ebuild: + revbump; conversion -> distutils-r1 wrt bug #541328 *drqueue-0.64.4 (29 Oct 2012) @@ -40,4 +46,3 @@ +files/drqueue-0.64.3-sconstruct.patch, +drqueue-9999.ebuild, +metadata.xml: New package (fixes bug #69553) - 1.1 media-gfx/drqueue/drqueue-0.64.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/drqueue-0.64.4-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/drqueue/drqueue-0.64.4-r1.ebuild?rev=1.1&content-type=text/plain Index: drqueue-0.64.4-r1.ebuild =================================================================== # Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/03/14 05:11:45 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 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[${PYTHON_USEDEP}] ) >=dev-util/scons-0.97" S=${WORKDIR}/DrQueue-${PV} PATCHES=( "${FILESDIR}"/${P}-fpic.patch "${FILESDIR}"/${P}-git.patch ) pkg_setup() { enewgroup drqueue enewuser drqueue -1 /bin/bash /dev/null daemon,drqueue use python && python-single-r1_pkg_setup } python_prepare() { distutils-r1_python_prepare # Workaround broken SWIG path ln -s ../libdrqueue python/libdrqueue || die } src_compile() { 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" pushd "${S}"/python/ > /dev/null distutils-r1_src_compile popd > /dev/null 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 sed -e 's|SHLIB=\$DRQUEUE_ROOT/bin/shlib|SHLIB=/var/lib/drqueue/bin/shlib|' \ -i "${D}"var/lib/drqueue/bin/${cmd} || die "sed 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-r1_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_fix_shebang "${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" fi }
