Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

8 files changed, 42 insertions, 353 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index d8bced93ad91..f321f9616297 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,8 +1,6 @@
 AUX deluge-1.3.12-fix_scheduler_plugin.patch 1050 BLAKE2B 574e0a32d856247108418978bd8a4cab7db960ec929175a4a5845f07ab726e0714070c3bd853dc2537ec52a770daea11d54c43568da1e12cc5bba3f394b2a42c SHA512 0613de93b5f61e523dfd8b8d5ec145a64b69ae96fde8236d9da9c7e4a54af681490879157f0a8a5537c27e93feb5b1db6651d61a9655e58763c1676e1843e087
 AUX deluge-1.3.15-r1-fix-preferences-ui.patch 1209 BLAKE2B 570dba58991221c2c2d329c0a367f68ebadf15d7b0fef8633c9c22d1c3dc992328d69f329f9700d2c46ab812ff4d99de420a37daecbb6623338e005f8fa9538d SHA512 9d32dad457ce5fe5752fa3f4dd42492443ffbeb0508347d21197b4ee950674dbf209d4faf6a730c37eecfa8a5233606fbef9ede5c4a2da5ee60d047ec7569b98
 AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 BLAKE2B 68d0e98ca8648adb3f5afdeda84c4d36fa5bcea2239e37087404573faa4b8084a8c54362d237bbfda702d4b12213818259ddc0cd61013dc7261186899ded4b96 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316
-AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8
-AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c887d89b239d39f67aa3757434dd2f3e384531733ceb332b8b57d62b56f34244caa592a279aa812269cde6106b1cc SHA512 d2f23dd8a27aa5537610c34b6197962b986f4811a89dffbfc82fade0dc8c0942a8f58480e0235d11d049f89dd38c48da43bbf1dc8a66f26cbc16db764b672af5
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef
 AUX deluge-web.service-2 198 BLAKE2B 00195276c90653b406fcd9d7d75cb6a69fff6929644372905de42e5a62ad1129e954adbe54415a3be612f705cb773f40570d49c7720b40b6caffacc7fce4518f SHA512 51d761c76d213285bef2cd4cc80c7135838f0fb955a7584ca15194080d50aa63e81642d566b901af8970ed01ae9952482226a41627f1e198fd6587c197737889
@@ -12,11 +10,8 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
-DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
 EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c437c4363cbccc0a17b86e48afa8f9fb226388e55d397c9069d8bb1ab0ec265964fa3d529ef64a8f83973b706a925 SHA512 3d1e9636458040434fa54ec1d2f782f193739188bad0b03ff1fe3d9fc20ee2450d2cc2e2185d050ae34e0be271ca692cd88adc22dc69591eca110b88be54cf39
 EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120
