From ea28d3d453fa5db4c23d6a9df9758ff80dca4f32 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 12 Apr 2010 21:38:32 +0200 Subject: Backported version split patch from v1.2.3 and using it for -r1 --- net-p2p/deluge/Manifest | 5 ++--- net-p2p/deluge/deluge-1.2.2-r1.ebuild | 6 +++++- net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch | 13 +++++++++++++ net-p2p/deluge/metadata.xml | 13 ------------- 4 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 net-p2p/deluge/files/deluge-1.2.2-versionsplit.patch delete mode 100644 net-p2p/deluge/metadata.xml diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index 722fe52..5a70729 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,5 @@ 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-r1.ebuild 1674 RMD160 f7866f722bd24ebff5f543bf865ec57914cbdbdd SHA1 f5023e48cd9c53c0b2a5257ebf55f2d815b5bac4 SHA256 3401133ccfd6a3b9eda63ea012ba169fe0508ea7f95eec997911638316e75ab3 +EBUILD deluge-1.2.2-r1.ebuild 1738 RMD160 8745d2464c926a4b9359cbb3be00f7029ea83242 SHA1 aa022b81ecb4d561ab0c058ec771484aa5c09eda SHA256 5591add1c0db4fb1af4689ce0b7289d7c101e95b61d1e9ac660d83ec5cb92a94 EBUILD deluge-9999.ebuild 1603 RMD160 e4d125fca0e38b5655a3ebedd0ef93ed83a351c5 SHA1 2446f7df5c98d821dd6a02c8cc605856ea46007e SHA256 d0ad474095307c53e79a343714c6c38dcb251fc68f68123ac4fc90ddaa708f15 -MISC ChangeLog 19947 RMD160 3df9e1f4ac295acd804335bad6f4b5202c2c9259 SHA1 3deb14b2d998d2fe0229bb405546ebc5fe7ef031 SHA256 09955d30f5f6f9f540e59944b4f51a9a6831db26ad95ecb9056015b919846b1e -MISC metadata.xml 322 RMD160 ba506cbedd76759bd1b14d569d0d121a1644fa75 SHA1 811976e88cb463281a74ac671ca920b9a15f15c3 SHA256 e88e99b119abf92a69e2115263e6992e6b2a6f711d810e6234c0cfaa21bc1d1f diff --git a/net-p2p/deluge/deluge-1.2.2-r1.ebuild b/net-p2p/deluge/deluge-1.2.2-r1.ebuild index 2dd778f..8de0679 100644 --- a/net-p2p/deluge/deluge-1.2.2-r1.ebuild +++ b/net-p2p/deluge/deluge-1.2.2-r1.ebuild @@ -17,7 +17,7 @@ IUSE="gtk libnotify webinterface" DEPEND=">=virtual/python-2.5 || ( app-arch/xz-utils app-arch/lzma-utils ) - =net-libs/rb_libtorrent-0.14.9[python] + >=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools" RDEPEND="${DEPEND} dev-python/chardet @@ -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 0000000..6aabf04 --- /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"): diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml deleted file mode 100644 index 5be1a33..0000000 --- a/net-p2p/deluge/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -net-p2p - -net-p2p@gentoo.org - - - Install dependencies needed for the web - interface - - - -- cgit v1.2.3-65-gdbad