Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net-p2p/deluge: version bump to 2.0.3 #12548

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions net-p2p/deluge/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
132 changes: 132 additions & 0 deletions net-p2p/deluge/deluge-2.0.3.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI="7"

PYTHON_COMPAT=( python3_{5,6} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 eutils systemd user
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you're using eutils.


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/deluge"
SRC_URI=""
else
SRC_URI="https://ftp.osuosl.org/pub/deluge/source/2.0/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi

LICENSE="GPL-3-with-openssl-exception"
SLOT="0"
IUSE="console geoip gtk libnotify sound webinterface"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
sound? ( gtk )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort, please.

libnotify? ( gtk )
"

DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
|| ( dev-python/slimit[${PYTHON_USEDEP}]
dev-lang/closure-compiler-bin )
dev-python/wheel[${PYTHON_USEDEP}]
dev-util/intltool"
RDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/distro[${PYTHON_USEDEP}]
dev-python/rencode[${PYTHON_USEDEP}]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort.

dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
>=dev-python/twisted-17.1[${PYTHON_USEDEP}]
x11-misc/xdg-utils
geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
gtk? (
dev-libs/libappindicator:3[introspection]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
gnome-base/librsvg
libnotify? ( x11-libs/libnotify[introspection] )
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
)
webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"

python_prepare_all() {
local args=(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace those seds with a patch. This is horribly unreadable.

-e "/Compiling po file/a \\\ \\ \\ \\ \\ \\ \\ \\ upto_date = False"
)
sed -i "${args[@]}" -- 'setup.py' || die
args=(
-e "s|'new_release_check': True|'new_release_check': False|"
)
sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die

distutils-r1_python_prepare_all
}

esetup.py() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overriding eclass functions is not acceptable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I understand.
Do you have any suggestion on how to achieve the same result. I have no idea what to do.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe try overriding whatever you need to override via setup.cfg.

# 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
python_export PYTHON_SITEDIR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declare it as local variable.

if ! use console ; then
rm -rf "${D%/}${PYTHON_SITEDIR}/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%/}${PYTHON_SITEDIR}/deluge/ui/gtk3/" || 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-3" deluge-web.service
systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
else
rm -rf "${D%/}${PYTHON_SITEDIR}/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-3 deluged.service
systemd_install_serviced "${FILESDIR}"/deluged.service.conf
}

pkg_postinst() {
enewgroup ${PN}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to replace this with GLEP 81-compliant packages, with RFC and all.

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
}
16 changes: 16 additions & 0 deletions net-p2p/deluge/files/deluge-web.service-3
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[Unit]
Description=Deluge Bittorrent Client Web Interface
Documentation=man:deluge-web
After=network-online.target deluged.service
Wants=deluged.service

[Service]
Type=simple
UMask=027

ExecStart=/usr/bin/deluge-web -d -c ${DELUGED_HOME} ${DELUGED_OPTS}

Restart=on-failure

[Install]
WantedBy=multi-user.target
18 changes: 18 additions & 0 deletions net-p2p/deluge/files/deluged.service-3
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[Unit]
Description=Deluge Bittorrent Client Daemon
Documentation=man:deluged
After=network-online.target

[Service]
Type=simple
UMask=007

ExecStart=/usr/bin/deluged -d -c ${DELUGED_HOME} ${DELUGED_OPTS}

Restart=on-failure

# Time to wait before forcefully stopped.
TimeoutStopSec=300

[Install]
WantedBy=multi-user.target