gentoo resync : 25.01.2019

6 files changed, 142 insertions, 17 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index e9e8940f8a18..144946a1e183 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 8a61bb67e1c8..122c77d6dc07 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -11,6 +11,7 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
 EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c437c4363cbccc0a17b86e48afa8f9fb226388e55d397c9069d8bb1ab0ec265964fa3d529ef64a8f83973b706a925 SHA512 3d1e9636458040434fa54ec1d2f782f193739188bad0b03ff1fe3d9fc20ee2450d2cc2e2185d050ae34e0be271ca692cd88adc22dc69591eca110b88be54cf39
-EBUILD deluge-1.3.9999.ebuild 4905 BLAKE2B e1fab91b15a25fc11f4301166e21ffade2d7faba22675434f43fa95c5c40f3e783ff6682a62676a1ed689ec950e8765d2ecfb22ca1faf15519576d74a6652a65 SHA512 0fb688197237d1a8a572b326be36f5c0b23620b07df1b625c0a491aa3827d1fcdb1a29250430b77bbb35f2983fa1fa7d1290e942569ca88998dbbe5612583d07
+EBUILD deluge-1.3.15-r3.ebuild 4497 BLAKE2B 821b51f3f21c3191305d027ff51e8433c88614b8c7815d30e352c9c3c54f47a2531f415530347af95edb35edb1e1f3f75637fcfd421a33e4cfcba77e88944ea3 SHA512 21c4fc04cdab35f692e041e9c0766821004932d7efc91a9ad245abff2cbbbddba1515cc9404e395ab6ede8fb5cf585561527b39e0fac885f9ec0e1cec6e4e831
+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-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
new file mode 100644
index 000000000000..2245028f9908
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
@@ -0,0 +1,134 @@
+# 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 user
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://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=""
+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"
+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() {
+	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 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 a32833a4f9f9..5abf8ffb3d04 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 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
+inherit distutils-r1 systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -34,11 +33,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND="${CDEPEND}
+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}]
@@ -71,13 +69,6 @@ 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
 }
 
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 0f6000ee425d..7d205006c479 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,4 +1,4 @@
-AUX fms 956 BLAKE2B 446660bbd62a4c094ce902e45733bc3e32c4952f2767fc4a5b9a9d51e6e28c95bd3ab78f10a8cfdac8655fbf5673712580b359f4cbcd0873e7dd202a031a5b96 SHA512 376a4ea1f5ac62960e3b04e7b70e12ee25587c9f99bfd50b207e3bc4ea811c520c5237ec96ab60c41a8c80990174dcaf068e55564e14ca7d4be98bab33635545
+AUX fms 861 BLAKE2B f4ee5f508327c55bf2b5446d85ab51fe3f968c6592be0045a26f4a1a8f4df3e86505a5f9f5f57c62dafb4d11e75229ddd76b8839f6183ddfcf5adcd53016e15e SHA512 82a8202dd7191b8b0dbca7028cdadeb4d62faae3d60d77bc5e799bd0c83d6ad3e6a7bb0317531b746f7f5f4851df4439edb90b155587ad6631c1b1b91ac18a80
 AUX fms-use-system-libs3.patch 1380 BLAKE2B 3c2c5023b83099a5a90a5e6b8f583e7d1479e47080e543af525878b79b5c2d9101e2f69aa95f867a24959d1d404bb2d1dfa70c930db814f3bec2aba3ec03ad50 SHA512 5eaf4f455a1b6b65e2f71a2371382710d435a2fdc7379244019951622dcdd8ed6677c0fe3061aacff419cc186a8c8b0169f1949445c6af8bd2577f57051527bc
 AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
 DIST fms-src-0.3.79.zip 3847775 BLAKE2B e6087ef6e0e22f79e3d399f08ed531e839faf8199bdb3d0c0e148553dd6b7cab9dd35dbc74081a628d4456fadc4f9dd83a7a767f1dab8ac511f94eac1685d2ee SHA512 aa9f505c5ef55b1f462b16de6d870d02dc102fd184cc353c6c6b8a346978a9953b34e878f262f4190a3d15d76c5a37f065c4e5ebdbc0e43a4a5c22d61fa9fba7
diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms
index d98f3b29e4a8..d7f0453f1606 100644
--- a/net-p2p/fms/files/fms
+++ b/net-p2p/fms/files/fms
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $
 
 # Check for OpenRC/Baselayout 2 - see bug #270646
 is_openrc() {