revbump; conversion -> distutils-r1 wrt bug #541328

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 195 insertions, 44 deletions

diff --git a/media-gfx/drqueue/ChangeLog b/media-gfx/drqueue/ChangeLog
index 45ed998be250..1b1d74ef2257 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.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 <idella4@gentoo.org> +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)
-
diff --git a/media-gfx/drqueue/Manifest b/media-gfx/drqueue/Manifest
index 4da9851fe42f..de40292010ab 100644
--- a/media-gfx/drqueue/Manifest
+++ b/media-gfx/drqueue/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX drqueue-0.64.3-compile-flags.patch 783 RMD160 7c41b082a5a52bf41aaad67726ef0f443b419a3f SHA1 00f7700768e901f63985d90229236326868de612 SHA256 3116d2ae9c4fcef4106632ffebf2ced6120e40f59004cc194ae9472eede33803
-AUX drqueue-0.64.3-etc-confd-drqmd 608 RMD160 a657a49a9e7f3f5a9c87c7efc0579acf233387c6 SHA1 646f280d70e09e378eece00925edb8d4c01ab0fa SHA256 752f04aba12a3e23009bbbc83ba60c15d73dc290d34a668dd88657de79be5490
-AUX drqueue-0.64.3-etc-confd-drqsd 718 RMD160 794b79d2160a710fb5924bc8054bf2bd4702d5fd SHA1 b49f878843960a615b22156d675036a215f891c0 SHA256 36b0ae1b24ca5f13c979c597f72dc040ece7fa568f6ae86b682b0f5d0b4a5366
-AUX drqueue-0.64.3-etc-envd-02drqueue 127 RMD160 781c6d3bd9a00a474d4b49a162137daf6d5eac2b SHA1 bbc717395d558249690ff3fe77488ff23a9177dc SHA256 99e976a11cc8c7b3ebefc8500764fa49580b7984a79fa3041a2f626fe8ee0c89
-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 1626 RMD160 e4690ba5ea48f1eea1d969a1a0fef0209f60c4e9 SHA1 345504a69a3b3e54039dc7c6cc766851aee45f8a SHA256 179e2e9b773496d4a9fc1bc8222e4a22823180f9a82974dc694b9b4670f1dce0
-MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
+AUX drqueue-0.64.3-compile-flags.patch 783 SHA256 3116d2ae9c4fcef4106632ffebf2ced6120e40f59004cc194ae9472eede33803 SHA512 e0ac3f8de7949cd3051dacf831f6945d77f44e7950d9d5d653b7f803c89e7d8fb62b95a4818bf7be8048e40e0636ccae9ffd58f724f00bbdce97f64402be3d1b WHIRLPOOL e068a8cd1a1672d7b2b25a2a5785c206deb03ecd552235ed36b1388b7ce653e48b890990bceebbde7adb362cff46bdca5cd4dccb5193b8d0d153ff5e79fc427f
+AUX drqueue-0.64.3-etc-confd-drqmd 608 SHA256 752f04aba12a3e23009bbbc83ba60c15d73dc290d34a668dd88657de79be5490 SHA512 632ea313a8717262e87976ae1efad20a2e4f70624cf7ff87f45a92dbefd37667ba0f4fc982be9985655782633f5d4539886c3c36d43d4572e573a1302d80b9d9 WHIRLPOOL 95b0fc2d1313a49f392bbf170fadc5439b116b849afbf0e5e65d18260bdbc98264ad805688772bcb40c2d5c33f4d903a9c7714a5b7a569ab0b50319aa9460318
+AUX drqueue-0.64.3-etc-confd-drqsd 718 SHA256 36b0ae1b24ca5f13c979c597f72dc040ece7fa568f6ae86b682b0f5d0b4a5366 SHA512 ed19de4f64cd5b4f3a0dee384e999eb264d17fbf5783389dbec3062efd36ba6ea1cc2dc6a1d17092f66aa998caa511cd01ad14153e5378192a53019d713d00d3 WHIRLPOOL c21735e2d43566509c3aad02ef39a73c3a90ad7fb6ca12283b7b234fbd89de5a36b350e5e412b02899260cbb28c82f70e82f1d1976c247ee4dba410dba446210
+AUX drqueue-0.64.3-etc-envd-02drqueue 127 SHA256 99e976a11cc8c7b3ebefc8500764fa49580b7984a79fa3041a2f626fe8ee0c89 SHA512 ae75190f4d144d1ea0dbc5e15bac076b301af71780b1ab5afdb8d673a935570384216a90dc2b05ecb4f64f093281bd0a0897af73badb5af92a9202d67f0562e0 WHIRLPOOL 06febdccc9279dda075f053737b232d393f80501a2f5e1f95e57bc34fff8d462c5dd09ed2647c35ebab3be5976094b50a6793de855d4ab2675eb03fdf0663e0e
+AUX drqueue-0.64.3-etc-initd-drqmd 557 SHA256 bf90a1610eaf3ed14d4f6f22be42320a4c22d2e7dd2c38bacfdbce22b3e47bf0 SHA512 4b4f73f1c5a795b1feddcde10a54af2656cbd8458a5437ae913a3dc2076efe0694b3d5258c149adc0d2f2e21fb683783900976e73f306deea9d78866a3de5eff WHIRLPOOL 5a5a7ef5a2372f11fb13d3fc7891b6abde9c96df378ecf2a3e5bdf4587e8d252bda489567f3ca0b91762489eb546cdb38056f88cd72a4317afb9c80d3ec5b3f4
+AUX drqueue-0.64.3-etc-initd-drqsd 547 SHA256 2d9c4bf4b9d2f1e81196b03e85c7dd5a6be3bc2daa619e47fde49c438e782369 SHA512 a4b3aea80a2b7b64760b79729124a1e22ebf6ea5bf129298cfe74150205f432ca1fb3316f8f43e3ee2f3df02ccfa7b6c9ab6195e219d59c431a11f8a5a85c784 WHIRLPOOL d2ae414f2277959d50a270ea3d80ecddfe0116e2e77b41c67527ecc6b0ce9b06cc76ce5e5a0174bb3093ce97196e0718e93d53a6f5e11718c85cfcbab15869bc
+AUX drqueue-0.64.3-sconstruct.patch 522 SHA256 cb52627a1c4cec6ef0cd8b6c4b140e81305ff7c834ac772a88c44286e9625e43 SHA512 913422434b58533c18b939e08a129426cd4b7a2ed1a08836aead4e674ffcbfcc2021d71aede6dcd602eea52bd6a8642893eca4057e8e629c2ece92a180fe63a2 WHIRLPOOL c9419130e12faf8af5438c44d45dd992cd941890c311fbbb06db3a2593ef6bde7ad5ff1d7c44c405c820348d1cccd150cd7ff7c531c30804fc04ba9f4862f31b
+AUX drqueue-0.64.4-fpic.patch 473 SHA256 57495187142826765b45b54f39e51a934c5a034318a1cfe362ab12138de26d9a SHA512 735c99be3094221fdd6b7336987deb8b6d92533fff8017fdd11e8b3f2b53016dc88d9458ae2446a0bb864456ba18c3ee97025123f5340909a4f466e2295af93b WHIRLPOOL 97414060342d75e2645e5bdb52fef1a3ae05f1a870fabf5b6f86e21c361cce2d60a27311dc50dfd5bf4de302de76024be7bf9fd028f58f0ba3ab8269804724e2
+AUX drqueue-0.64.4-git.patch 611 SHA256 5df316cd4439135d330a1126693cb26c4c96ed96e1ab35d19a9a927f3c9021f5 SHA512 b5326b839aff7662c016e0a71764eddbea1e8706a603f882c784c92ec540d7a0b89eadab80aa91ef22c1591e85b2eac4a22dd2111c845e736bfbcd8355200638 WHIRLPOOL 8488189a372b6b8743a0b4cf6473a1578e147be07498b9e63187bce646e7d5698b0fc1a33e0c5937aa9564b46b846af0946b9393697854c27e6810257f6e2c47
+DIST drqueue.0.64.3.tgz 336767 SHA256 d26e9434b9551ca542b5fa4aaf4740b2faac55b9dca28d335913b7d065ccd127
+DIST drqueue.0.64.4.tgz 619577 SHA256 a8753a41558e2d5af48a10071cb4a201b5e12f674d25127593bcf8a4bd1f634d SHA512 3ba014fe8ceb8b35658126455cdab9ccbd3d9343124267d61d128d94fd48fe695da724936b2ce7153ee620cf27f3e9e8fd0eb819fa4916c930a3c06a05efc680 WHIRLPOOL ca90cc9d3c47f4d2e3694880cb666175a39344114a3095ddc72f53521e2c0a7be928bb3dd359060695ffc8e12b6995b2740ccbed659f89ad4c09d5b7ee7b34f4
+EBUILD drqueue-0.64.3-r1.ebuild 3811 SHA256 1eed68b70b071a36043b7e87cb262b051221f496443b36f30ac81168888c6bb5 SHA512 b852c3499bd449fa9847ea5eb55ea80b6fac92919d7edcd03310a55ada6cb802c6adcd5cc1bbb4da95c26cdaad34ac8d2b6f3c3da0f13fa06d6eb8199f063258 WHIRLPOOL d56959cae33c568f818318acb453bf2fad056211974d8cb6ad369d6905a51c731382543d794b83771ba0180125332bf5710948fbb5b5b663f1883e1a807a8199
+EBUILD drqueue-0.64.4-r1.ebuild 3855 SHA256 b0ce5a3dbc462bfd64b24d0e484e7a1aadd2c4f2fd2b6dd66227000aee634793 SHA512 ce64e44fd02714876bf85ee0e5c1fb6638d588a5487baf107454600157c7e3ae7f66ccaaa90f739a31314e1dee91272161f34134e3eaf224b7400b67a143f5ac WHIRLPOOL 2fd08bde7d85322c5618afd3b667f5fdc67388cd264102387740c44600cbefeb73879e41f644d81ea60f67520985d356f0cf994081347fb670ee3db4e3f5d411
+EBUILD drqueue-0.64.4.ebuild 3894 SHA256 be942318d776e0e8a61cf9460986a0d6f49c812becfedf303744c11923d9fc7e SHA512 18e9f0ed5029ffa354ea1c33064fccd74190feabf0150341a032b42693c7d4572f1eb1191188a3977d1e727902825dd01d7710ae02e277b0fa1532ad44a00fcb WHIRLPOOL 4ba188354aadeebb495d7ee03a8a43ae12cad61f9faafb0b3d3819d84ea74188bdd017859957c363f7bebb5f1f98afa587bbb09113fc6aa371ac88f133a004a8
+EBUILD drqueue-9999.ebuild 3637 SHA256 05214b4720c3eeb4551f31a1479943910bb907a9c147639c0a1ae49378fb811e SHA512 9ff9e11812aa59be67118fd4fe2007a96a96a43ea9f7aa06f6f25bb0dffda8f7baf3b28ced0649ce18a4f6f16a69e57d866bf57b2b6ada7c70fd075a2dfbdfd6 WHIRLPOOL 991b41881c5be5e1332eab6190fe34de0452c382759273df5453d59defe0b538e287e94377e5e8575f9c51373bb501b7aa946ea8588e5110d68089a825b0c4a9
+MISC ChangeLog 1814 SHA256 91a0565e7634893fc8a4243ab153997362de54c511631ad335744e938b616557 SHA512 99db4062e370df4d4d22bc14be8cb3fe95d5bf6b292c38d66b6501df269dd3ddf7908af8f183a8686d2b70663808fa8f6d903ffd2c84df4dbdf7b939dac23df0 WHIRLPOOL a8d456648b34a32622c3ee260289541b58fe686b64804d0f3b8efe3e07f94058bccda2fe138f522f3cea0b2f8c689e1f3dbefd5d7a5a1a23be95854012246c9e
+MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAlCOrGoACgkQsAvGakAaFgCjRgCgnmVtxLLlvjfcOqobR/J2z0gu
-wsYAn3aG45lCrjORigmaPqhLYN3dZWTD
-=qSpR
+iEYEAREIAAYFAlUDwyMACgkQso7CE7gHKw2ViwCgrB02CHXwVhquMVTN3LcX83vV
+RcUAn2JqekZEUuqWhVEJj74RcVTSXf3y
+=e82Q
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/drqueue/drqueue-0.64.4-r1.ebuild b/media-gfx/drqueue/drqueue-0.64.4-r1.ebuild
new file mode 100644
index 000000000000..e3f324cabdcd
--- /dev/null
+++ b/media-gfx/drqueue/drqueue-0.64.4-r1.ebuild
@@ -0,0 +1,150 @@
+# 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
+}
diff --git a/media-gfx/drqueue/drqueue-9999.ebuild b/media-gfx/drqueue/drqueue-9999.ebuild
index 98744907c48d..00840950843c 100644
--- a/media-gfx/drqueue/drqueue-9999.ebuild
+++ b/media-gfx/drqueue/drqueue-9999.ebuild
@@ -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 @@ RDEPEND="X? ( x11-libs/gtk+:2 )
 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 @@ src_compile() {
 
 	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 @@ src_install() {
 		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 @@ src_install() {
 
 	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 @@ pkg_postinst() {
 	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
-}