From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26E87139086 for ; Thu, 22 Dec 2016 15:32:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8050B234070; Thu, 22 Dec 2016 15:32:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 523C421C0A6 for ; Thu, 22 Dec 2016 15:32:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 627C034112A for ; Thu, 22 Dec 2016 15:32:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B3E624E1 for ; Thu, 22 Dec 2016 15:32:19 +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: <1482420730.c0c490b40ca22da7024d320bf6248b09ed72db92.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-1.3.12-r4.ebuild net-p2p/deluge/deluge-1.3.13.ebuild X-VCS-Directories: net-p2p/deluge/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: c0c490b40ca22da7024d320bf6248b09ed72db92 X-VCS-Branch: master Date: Thu, 22 Dec 2016 15:32:19 +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: 04b1889d-ed3b-48fe-87d6-3e61bb5f4719 X-Archives-Hash: 6ef8d2ec91f81d733b4b534b367cad81 commit: c0c490b40ca22da7024d320bf6248b09ed72db92 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Thu Dec 22 15:19:19 2016 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Thu Dec 22 15:32:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c490b4 net-p2p/deluge: Clean up old testing versions Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-p2p/deluge/deluge-1.3.12-r4.ebuild | 141 --------------------------------- net-p2p/deluge/deluge-1.3.13.ebuild | 140 -------------------------------- 2 files changed, 281 deletions(-) diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild b/net-p2p/deluge/deluge-1.3.12-r4.ebuild deleted file mode 100644 index d5a9bef..00000000 --- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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" - "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" -) - -CDEPEND=">=net-libs/rb_libtorrent-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-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.13.ebuild b/net-p2p/deluge/deluge-1.3.13.ebuild deleted file mode 100644 index 63882f6..00000000 --- a/net-p2p/deluge/deluge-1.3.13.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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.5-disable_libtorrent_internal_copy.patch" -) - -CDEPEND=">=net-libs/rb_libtorrent-1.0.9-r1[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-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 -}