heroxbd 14/12/01 05:54:08
Modified: deluge-9999.ebuild ChangeLog
Added: deluge-1.3.11.ebuild
Removed: deluge-1.3.5-r2.ebuild deluge-1.3.3.ebuild
deluge-1.3.5.ebuild
Log:
Version bump to 1.3.11 and to EAPI 5 for bug #517072; thanks Mark R.
Pariente. Drop old ebuilds and python 2.5/2.6 dependencies. Rebase -9999 to
1.3.11. Migrate from distutils to distutils-r1.
(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, unsigned
Manifest commit)
Revision Changes Path
1.36 net-p2p/deluge/deluge-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?rev=1.36&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?rev=1.36&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild?r1=1.35&r2=1.36
Index: deluge-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- deluge-9999.ebuild 10 Aug 2014 20:36:34 -0000 1.35
+++ deluge-9999.ebuild 1 Dec 2014 05:54:08 -0000 1.36
@@ -1,36 +1,42 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.35
2014/08/10 20:36:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.36
2014/12/01 05:54:08 heroxbd Exp $
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
-inherit distutils git-2
-
-EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
- http://git.deluge-torrent.org/${PN}/";
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="http://deluge-torrent.org/";
-SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ 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"
-KEYWORDS=""
-IUSE="geoip gtk libnotify setproctitle webinterface"
+IUSE="geoip gtk libnotify setproctitle sound webinterface"
DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
- dev-python/setuptools"
-RDEPEND="${DEPEND}
+ dev-util/intltool"
+RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
dev-python/chardet
dev-python/pyopenssl
dev-python/pyxdg
- || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
>=dev-python/twisted-core-8.1
>=dev-python/twisted-web-8.1
geoip? ( dev-libs/geoip )
gtk? (
- dev-python/pygame
+ sound? ( dev-python/pygame )
dev-python/pygobject:2
>=dev-python/pygtk-2.12
gnome-base/librsvg
@@ -39,25 +45,23 @@
setproctitle? ( dev-python/setproctitle )
webinterface? ( dev-python/mako )"
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
+python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
+ )
-src_prepare() {
- distutils_src_prepare
- python_convert_shebangs -r 2 .
- epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+ distutils-r1_python_prepare_all
}
-src_install() {
- distutils_src_install
+python_install_all() {
+ distutils-r1_python_install_all
newinitd "${FILESDIR}"/deluged.init deluged
newconfd "${FILESDIR}"/deluged.conf deluged
+ systemd_dounit "${FILESDIR}"/deluged.service
+ systemd_dounit "${FILESDIR}"/deluge-web.service
}
pkg_postinst() {
- distutils_pkg_postinst
elog
elog "If after upgrading it doesn't work, please remove the"
elog "'~/.config/deluge' directory and try again, but make a backup"
1.190 net-p2p/deluge/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.190&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?rev=1.190&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/ChangeLog?r1=1.189&r2=1.190
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog 10 Aug 2014 20:36:34 -0000 1.189
+++ ChangeLog 1 Dec 2014 05:54:08 -0000 1.190
@@ -1,6 +1,15 @@
# ChangeLog for net-p2p/deluge
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.189 2014/08/10
20:36:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.190 2014/12/01
05:54:08 heroxbd Exp $
+
+*deluge-1.3.11 (01 Dec 2014)
+
+ 01 Dec 2014; Benda Xu <[email protected]> +deluge-1.3.11.ebuild,
+ -deluge-1.3.3.ebuild, -deluge-1.3.5-r2.ebuild, -deluge-1.3.5.ebuild,
+ deluge-9999.ebuild:
+ Version bump to 1.3.11 and to EAPI 5 for bug #517072; thanks Mark R.
Pariente.
+ Drop old ebuilds and python 2.5/2.6 dependencies. Rebase -9999 to 1.3.11.
+ Migrate from distutils to distutils-r1.
10 Aug 2014; Sergei Trofimovich <[email protected]> deluge-1.3.3.ebuild,
deluge-1.3.5-r2.ebuild, deluge-1.3.5.ebuild, deluge-1.3.6.ebuild,
1.1 net-p2p/deluge/deluge-1.3.11.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.11.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/deluge/deluge-1.3.11.ebuild?rev=1.1&content-type=text/plain
Index: deluge-1.3.11.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.11.ebuild,v 1.1
2014/12/01 05:54:08 heroxbd Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 eutils systemd
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="http://deluge-torrent.org/";
if [[ ${PV} == 9999 ]]; then
inherit git-2
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="geoip gtk libnotify setproctitle sound webinterface"
DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
dev-util/intltool"
RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
dev-python/chardet
dev-python/pyopenssl
dev-python/pyxdg
>=dev-python/twisted-core-8.1
>=dev-python/twisted-web-8.1
geoip? ( dev-libs/geoip )
gtk? (
sound? ( dev-python/pygame )
dev-python/pygobject:2
>=dev-python/pygtk-2.12
gnome-base/librsvg
libnotify? ( dev-python/notify-python )
)
setproctitle? ( dev-python/setproctitle )
webinterface? ( dev-python/mako )"
python_prepare_all() {
local PATCHES=(
"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
)
distutils-r1_python_prepare_all
}
python_install_all() {
distutils-r1_python_install_all
newinitd "${FILESDIR}"/deluged.init deluged
newconfd "${FILESDIR}"/deluged.conf deluged
systemd_dounit "${FILESDIR}"/deluged.service
systemd_dounit "${FILESDIR}"/deluge-web.service
}
pkg_postinst() {
elog
elog "If after upgrading it 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 "For more information look at
http://dev.deluge-torrent.org/wiki/Faq";
elog
}
