From ef05feae5967e6dbff8d1c66be583e24118d5632 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 12 Apr 2010 20:50:57 +0000 Subject: [PATCH] Fix bug 314829 by backporting version split patch from v1.2.3 Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- net-p2p/deluge/ChangeLog | 9 ++++++++- net-p2p/deluge/Manifest | 5 +++-- .../{deluge-1.2.2.ebuild => deluge-1.2.2-r1.ebuild} | 6 +++++- .../deluge/files/deluge-1.2.2-versionsplit.patch | 13 +++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) rename net-p2p/deluge/{deluge-1.2.2.ebuild => deluge-1.2.2-r1.ebuild} (89%) create mode 100644 net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch 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 + -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 deluge-9999.ebuild: Move to git repo diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index 9c05ef64490f..f2daefac7d2e 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -1,3 +1,4 @@ +AUX deluge-1.2.2-versionsplit.patch 489 RMD160 4284a50f46e198d95bf40ef523b8fcf7dae30b00 SHA1 435e7b7f76c506fa7cd8ed366bad83a92bdcbfaa SHA256 88fc382fece21e29e73812487445045ce034383b3c2a09443c07345e436e2240 AUX deluged.conf 184 RMD160 f1721fcc20b77836c783cbe4e7492748902f0428 SHA1 e330df742ae8f21e7dfbbaa31f181279ef96e3b8 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d AUX deluged.init 2187 RMD160 6283e0f053c70c8ebbf19475db0da86313a027cc SHA1 408f2c44e45cbbdff36b13fcfe36b567565d5fd5 SHA256 1bb62e34d18e09268fa5491a2a102fc1e6566de19b006a2c34a12716d80ed023 DIST deluge-1.1.9.tar.lzma 1688164 RMD160 0766849e898adfbee230666a47fd97c8d951dcdf SHA1 b11a83c958f4351c84cd0c8b5d29e3a9f63eabb9 SHA256 d3cb85d91bb8c844e3935f32e6cfe71733149c50ddb24fe2d83c2ee6d46d6a8f @@ -9,7 +10,7 @@ EBUILD deluge-1.1.9.ebuild 1671 RMD160 ec88aa4011e1e027bb113491b0a54b5b686d2aec EBUILD deluge-1.2.0.ebuild 1672 RMD160 d388e3201d74ca65f878edf2396806259c133e71 SHA1 8b43a7da959a02c20a02c50ae4ec659c2d9b87a7 SHA256 137f9c6aae857113b7db7efb0c157b9b4eab8be149a21499c6ba4e1217a18619 EBUILD deluge-1.2.0_rc5.ebuild 1679 RMD160 b5df9e9e6d84f9e994e4de7763982b6828d5048a SHA1 5b00b384d2a5b1f8d2289e78ec525cd5e3b36216 SHA256 95b4e3ff04cb2807a5180168ad4ae1cb63af624ffadca1d49ff625940797608e EBUILD deluge-1.2.1.ebuild 1675 RMD160 f5c8a8152550d6a114368d08e146b1d3029e1764 SHA1 f4e17f52a8a097669b3396a2975b40cdd563455c SHA256 9f4ae65c40a452d7b29ed960a31d8e38d36c393489d7fc1e9b7b852b5016fa53 -EBUILD deluge-1.2.2.ebuild 1675 RMD160 84fd057bd3f8086bce46d90cf2411dc00e08c4d3 SHA1 d6c24192f020691875071bde1c68cfd9bf71f0dc SHA256 f9204329ddd30389fa8ee119dfebbca88b607c3d88932e43e4a1ab7cca6714e8 +EBUILD deluge-1.2.2-r1.ebuild 1747 RMD160 ba89bdcfd755f2aa671f476b65e26fb5903f6db2 SHA1 0f727c52d10b88aec6e120b5a435741a0f2600b2 SHA256 006ea679cf80c437c6c2b7d7e737907925f885f53f0f779ef60ebda3ee3d81f9 EBUILD deluge-9999.ebuild 1603 RMD160 e4d125fca0e38b5655a3ebedd0ef93ed83a351c5 SHA1 2446f7df5c98d821dd6a02c8cc605856ea46007e SHA256 d0ad474095307c53e79a343714c6c38dcb251fc68f68123ac4fc90ddaa708f15 -MISC ChangeLog 19947 RMD160 3df9e1f4ac295acd804335bad6f4b5202c2c9259 SHA1 3deb14b2d998d2fe0229bb405546ebc5fe7ef031 SHA256 09955d30f5f6f9f540e59944b4f51a9a6831db26ad95ecb9056015b919846b1e +MISC ChangeLog 20211 RMD160 40666527b01d46656d54b53eb5c0346bde604071 SHA1 94fbcc968029c7dc3dfa4092f2738984366735de SHA256 660b96f533f81b3f3bf811d13afed463048eaf00b40cb94fb65147842f226dfd MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f diff --git a/net-p2p/deluge/deluge-1.2.2.ebuild b/net-p2p/deluge/deluge-1.2.2-r1.ebuild similarity index 89% rename from net-p2p/deluge/deluge-1.2.2.ebuild rename to 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"): -- 2.26.2