From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5DE1B1382C5 for ; Wed, 22 Jun 2016 19:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 814E2E09E6; Wed, 22 Jun 2016 19:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1F26E0807 for ; Wed, 22 Jun 2016 19:45:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBD76340A3B for ; Wed, 22 Jun 2016 19:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A616C241E for ; Wed, 22 Jun 2016 19:45:38 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1466624228.6aa508aaa9cd595637c21335517e9359b98bead3.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/deluge-9999.ebuild X-VCS-Directories: net-p2p/deluge/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 6aa508aaa9cd595637c21335517e9359b98bead3 X-VCS-Branch: master Date: Wed, 22 Jun 2016 19:45:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87b4c9be-96d5-46e3-a6c8-fcf81174c78a X-Archives-Hash: bd339ea9c8bfd1ff553cc61be06467ae commit: 6aa508aaa9cd595637c21335517e9359b98bead3 Author: PPed72 iol it> AuthorDate: Mon Jun 20 10:08:08 2016 +0000 Commit: Kristian Fiskerstrand gentoo 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