Prevent deluge from downloading rb_libtorrent from svn if the system one is broken. Thanks to Arfrever

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

5 files changed, 71 insertions, 19 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index fb63d02afdfb..093e0319c5c7 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.180 2012/12/20 22:23:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.181 2012/12/21 20:27:51 hwoarang Exp $
+
+  21 Dec 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/deluge-1.3.5-disable_libtorrent_internal_copy.patch,
+  deluge-1.3.5-r2.ebuild, deluge-9999.ebuild:
+  Prevent deluge from downloading rb_libtorrent from svn if the system one is
+  broken. Thanks to Arfrever
 
 *deluge-1.3.5-r2 (20 Dec 2012)
 
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index bd24fd87f7df..f795a3f01afd 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1161 SHA256 8d5f40baaabc78ecbaaa1be4273c4ca2aa95e90e1d9d8e3193ec5d2c77e6b2da SHA512 afd5e8909dc1d403d94ddcfe2acd537f5b483bc6104d6d8cfb4b9c291e14b378341b18cf8f053a29a9a64416458098fe1c49279ab82a448f80334fb620cf04ba WHIRLPOOL 6d2a0ff55b792091ead6b47f39795a4d7b19faa94b99cdb66ecca307872e501974ef2a07c62d419394551862f281e0d1fe3d3eda883cc50adf3dd69c2031bee9
 AUX deluge-1.3.5-rb_libtorrent-disable-python-bindings 2883 SHA256 4764bd3d7fbabeb68fd3776c5dfde0eabaad3cdd71eef97fdd5daaae4d4a4587 SHA512 72d1dba662b24aef3e5ddd9ed9a2a672075d8c858c53230f1cb011e6ad23d9711f71d848173133fa215105450b30db17a7dce7d2ef4631f2add4079d1b38a380 WHIRLPOOL da9733d77adb067981b0f0a7dfd43fd5d1c01027e7a881bf7956f144f2975fcc1572ab8bae7a9e63d2225fc0a40ee1b55d0b20d45f101f4ddc0d7f41e2fb63e1
 AUX deluged.conf 184 SHA256 9f686931e7f5c337d4866d91ae725b0a983ee2a409eee69a197e7db8e4bc2b3d SHA512 506501b5792413c23fa059fde3d650a2faa3a0f6e961047d92769822961d5a6562d729bfd937bea98d878f1359c56e6746441446532c2ff2ea61f0b813328b12 WHIRLPOOL 5530d891fc3db9b58ab501242d9d3f948ec3ec02a8dd5a752eddaa4a009462f012578671582583f32e86a5b158714ec95157b8b3df6b62e2f443025455f8247c
 AUX deluged.init 2053 SHA256 04cacfadc79e738d8cccc4de6ffe735697c01e17c0e96d9604b7018e68c8a9a3 SHA512 6af52ea49039d778c7deb15673b575bebd150da2f37e550da383d5b975d8fd00e19abe79ef6b54b3e031e492e5f8ff08d9aa2214b7c8297e68f97fd40a53dc2f WHIRLPOOL 04d4cd2ce65cb4373d0f84233703008eb7749ae74286a4b1ce6bb81e1891e2bea73edaf948845ff9c6343500e8102fb566d5d76fb478fa4f13b5a4f96a2ee0ea
 DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
 DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88
 EBUILD deluge-1.3.3.ebuild 1807 SHA256 0f716d0c09b1170a1e9387488d8e23b3758167a500feb3137e0d56bddb5cd101 SHA512 1f47c616b69391ec20bbb2472884a661c7bb6eaed1f597577cad2371ea159318685736f3ed68355d95b33db8196a2569e48ab5218abd906827e1d6537a9e0ca7 WHIRLPOOL 41f4df321e444007646614c77215ea41303c90271742cf332cabbed8bfc017234c29c99e84b9f36f0cb90fddbeee9f6f9465cdb04fe5c67f64ed259e69e1c2e1