-EBUILD deluge-1.3.15-r4.ebuild 4433 BLAKE2B 3568da55fb548fd2bff397e7475eb35566b32215c704e0bea54088c3bf99a2819a866111ff579f3a64cd3160bb1dc1f7a5273f1a9be5aa1fbe40ba5ece07230b SHA512 21a791b18064beabc6213ebe9414af89151e47bc80747691045b4931c67f72b158a6ca444ecb94efc428db250c4dc94dc9425b46d6791b26329a6ee6621e17c7
-EBUILD deluge-1.3.9999.ebuild 4443 BLAKE2B bc2778509d617096c242d0d0d0295bb9c257cbc0befbfaff376d530106b278260970eaf162ead9d83c841f33cce180be84d8d0f81686f3394bb52edbe596e94d SHA512 70391b5670f0b3fe38e477a952fa563bc7441d65f7b0e141eebd073166392a5aaa9f98f3e2414c240333007eb4fb714517c190b8b6287812e96bb5b244f41469
-EBUILD deluge-2.0.3.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70
-EBUILD deluge-9999.ebuild 4431 BLAKE2B 83af31524f55d3be3a3dddc9090030734b42eea4155fe257d8288be886c7de430127c3ec3927ad13be50368005c8d8d8c0ef0cabca70ae12587a3e55f9ea4e7a SHA512 f01b50cfbe640e43756ee4aed3d56d633c5ffec2bd6c2ea2a3483c6f72df613156386b89fdd74948eb07eeefe2ee3a161cddd3dc73617a85a3dcbb200e7f4f70
-MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
+EBUILD deluge-1.3.9999.ebuild 4471 BLAKE2B a996b5c941ce4e5d1dc72c902e727d6c75805feb2bb7627009b39e52a6e3c3be0b251879ebffb755376d94b400a62170de3cef6a8fad5cbc7fe2f2d6e10cd816 SHA512 511ccc9ee312a70a86981d5abfe3319a0e3438563294346565aadb181ee237f6f13aa1a68d76b82755d40a2cc3b02a9307704b888ade460f37b64a203abfda50
+EBUILD deluge-9999.ebuild 4787 BLAKE2B 1d731c0c8790fa85090e28738ccbb608eedcdfe1703737b36018a7dff33242499ee29720e1abb6e94ef61672f13144280e17ffa9bf61a96832e2fcf39af8284a SHA512 84c7d81d0a6060c050e43dbd9d74a0584224983a170d297941d632d7e1347c07852e4e474540e73908f9c912f2fe6c6bdc25fdedbc93c21c33506bec461ef2c0
+MISC metadata.xml 647 BLAKE2B 1d02be5cf9e82cf9105241eec91537f7f174ccaed33de9a2cbb26d184051cc96706a7fdc3f771f78a9057413af7501279f01a125722a25e3feea89a95df8cff3 SHA512 758bd56860522d98aec78c4517f797c4369566ca9cace827f44011c8141498259aa1b503556e47308dc2e95a1c5ab5b5fec3da2a536a4ebc25f516e19305495c
diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
deleted file mode 100644
index d938267bcd80..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-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"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	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-python/geoip-python[${PYTHON_USEDEP}] )
-	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
-
-	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() {
-	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 https://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
index 1be3b5719884..5abf8ffb3d04 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
+inherit distutils-r1 systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -35,9 +35,7 @@ PATCHES=(
 
 DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
+	dev-util/intltool"
 RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -114,6 +112,8 @@ python_install_all() {
 }
 
 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"
diff --git a/net-p2p/deluge/deluge-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3.ebuild
deleted file mode 100644
index f347e4c3ee39..000000000000
--- a/net-p2p/deluge/deluge-2.0.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-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
-
-	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() {
-	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 https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f347e4c3ee39..7d98de7bce8b 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
+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="https://deluge-torrent.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
 else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -23,41 +26,35 @@ SLOT="0"
 IUSE="console geoip gtk libnotify sound webinterface"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
 	sound? ( gtk )
+	libnotify? ( gtk )
 "
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
+)
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${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:3[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
 		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
 	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
 python_prepare_all() {
 	local args=(
 		-e "/Compiling po file/a \\\tuptoDate = False"
@@ -70,6 +67,13 @@ python_prepare_all() {
 	)
 	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
 }
 
@@ -113,6 +117,8 @@ python_install_all() {
 }
 
 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"
diff --git a/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch b/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch
deleted file mode 100644
index bef102062a04..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 53391b513f96ce3b8e9cc55f63e5db0c57b6e839 Mon Sep 17 00:00:00 2001
-From: Andrew Stone <a@stoney.io>
-Date: Wed, 3 Jul 2019 16:55:40 -0700
-Subject: [PATCH] [GTK] Fix ordering in status tab
-
----
- deluge/ui/gtk3/glade/main_window.tabs.ui | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/deluge/ui/gtk3/glade/main_window.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui
-index 30bd395bd..e9a4b60a1 100644
---- a/deluge/ui/gtk3/glade/main_window.tabs.ui
-+++ b/deluge/ui/gtk3/glade/main_window.tabs.ui
-@@ -112,7 +112,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="top_attach">0</property>
-+                                <property name="top_attach">3</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -312,7 +312,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="top_attach">3</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
diff --git a/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch b/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch
deleted file mode 100644
index dba520f61c01..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur deluge-2.0.3.orig/setup.py deluge-2.0.3/setup.py
---- deluge-2.0.3.orig/setup.py	2019-07-25 18:19:04.624650797 +0200
-+++ deluge-2.0.3/setup.py	2019-07-25 18:19:42.984276752 +0200
-@@ -221,7 +221,6 @@
-                 )
- 
-         print('Compiling po files from %s...' % po_dir)
--	uptoDate = False
-         for path, names, filenames in os.walk(po_dir):
-             for f in filenames:
-                 upto_date = False
diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index d528c24819ad..5a74432b6fe5 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -9,10 +9,6 @@
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>candrews@gentoo.org</email>
-		<name>Craig Andrews</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>