commit: c715e2529db9e3731132b08d05d4bac02422c6ea
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 20:09:26 2019 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 14:56:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c715e252
net-p2p/deluge: Use GLEP 81 for user/group instead of user eclass
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../{deluge-1.3.9999.ebuild => deluge-1.3.15-r4.ebuild} | 15 +++++++--------
net-p2p/deluge/deluge-1.3.9999.ebuild | 8 ++++----
net-p2p/deluge/deluge-9999.ebuild | 10 +++++-----
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild
b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
similarity index 94%
copy from net-p2p/deluge/deluge-1.3.9999.ebuild
copy to net-p2p/deluge/deluge-1.3.15-r4.ebuild
index 5abf8ffb3d0..d938267bcd8 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
@@ -5,16 +5,14 @@ EAPI="7"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
+inherit distutils-r1 systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/";
-if [[ ${PV} == 1.3.9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
- http://git.deluge-torrent.org/${PN}";
- EGIT_BRANCH="1.3-stable"
+ EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}";
SRC_URI=""
else
SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2";
@@ -31,11 +29,14 @@ REQUIRED_USE="
"
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"
+ dev-util/intltool
+ acct-group/deluge
+ acct-user/deluge"
RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -112,8 +113,6 @@ python_install_all() {
}
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"
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild
b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 5abf8ffb3d0..1be3b571988 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
+inherit distutils-r1 systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/";
@@ -35,7 +35,9 @@ PATCHES=(
DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-util/intltool"
+ dev-util/intltool
+ acct-group/deluge
+ acct-user/deluge"
RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -112,8 +114,6 @@ python_install_all() {
}
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"
diff --git a/net-p2p/deluge/deluge-9999.ebuild
b/net-p2p/deluge/deluge-9999.ebuild
index 7d98de7bce8..9989834d997 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -6,7 +6,7 @@ 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
+inherit distutils-r1 eutils systemd l10n
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="https://deluge-torrent.org/";
@@ -36,7 +36,9 @@ PATCHES=(
CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-util/intltool"
+ dev-util/intltool
+ acct-group/deluge
+ acct-user/deluge"
RDEPEND="${CDEPEND}
dev-python/chardet[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -117,8 +119,6 @@ python_install_all() {
}
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"