-EBUILD deluge-1.3.5-r2.ebuild 1979 SHA256 96fc9759da410cbfe85ec087c363fc346b6e777fa3b5c2ef91a023749451e273 SHA512 e227c4dee22efb1adeb52dfc9a6bed825eb3e50237d63d1c3d4103537d00043e6ffb1c971381ea0b08ef3ef75c131614b19c88b2838226b4decd53508a2c7e80 WHIRLPOOL 8216330ad710b751a20f0bd5d841689903444a272ac45f3d7ff962d10b95dc79286c5df35f0facf3149c9c6b033ffacdedabc3b1f17b9731256d8dbf88502f9a
+EBUILD deluge-1.3.5-r2.ebuild 2047 SHA256 d107d11e8a3729ba73264e5f8ece7a1651696b8514a9dca27f24f321455023c7 SHA512 bdcbb58bf8798ebd254c9852c668ac5c2f373e39a10529a22fe2a785e32b0aa4812d56f9c89a050842a69c8196d95f1d95a47c991b408ce7b48ab43888e9b3f7 WHIRLPOOL 3e80699c4174b4ad8f270b944496757858880826ad339bb478563cbc0d521e0a7dfc858cb749fe2df5f1249ab9676f643d9f05e677d4a6d1350b4143d8f55c76
 EBUILD deluge-1.3.5.ebuild 1890 SHA256 593ccd278bdfff2dbe6d2de2b284ad69835773209ec5b6730b6b8bb35441109e SHA512 c9706e7bf96b037a22496e04017a690dde649b8f7d64d09eb89a5d940d62d195004f974ab4b08ba59c3d3e62573ae5864f8e2b7fd0617c8f1091f61366f268da WHIRLPOOL 110f37556f6c716d8c6ad138c518a91fb71368654865d07428ef02cb261b1a199e77619aae2300fec81b8076f3874431356194b10851408d3313ab3528f226a2
-EBUILD deluge-9999.ebuild 1891 SHA256 5d7b6a0c9c9ae27380632c6e331bbf8b6660ceab248162f12b7ef31d6596be9e SHA512 b23cb4c55fdafc7510f1fae766fcea171f46720f240198bc516c82c9aadf65ef9cefec72ab8cabe5800173b058713509a295f4932e05dbdc278bab4508914d93 WHIRLPOOL dd91f0112e009be7ace4df3f65ebe6dae15e64c1f93baf399f00d797dce5d40dd351a680e9988edcf3ef3ad49f120a91f933adcab79926754e4e1fc047ff03e9
-MISC ChangeLog 25202 SHA256 363ab1f70002d1c2f7978e046390aa557cf3414b8a2c0a94377d31aa41fc3f99 SHA512 c11e8a38641a02613f82450c03b0c51458dfe2ec3f70a86f9089a43c1551ad50f791ac810478ec93021fce8ad097bc89feb0dd96a95071ce35e9193de0aa123e WHIRLPOOL 1ff8118612aa1411e89d9252d92820ca6c89641d97405e83000b1829f44c6e1240a47c1d21f42db1d065635f083a541b1c318da18ac5d82770dd48ff2b0e4a36
+EBUILD deluge-9999.ebuild 1964 SHA256 13b7a00c919c25a7ea4820f7cf3c77da6411d8ed666cdae06b27679d26ddff8a SHA512 5dc1f965fe25bf30e2232a29b1979e1043c4ac79dbac797544a05c5f3291b1dc748809ef5fc9d0aa857ac72da045163e2ee9a4d670d1dee4bc0b0184d6903212 WHIRLPOOL bf4c6c1f755d49a90a7274a76a4cf0941daddf94f67ceaafc4d0a41a5cbce0e3070a1047b7ddcdc4688e7ab2204a281a252b72e825779a3397c0ac6df1bcaacb
+MISC ChangeLog 25471 SHA256 e7821429f9ee92b55aef6ff7918b6e489b6e45649cb2d9aebbc10436d7c5f958 SHA512 ff0ac2354bf4cc3455be91647c55833da9d03de4ac1ace0207ba8def164c518797eaaebf47c4d974c196773d9c97224493d8e69c8fc6bba219908c0c776851b9 WHIRLPOOL 44f857b9184f97a5095fd555adf6cb128e6ee0afce246493018d1ddf16b59ce9bc3be29be96d7c98f05d480124bfccb3b9ae4c6a1b70bae416142d2d65344a85
 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ04/DAAoJEPqDWhW0r/LCPJ0P/30V6JeECRBQ3sUOJfgbbLgO
