diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-04-12 20:50:57 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-04-12 20:50:57 +0000 |
| commit | 0337595d2637f8507d1e3523dd077c2d4fae131b (patch) | |
| tree | 729ac0200b94432a6d8e5c32b7f8b1e846d481db /net-p2p | |
| parent | Marking clamav-0.96 ppc for bug 314087 (diff) | |
| download | gentoo-2-0337595d2637f8507d1e3523dd077c2d4fae131b.tar.gz gentoo-2-0337595d2637f8507d1e3523dd077c2d4fae131b.tar.bz2 gentoo-2-0337595d2637f8507d1e3523dd077c2d4fae131b.zip | |
Fix bug 314829 by backporting version split patch from v1.2.3
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/deluge/ChangeLog | 9 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-1.2.2-r1.ebuild (renamed from net-p2p/deluge/deluge-1.2.2.ebuild) | 6 | ||||
| -rw-r--r-- | net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch | 13 |
3 files changed, 26 insertions, 2 deletions
diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog index 6488dbaaa4c4..dc034d5fe976 100644 --- a/net-p2p/deluge/ChangeLog +++ b/net-p2p/deluge/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-p2p/deluge # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.144 2010/03/24 20:00:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.145 2010/04/12 20:50:57 sochotnicky Exp $ + +*deluge-1.2.2-r1 (12 Apr 2010) + + 12 Apr 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org> + -deluge-1.2.2.ebuild, +deluge-1.2.2-r1.ebuild, + +files/deluge-1.2.2-versionsplit.patch: + Revbump to fix bug 314829 by backporting version split patch from v1.2.3 24 Mar 2010; Raúl Porcel <armin76@gentoo.org> deluge-9999.ebuild: Move to git repo diff --git a/net-p2p/deluge/deluge-1.2.2.ebuild b/net-p2p/deluge/deluge-1.2.2-r1.ebuild index b80ed5bf5f6f..8c96572bbc26 100644 --- a/net-p2p/deluge/deluge-1.2.2.ebuild +++ b/net-p2p/deluge/deluge-1.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.2.2.ebuild,v 1.1 2010/03/20 13:11:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.2.2-r1.ebuild,v 1.1 2010/04/12 20:50:57 sochotnicky Exp $ EAPI="2" @@ -39,6 +39,10 @@ pkg_setup() { append-ldflags $(no-as-needed) } +src_prepare() { + epatch "${FILESDIR}"/${P}-versionsplit.patch +} + src_install() { distutils_src_install newinitd "${FILESDIR}"/deluged.init deluged diff --git a/net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch b/net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch new file mode 100644 index 000000000000..6aabf04d0ed9 --- /dev/null +++ b/net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch @@ -0,0 +1,13 @@ +diff --git a/deluge/common.py b/deluge/common.py +index bbdfd4d..e0a7459 100644 +--- a/deluge/common.py ++++ b/deluge/common.py +@@ -525,7 +525,7 @@ class VersionSplit(object): + def __init__(self, ver): + ver = ver.lower() + vs = ver.split("_") if "_" in ver else ver.split("-") +- self.version = vs[0] ++ self.version = [int(x) for x in vs[0].split(".")] + self.suffix = None + if len(vs) > 1: + for s in ("rc", "alpha", "beta", "dev"): |