public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Kristian Fiskerstrand" <k_f@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/
Date: Wed, 22 Jun 2016 19:45:38 +0000 (UTC)	[thread overview]
Message-ID: <1466624228.6aa508aaa9cd595637c21335517e9359b98bead3.k_f@gentoo> (raw)

commit:     6aa508aaa9cd595637c21335517e9359b98bead3
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Jun 20 10:08:08 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:37:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa508aa

net-p2p/deluge: Sync live ebuild to latest changes

 net-p2p/deluge/deluge-9999.ebuild | 82 +++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 21 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index e11f9c0..a8a9ca6 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -2,17 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd user
+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-2
+	inherit git-r3
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
@@ -24,18 +25,27 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+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"
+)
 
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+RDEPEND="${CDEPEND}
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-8.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-web-8.1[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${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}] )
@@ -44,14 +54,26 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 		gnome-base/librsvg
 		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
 	)
-	setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] )
 	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-#Not needed anymore: bug #518354
-#	local PATCHES=(
-#		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
-#	)
+	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
 }
@@ -61,27 +83,45 @@ esetup.py() {
 	# 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
+    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
-	newinitd "${FILESDIR}"/deluge-web.init deluge-web
-	newconfd "${FILESDIR}"/deluge-web.conf deluge-web
 	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 "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"
 	elog "first!"
 	elog


             reply	other threads:[~2016-06-22 19:45 UTC|newest]

Thread overview: 103+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-22 19:45 Kristian Fiskerstrand [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-06  4:23 [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/ Sam James
2024-10-03  9:24 Sam James
2024-06-05 15:42 Michał Górny
2024-06-05 15:42 Michał Górny
2024-06-03  2:49 Sam James
2024-06-03  2:49 Sam James
2024-06-03  2:49 Sam James
2023-05-27  7:49 Joonas Niilola
2023-05-21  6:01 Joonas Niilola
2023-05-20  7:13 Sam James
2023-05-19  9:10 Pacho Ramos
2023-03-21 16:42 Craig Andrews
2022-11-03 23:42 Sam James
2022-10-14  5:49 Joonas Niilola
2022-10-14  1:28 Sam James
2022-10-10 23:40 Sam James
2022-09-30 23:24 Sam James
2022-09-16  2:52 Yixun Lan
2022-09-16  2:52 Yixun Lan
2022-08-26 15:42 Arthur Zamarin
2022-08-26 15:42 Arthur Zamarin
2022-08-26 11:40 Sam James
2022-08-26  9:58 Arthur Zamarin
2022-08-26  7:22 Sam James
2022-08-26  7:22 Sam James
2022-07-04  6:57 Michał Górny
2022-06-22  6:43 Michał Górny
2022-05-26 16:17 Joonas Niilola
2022-05-26 16:17 Joonas Niilola
2022-03-12 10:15 Arthur Zamarin
2022-01-31 18:50 Sam James
2022-01-27  9:21 Agostino Sarubbo
2021-12-17  0:54 Craig Andrews
2021-12-15 19:29 Craig Andrews
2021-12-13 16:56 Craig Andrews
2021-12-11  1:16 Sam James
2021-10-23  7:44 Agostino Sarubbo
2021-10-21  4:40 Agostino Sarubbo
2021-09-26  4:16 Sam James
2021-09-26  4:14 Sam James
2021-08-11 21:14 Sam James
2021-05-19  0:08 Craig Andrews
2021-03-20  8:25 Joonas Niilola
2021-02-19 12:07 Sam James
2021-02-19  2:41 Sam James
2020-10-16 21:49 Sam James
2020-07-01 13:58 Craig Andrews
2020-05-06  6:41 Sergei Trofimovich
2020-04-27 13:48 Mikle Kolyada
2020-04-27 11:40 Agostino Sarubbo
2020-04-17 14:43 Craig Andrews
2020-04-14 21:06 Sergei Trofimovich
2020-03-26 17:36 Michał Górny
2020-02-24 13:19 Agostino Sarubbo
2020-02-09 16:47 Michał Górny
2020-01-28 15:31 Craig Andrews
2020-01-27 11:41 Mikle Kolyada
2020-01-18 23:57 Richard Freeman
2019-12-26 17:29 Pacho Ramos
2019-10-16 21:20 Craig Andrews
2019-10-16 21:20 Craig Andrews
2019-10-15 16:18 Craig Andrews
2019-10-11 14:57 Craig Andrews
2019-03-31  8:30 Pacho Ramos
2019-01-24 23:22 Craig Andrews
2018-05-20  0:16 Aaron Bauman
2018-02-22 21:49 Andreas Sturmlechner
2018-02-11 11:12 Michał Górny
2018-02-04 17:41 Andreas Sturmlechner
2018-01-05 15:38 Ulrich Müller
2017-12-20 22:13 Kristian Fiskerstrand
2017-12-20 22:13 Kristian Fiskerstrand
2017-06-13  8:46 Kristian Fiskerstrand
2017-06-09 10:19 Agostino Sarubbo
2017-06-09  9:44 Agostino Sarubbo
2017-06-06 18:26 Kristian Fiskerstrand
2017-03-21 19:21 Kristian Fiskerstrand
2017-03-14 12:39 Kristian Fiskerstrand
2017-03-10  9:13 Agostino Sarubbo
2017-01-05 19:11 Kristian Fiskerstrand
2016-12-22 15:32 Kristian Fiskerstrand
2016-12-22 15:32 Kristian Fiskerstrand
2016-08-06 21:12 Kristian Fiskerstrand
2016-08-06 21:12 Kristian Fiskerstrand
2016-06-22 19:45 Kristian Fiskerstrand
2016-06-22 19:45 Kristian Fiskerstrand
2016-06-09 17:31 Mike Gilbert
2016-03-10 10:34 Patrice Clement
2016-03-10 10:34 Patrice Clement
2016-03-10 10:34 Patrice Clement
2016-03-04  8:44 Ian Delaney
2016-02-28 20:38 Kristian Fiskerstrand
2016-02-28 20:38 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-14 10:11 Agostino Sarubbo
2016-02-10 18:58 Kristian Fiskerstrand
2016-01-30 17:52 Pacho Ramos
2016-01-15  9:03 Agostino Sarubbo
2015-11-23 18:17 Robin H. Johnson
2015-11-23 13:22 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466624228.6aa508aaa9cd595637c21335517e9359b98bead3.k_f@gentoo \
    --to=k_f@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox