[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     2360546f8c45012d6e5b4754d8d3b73c283b469a
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:39:51 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2360546f

net-p2p/deluge: sync live ebuild

This series of commits closes #1010.

Pull-Request: https://github.com/gentoo/gentoo/pull/1010
Gentoo-Bug: https://bugs.gentoo.org/566806
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/deluge-9999.ebuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 41f5ba8..579b78e 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd
+inherit distutils-r1 eutils systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
@@ -48,7 +48,7 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-# Not needed anymore: bug #518354
+#Not needed anymore: bug #518354
 #	local PATCHES=(
 #		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
 #	)
@@ -69,11 +69,15 @@ python_install_all() {
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged
 	newinitd "${FILESDIR}"/deluge-web.init deluge-web
 	newconfd "${FILESDIR}"/deluge-web.conf deluge-web
-	systemd_dounit "${FILESDIR}"/deluged.service
-	systemd_dounit "${FILESDIR}"/deluge-web.service
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
 }
 
 pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
 	elog "If after upgrading it doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"
@@ -84,6 +88,11 @@ pkg_postinst() {
 	elog "/etc/init.d/deluged start as root"
 	elog "You can still use deluge the old way"
 	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
 	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }