reinit the tree, so we can have metadata

19 files changed, 789 insertions, 0 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
new file mode 100644
index 000000000000..c6795a6d8b04
--- /dev/null
+++ b/net-p2p/deluge/Manifest
@@ -0,0 +1,21 @@
+AUX deluge-1.3.12-fix_scheduler_plugin.patch 1050 SHA256 9b0e4640a3537cb3b1805d4fca9d70539b341a2df0c3d4078194e0f4fdad037a SHA512 0613de93b5f61e523dfd8b8d5ec145a64b69ae96fde8236d9da9c7e4a54af681490879157f0a8a5537c27e93feb5b1db6651d61a9655e58763c1676e1843e087 WHIRLPOOL d26748a8c38ae912c736bf6db6ab9806c040d8d5b1c748f44c4619d5c7c74c826b682de7bd67cbcb1377b861e3ac93273f1568b80a875009f6b30f26d9147095
+AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 SHA256 873b599723f2ec87df386badaaf1fa79686c32a50beaab0924bf40c0f2bb9fa1 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316 WHIRLPOOL b9742b0e1fe666055c2e7cc141e4437143a534229a5661d6e3ec139971289b291fff736629ffc66034d2430971e9119d1cc6bd85e68f5be07b8bb5f9e2a19a3c
+AUX deluge-web.conf 210 SHA256 58c2b8c916a689b5f11a569450935cb5844c2eed9824625a46c7a608eb6d8e52 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999 WHIRLPOOL 4b15a1c5987454a894ed2f3ba3bb34910f649e663feee5a5c4695dc74b1c305a1afee18a086fb562fe289e450382d77c177238a072500a543cf27281f1ab1b82
+AUX deluge-web.init 1484 SHA256 19adb9e46cf2d0a3f76ae12e2c6058cd6b80620d5fd5d2b02abecf54e5e3f726 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef WHIRLPOOL 1fef5a3f3b51f148bb3dbd7cd58129c722cc034f91b7f4d54814b6ac439f65f6a180817d9ac0016921ae4d68281ca6b6000f08e47c99b338db58b653c5ca5852
+AUX deluge-web.service 146 SHA256 7b829d7e0d15e0369a26f92e0fb15adae81007de170a6ba3f8afa74e675eabb3 SHA512 b189d5db4be60a01eb5950aad3cb0bd60a1ac9509464507d5187c7b387d2f78678e65db3d0340c87c50511b48d08c85f7380c9d405e5dc497eca121aaaeacfaa WHIRLPOOL b1798eaaf71e3f3c5fd53c49a2b48cefee615c378d4a43bed6c19afa523cf5d23f57181095ef4c439c8a3ebc152e75735f2f47e0ec53288a54ff5196dac5e037
+AUX deluge-web.service-2 198 SHA256 b9b79371a72226b6a76c2d9b61dc21d339d4574a9be68e3fc9defab530ca61af SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889 WHIRLPOOL 6a382545f1d7c4087016d162417717aefd70034ef02c5e4ad5bf31f3ff94b5f482199851f39f817552ed979256fcb05fb9b59cd82200721c6347c99e7dc7e146
+AUX deluge-web.service.conf 100 SHA256 0dd1c923daf1d58721986670ddfe57e26e81d63fe33f516ff32f73d3d7330206 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9 WHIRLPOOL dc81c7cf547a1912fe28de1a3cc9644ec2b8c918f19acdf7f105471925604de37427629b7b7f962d6b017a2736bc406497e0238b4edd22e4aed7cd172a7e7800
+AUX deluged.conf 233 SHA256 de3b9475df0f86b70463ed879c99717580fc0d5568e15322c2f656639473310f SHA512 3201bc509661a30c509cb501cb13df69b94a273499e5d86e8b99704d4625347d7dff8a6eb2351c69616f945636dd490c10181627e651f9712472c73567cd2be3 WHIRLPOOL ec102bbb9de5fa6a0356a4dd4d51b07d960902d758484f02b43348fda892446db7f7e9be697f824e639669c238ba52cc03e7c5d2c1d660207bc85fbae250a01f
+AUX deluged.conf-2 228 SHA256 e0d29488ff0a9b8404572b5d67a3ef56a6fc914a6b17b56b346bfe74d1249adf SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1 WHIRLPOOL 94fd6bd28ced381dbc3f4f6f9df04facc8bca63b17eb829dbd7d874624c893ffe360c217b56a03cde9b219f651b1f18014cc4ede27ea172adc143944c440d4ac
+AUX deluged.init 1974 SHA256 724b194823b950141d0c9e7db4a6dfeb9fcc07840ea929894e9afff7f98d5afc SHA512 c775610463f052c2b9ff5d5043536e69f99475e24bf0f0346b02bb00b87cb2125052c2b29008dabe5aa2da9cb6a819608a388ce5d1a03adedc350936241eaaee WHIRLPOOL acb555b7c6781883caa0ce0c01a7c20addf9836fc9e49fe3d7f2583b69e16202feee5d0acf4cf58ad9324cff168b82232f5e4da7a248d6c660e401875f6d9182
+AUX deluged.init-2 1503 SHA256 2ec017817f54656c3f2ec6b3ac3892ea25fab0591b20e46bc7e95f0b392d4020 SHA512 a2514306b14712c7b31e64baccb65080101314e5f81e01702caf0f030afa40d98c1d3898c90fb66f55092bb27c48f0a6bd5a4db215ac68e352602000b700164a WHIRLPOOL 0917c9ad99a3a2c527bec3e70cc3e5e831082377a1c729fea58ebb64db4bf11301ae0a2ce980a9d54e0718c1878e1cd9810be3fb430ba12b291c3317d9a0095e
+AUX deluged.service 277 SHA256 6347ec82b7a28daabe441e3436fdc725e96dae2249ccf8fb2452168368750000 SHA512 fea157a271d768a1b6025b32b97b2b88f5b70472a7059da7fa4babb4f1a686e33e04cc4bd7a5daf70a5f682252687495bbe72eb1c1b335857817f45ed4f1dd33 WHIRLPOOL 38f66dffa09250a73990a4bc76f230e8d4c8e9ad4c87167fdb2144f0a7c3210017500030ed2a4a381bcba82ee8cc45cb518688d752a453be02f7ddd69b5c0e7d
+AUX deluged.service-2 243 SHA256 b1246ead13fee7a2ff3e94a47f6535a665282e407deb5186383b456cd4ffec5e SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c WHIRLPOOL 054dff55cdfcbf3f66e49b3f8676fc0561cc079c6a428e4184804f4eada703af470febf9ae18ebb9c9d462e87a1aaa73194712cc74d34b9c3573f256633436c8
+AUX deluged.service.conf 114 SHA256 b57941f17dd8be788ed24e75a9b46548ef3e1cd6bf7ad1b68e7c7d7a38ef522d SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a WHIRLPOOL fa19e0f20aefb6ba68da996491766539bd340f81f6c5398251f5e175485c0cbf091edd81b5e119653fe068c6742c5664ba8d672dafab8e119384f85e60559410
+DIST deluge-1.3.15.tar.bz2 1775913 SHA256 dcf823131be56c2180814e8def11496aaaf700710b5694867ba9f057615ac790 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda WHIRLPOOL 93f3b2c86b983ecea7b001f0b58bd6e904ecc4c11c718286885d82b09f0068c4bf347b03be12edfe77677604d3af3ca9a68e8a2a08d696ff16f5385eb43c464f
+EBUILD deluge-1.3.15.ebuild 4871 SHA256 6a9772e2fa7d14f56fac837b3ad5561249376aed78c4acd98996bf7a4c469ab6 SHA512 7b6969f6d49b10a20c4278cab6a660f4fbc582c05c1d97d480434cb19598f1c68227236531a5f7e119cec9d0f40871f2e2ea7e3a6422d9765c6efc4aa2839ea5 WHIRLPOOL 88198b6cf1bc76b01508276b653a41fb677b59e55804a2e0f63f65d78063a8a32b702ed5fcfb0390cad645d73c6c93006fe5614fa9f0c18e6399baa5b27f0a84
+EBUILD deluge-1.3.9999.ebuild 4839 SHA256 6ae00d8ad91cf40f6b9c4ef8aede85a83444c253f6e7f3984982ecea1f0a092e SHA512 5dda54ad2be3d49147634d28e194961be91785b7462474290150650d1926d82c556e5851cc0f8e1127b5ba837ba131fc669e9f72cc6d53b800f5c35ef1459f1c WHIRLPOOL d288a352247e418e46ab20fc57594124f2948f3d76ecb67682dc10554138cfa1409b4dcac27b9cc0f89b0b7e2bbac77e54124edc6c2166e9333057f99f5e8b10
+EBUILD deluge-9999.ebuild 4798 SHA256 03259e6314d73bcd50a7b622b163007d9a257dbc7f07c484b15b8634f9bd6ff2 SHA512 6aa67f4d3c4d647e8dfb1593341b9168d1368da25c28790a446b1b5b4860a0b62830d9049c06151db0b656c790e4c0481d6b553a6e0eecf00ad7c7728c876c52 WHIRLPOOL 7b5db71160e796ff911faa3756a06aff4910ccadbbc69fda72e2d949f153ce5862abcb5d82013d585c8cceeb43a51e9b636c8a3bed4883c77231e0e2a0f66d9b
+MISC ChangeLog 9578 SHA256 a63ee9c503c728b05466b68b27908c58e69a69993cabb5aef9ea4738a19dfd31 SHA512 6ae24929688a73be92b7e96df7aea43607040473d1638d118c646ed6e8b34ccce2d9e14739751521460aa45c06fa6b2c0e33b4f8724ebcdf423be1b003823bd4 WHIRLPOOL 2976d7603f0f12adf1a173202561d9bb033c4628c2a98dd44744303db75298540faa57ddcfcae56b6ef461f0a8fddcdb3ff5c0a88205996aec5034208cb58ac7
+MISC ChangeLog-2015 27566 SHA256 a1188c71f37513b8ebf2cbc5b3381f5ca5961482d25094a2442d7c69b2faa338 SHA512 cc4b6e5859d72cac328540175bed1f680c256226824afdef802f4edcd4d09a965089cb92adcf4052ee551c10ecca6d03b4b56e7c1850bb578a836a759e5bc9aa WHIRLPOOL 5b6b9e739eefcae6926389304727eb8ce2861dcdbc40116e718128224ba5edf69a5703cb8331f25e03c24f4bc9fa8de488d0863c0f6d7269d08547275600d6c9
+MISC metadata.xml 924 SHA256 0566c81a62820982f316840340df3576329cc0b93168d12c344e79adf0b8d21b SHA512 094619b5059122dc2e2dd798265000dfc4f30b8929f7b592b89cbe54ad6534829cc55570bbef0849b2892464dbc5f61b4c77e7c178c3ab0c5eee79f0ebf118df WHIRLPOOL e7a84a397934f26af338be2a4666eeb95602bb5df49052035ba87cafba9c659c2a3bd9ccccd9e4ac48e17552dba0b8d3a9b364e17efcd021058a660b05624a06
diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
new file mode 100644
index 000000000000..4c92716328b3
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+)
+
+CDEPEND="<net-libs/libtorrent-rasterbar-1.1[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		(
+		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+		)
+	)
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	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
+}
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
new file mode 100644
index 000000000000..8055972cdb31
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 1.3.9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	EGIT_BRANCH="1.3-stable"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+)
+
+CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+	)
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	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
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
new file mode 100644
index 000000000000..42a1addef2d3
--- /dev/null
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
+)
+
+CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+	)
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	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
+}
diff --git a/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
new file mode 100644
index 000000000000..fda64aa2b393
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.12-fix_scheduler_plugin.patch
@@ -0,0 +1,22 @@
+From cdf301601fe71bd697f3796cf0a5656d437d140e Mon Sep 17 00:00:00 2001
+From: Calum Lind <calumlind+deluge@gmail.com>
+Date: Wed, 16 Sep 2015 15:11:56 +0100
+Subject: [Scheduler] Revert erroneous fix backported from develop branch
+
+ * The issue this was intended to fix only occurs on develop branch
+---
+ deluge/plugins/scheduler/scheduler/core.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deluge/plugins/scheduler/scheduler/core.py b/deluge/plugins/scheduler/scheduler/core.py
+index 9fb81df..f0e2392 100644
+--- a/deluge/plugins/scheduler/scheduler/core.py
++++ b/deluge/plugins/scheduler/scheduler/core.py
+@@ -127,7 +127,7 @@ class Core(CorePluginBase):
+         """
+         core_config = deluge.configmanager.ConfigManager("core.conf")
+         for setting in CONTROLLED_SETTINGS:
+-            component.get("PreferencesManager").do_config_set_func(setting, core_config[setting])
++            core_config.apply_set_functions(setting)
+         # Resume the session if necessary
+         component.get("Core").session.resume()
diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
new file mode 100644
index 000000000000..349261426de8
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
@@ -0,0 +1,42 @@
+--- a/setup.py
++++ b/setup.py
+@@ -205,38 +205,7 @@
+ 
+ _ext_modules = []
+ 
+-# Check for a system libtorrent and if found, then do not build the libtorrent extension
+-build_libtorrent = True
+-try:
+-    from deluge._libtorrent import lt
+-except ImportError:
+-    build_libtorrent = True
+-else:
+-    build_libtorrent = False
+-
+-if build_libtorrent:
+-    got_libtorrent = False
+-    if not os.path.exists("libtorrent"):
+-        import subprocess
+-        if subprocess.call(['./get_libtorrent.sh']) > 0:
+-            got_libtorrent = False
+-        else:
+-            got_libtorrent = True
+-    else:
+-        got_libtorrent = True
+-
+-    if got_libtorrent:
+-        # There isn't a system libtorrent library, so let's build the one included with deluge
+-        libtorrent = Extension(
+-            'libtorrent',
+-            extra_compile_args = _extra_compile_args,
+-            include_dirs = _include_dirs,
+-            libraries = _libraries,
+-            library_dirs = _library_dirs,
+-            sources = _sources
+-        )
+-
+-        _ext_modules = [libtorrent]
++import deluge._libtorrent
+ 
+ desktop_data = 'deluge/data/share/applications/deluge.desktop'
+ 
diff --git a/net-p2p/deluge/files/deluge-web.conf b/net-p2p/deluge/files/deluge-web.conf
new file mode 100644
index 000000000000..a08f9b74fe61
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.conf
@@ -0,0 +1,6 @@
+# /etc/conf.d/deluge-web
+# Change this to the user you want to run deluged as.
+# You may specify a group too, after a colon
+DELUGE_WEB_USER="deluge:deluge"
+DELUGE_WEB_HOME="/var/lib/deluge"
+#DELUGE_WEB_OPTS=""
diff --git a/net-p2p/deluge/files/deluge-web.init b/net-p2p/deluge/files/deluge-web.init
new file mode 100644
index 000000000000..1e0b4833f072
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.init
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGE_WEB_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "You have to specify a user to run deluge-web as, as we will not run it as root!"
+		eerror "Modify DELUGE_WEB_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGE_WEB_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGE_WEB_USER%:*}" = "${DELUGE_WEB_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGE_WEB_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluge-web"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGE_WEB_HOME}" = "" ] ; then
+		DELUGE_WEB_USER_HOME=$(getent passwd "${DELUGE_WEB_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGE_WEB_USER_HOME=${DELUGE_WEB_HOME}
+	fi
+	ebegin "Starting Deluge-Web"
+	start-stop-daemon --start --background --pidfile \
+	/run/deluge-web.pid  --make-pidfile \
+	--exec /usr/bin/deluge-web --user "${DELUGE_WEB_USER%:*}" \
+	-e HOME="${DELUGE_WEB_USER_HOME}" -- ${DELUGE_WEB_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluge-Web"
+	start-stop-daemon --stop --user "${DELUGE_WEB_USER%:*}" \
+	--pidfile /run/deluge-web.pid
+	eend $?
+}
diff --git a/net-p2p/deluge/files/deluge-web.service b/net-p2p/deluge/files/deluge-web.service
new file mode 100644
index 000000000000..426401a95e08
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge WebUI
+After=deluged.service
+
+[Service]
+User=deluge
+ExecStart=/usr/bin/deluge-web
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-p2p/deluge/files/deluge-web.service-2 b/net-p2p/deluge/files/deluge-web.service-2
new file mode 100644
index 000000000000..adb38300a30e
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service-2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge WebUI
+Documentation=man:deluge-web
+After=deluged.service
+
+[Service]
+ExecStart=/usr/bin/deluge-web -c ${DELUGED_HOME} ${DELUGED_OPTS}
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-p2p/deluge/files/deluge-web.service.conf b/net-p2p/deluge/files/deluge-web.service.conf
new file mode 100644
index 000000000000..2c594cdf8f7b
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-web.service.conf
@@ -0,0 +1,4 @@
+[Service]
+User=deluge
+Group=deluge
+Environment="DELUGE_WEB_HOME=/var/lib/deluge" "DELUGE_WEB_OPTS="
diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf
new file mode 100644
index 000000000000..21b375d5c97f
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.conf
@@ -0,0 +1,9 @@
+# /etc/conf.d/deluged
+# Change this to the user you want to run deluged as.
+# You may specify a group too, after a colon
+DELUGED_USER=""
+# DELUGED_UMASK="0002"
+# DELUGED_OPTS="-p 58846"
+DELUGEUI_START="false"
+DELUGEUI_OPTS="-u web"
+
diff --git a/net-p2p/deluge/files/deluged.conf-2 b/net-p2p/deluge/files/deluged.conf-2
new file mode 100644
index 000000000000..ac0c4cd0db51
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.conf-2
@@ -0,0 +1,7 @@
+# /etc/conf.d/deluged
+# Change this to the user you want to run deluged as.
+# You may specify a group too, after a colon
+DELUGED_USER="deluge:deluge"
+# DELUGED_UMASK="0002"
+DELUGED_OPTS="-p 58846"
+DELUGED_HOME="/var/lib/deluge"
diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init
new file mode 100644
index 000000000000..0fd9429fb055
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.init
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGED_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
+		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluged"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGED_HOME}" = "" ] ; then
+		DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGED_USER_HOME=${DELUGED_HOME}
+	fi
+	ebegin "Starting Deluged"
+	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
+	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
+	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
+	eend $?
+
+	
+	if [ "${DELUGEUI_START}" = "true" ] ; then
+		ebegin "Starting Deluge"
+		start-stop-daemon --start --background --pidfile \
+		/run/deluge.pid  --make-pidfile \
+		--exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \
+		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping Deluged"
+	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid
+	eend $?
+
+
+	if [ "${DELUGEUI_START}" = "true" ] ; then
+		ebegin "Stopping Deluge"
+		start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
+		--name deluge --pidfile /run/deluge.pid
+		eend $?
+	fi
+}
diff --git a/net-p2p/deluge/files/deluged.init-2 b/net-p2p/deluge/files/deluged.init-2
new file mode 100644
index 000000000000..1f76298d1877
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.init-2
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGED_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
+		eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluged"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluged"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGED_HOME}" = "" ] ; then
+		DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGED_USER_HOME=${DELUGED_HOME}
+	fi
+	ebegin "Starting Deluged"
+	start-stop-daemon --start --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid --background --make-pidfile \
+	${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \
+	--exec /usr/bin/deluged -e HOME="${DELUGED_USER_HOME}" -- --do-not-daemonize ${DELUGED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluged"
+	start-stop-daemon --stop --user "${DELUGED_USER%:*}" \
+	--name deluged --pidfile /run/deluged.pid
+	eend $?
+}
diff --git a/net-p2p/deluge/files/deluged.service b/net-p2p/deluge/files/deluged.service
new file mode 100644
index 000000000000..74876b008ccf
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Deluge BitTorrent client
+After=network.target local-fs.target
+Wants=local-fs.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/deluged
+User=deluge
+Group=deluge
+ExecStart=/usr/bin/deluged -d -p $DELUGED_PORT $DELUGED_OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/deluge/files/deluged.service-2 b/net-p2p/deluge/files/deluged.service-2
new file mode 100644
index 000000000000..049cd025b534
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service-2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Deluge BitTorrent client
+Documentation=man:deluged
+After=network.target local-fs.target
+Wants=local-fs.target
+
+[Service]
+ExecStart=/usr/bin/deluged -d -c ${DELUGED_HOME} ${DELUGED_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/deluge/files/deluged.service.conf b/net-p2p/deluge/files/deluged.service.conf
new file mode 100644
index 000000000000..2d74e23582cb
--- /dev/null
+++ b/net-p2p/deluge/files/deluged.service.conf
@@ -0,0 +1,5 @@
+[Service]
+User=deluge
+Group=deluge
+#UMask=0002
+Environment="DELUGED_HOME=/var/lib/deluge" "DELUGED_OPTS=-p 58846"
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
new file mode 100644
index 000000000000..33afb6123b98
--- /dev/null
+++ b/net-p2p/deluge/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>paolo.pedroni@iol.it</email>
+		<name>Paolo Pedroni</name>
+		<description>Proxied Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Proxy Maintainer, CC on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+<use>
+	<flag name="webinterface">Install dependencies needed for the web
+		interface</flag>
+	<flag name="console">Enable default console UI</flag>
+	<flag name="linguas_nap">Neapolitan locale</flag>
+	<flag name="linguas_iu">Inuktitut locale</flag>
+	<flag name="linguas_pms">Piemontese locale</flag>
+</use>
+</pkgmetadata>