-eun6Tl965nCOWxv44HII1xOHqKpImyh6lZIFwDEQx+FJ7rGK+kcpru1EoAe7GizS
-oQLxtvJk50kM/PSFy0FN5fVhCKoNamXjHnNUX4WFO9ikAkPkISwbOh+uRR4GxlKM
-2uR1poPyqMkStMQ5vTx86Bz/TyfvBuVdwvNt2l37nt/kpmPn4k8Eic9b9QIjtka3
-odWUd+ukeVg2esM4/WC0FAlxkBfGD/gv95bXY0l0C4xIQ+gOMPdLBp3CBN6pwjpR
-2gyxT/GKVnJ3Rtt2M24LYLuHC6sRJE3R2+2jnkIqGC8v5z3y00253s/0d4/+br8H
-fQ2u+wADkCVQnwGmDrN5exOZjPHSSrrTdvRAD/wdtDLYuTCPRxkB992QGofH+1te
-NmTnJjoouA4HchzvBLtAMf05elsJVRihbs4Ci+DzskeA4AxBsS5N9r1SOVg775Gt
-H0+KJ0/jfwR0lB7bSyhArOlASlBjfy4Del4ImsYfJjGbtJ94f2uQymdRUGSOcx3O
-oMOrdqAFSCVpnVoYa5BicxRkmLkMMprzd6AN2aWMSK4OCW2+K+Wm3xm1DUKk66N+
-7sylLQtjzmpZereS+2Vis8p8Fp4wy39ItsPtKhpQ5lLI4yq+DJ2O5sdLFMzrJ2I3
-9kK/1ZjMqNmhlQfdG7g+
-=+tqi
+iQIcBAEBCAAGBQJQ1MZAAAoJEPqDWhW0r/LCE0cQAKo27Akk6+V0ow4y3AktSlSZ
+MvOW0mq4WJxnDfYqOAPGJ+WwgAlU07aPWk/k4HlQKc7ILp7WGQs8BI7AraUZ0y5y
+LTL2uLTzhdPg8aTpFdYcahBh72KpKZ6gUNFpbWXR7eLqzA9R+vncI/k13jmjbwWI
+hCnWeBDPNFyeeE0g22HHU4kt5dLMRGlPnxiMEX5KmiMDdOhmswEz1r2wjuR/jtEi
+C09zJ8r+LsgwBhutFyfIWt3q5FqxlnTvKPp4vbHIfnM7UqpjdnXqcKAQgkZApFwS
+H/f8EM/xEFOxskd1RKtDG329l3BV8RysiL8XHQ+fWnCiv+Dlvq/vfyB9v4nzBekw
+2XqBcyRMEUTZsnbC6iLavU/mcjLraKVQUpTHxeiD/pFBU0qzMErR3zsuO7hqZZCq
+IF7WzA2IH/SdzpW1sQGGx39dTDgvi3xyvjcySiYDsay+eL8o1S6bUGuv3gpKEnCp
+8zRAoxxjNnU3U8R/8CcCkpo2mS2ret3xAjSP53SwJjeEr0Zs2hiXvhul9HFaQEmk
+xlOV6jik2pW0bV8uZlYhN1cAh3FZe8QkCvnBr/nYS4jCvAm21CKjJWRRSgRfz3Bx
+7Vr3GniXOwHoxvs22i/YzYIekteZSHHGaA7LWTvZy7Z7MEf2haOWudIPuioMiQA4
+4+NYneswyvWE93ahaFJw
+=pmZZ
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/deluge/deluge-1.3.5-r2.ebuild b/net-p2p/deluge/deluge-1.3.5-r2.ebuild
index d12c4f487204..1ece04fc9127 100644
--- a/net-p2p/deluge/deluge-1.3.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.1 2012/12/20 22:23:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5-r2.ebuild,v 1.2 2012/12/21 20:27:51 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -47,6 +47,8 @@ src_prepare() {
 	distutils_src_prepare
 	python_convert_shebangs -r 2 .
 	epatch "${FILESDIR}/${P}-rb_libtorrent-disable-python-bindings"
+	epatch "${FILESDIR}/${P}-disable_libtorrent_internal_copy.patch"
+	
 }
 
 src_install() {
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 61b6c6555655..19ff341fed59 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.31 2012/12/20 22:23:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.32 2012/12/21 20:27:51 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -48,6 +48,7 @@ pkg_setup() {
 src_prepare() {
 	distutils_src_prepare
 	python_convert_shebangs -r 2 .
+	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 }
 
 src_install() {
diff --git a/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
new file mode 100644
index 000000000000..235b7f7c2438
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-1.3.5-disable_libtorrent_internal_copy.patch
@@ -0,0 +1,42 @@
+--- setup.py
++++ setup.py
+@@ -205,38 +205,7 @@
+ 
+ _ext_modules = []
+ 
+-# Check for a system libtorrent and if found, then do not build the libtorrent extension
+-build_libtorrent = True
+-try:
+-    from deluge._libtorrent import lt
+-except ImportError:
+-    build_libtorrent = True
+-else:
+-    build_libtorrent = False
+-
+-if build_libtorrent:
+-    got_libtorrent = False
+-    if not os.path.exists("libtorrent"):
+-        import subprocess
+-        if subprocess.call(['./get_libtorrent.sh']) > 0:
+-            got_libtorrent = False
+-        else:
+-            got_libtorrent = True
+-    else:
+-        got_libtorrent = True
+-
+-    if got_libtorrent:
+-        # There isn't a system libtorrent library, so let's build the one included with deluge
+-        libtorrent = Extension(
+-            'libtorrent',
+-            extra_compile_args = _extra_compile_args,
+-            include_dirs = _include_dirs,
+-            libraries = _libraries,
+-            library_dirs = _library_dirs,
+-            sources = _sources
+-        )
+-
+-        _ext_modules = [libtorrent]
++import deluge._libtorrent
+ 
+ desktop_data = 'deluge/data/share/applications/deluge.desktop'
+