Override _distutils-r1_create_setup_cfg to disable out-of-tree builds; needed for...

Package-Manager: portage-2.2.15/cvs/Linux x86_64

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index 011376180a52a4c59fd7f666fb2e9c8768afff70..95171696bf9bb62730721b317077012acf3ea38e 100644 (file)
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,11 @@
 # 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.190 2014/12/01 05:54:08 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.191 2014/12/21 09:12:14 heroxbd Exp $
+
+  21 Dec 2014; Benda Xu <heroxbd@gentoo.org> deluge-1.3.11.ebuild:
+  Override _distutils-r1_create_setup_cfg to disable out-of-tree builds; needed
+  for the deluge plugin system.  Bug 531370.  Credits Kostas Kavourakis, poncho,
+  Anthony Ryan and Paolo Pedroni.
 
 *deluge-1.3.11 (01 Dec 2014)
 

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 13a039ef40b9a21d21573ae15ebb75886ca19ccb..a6dd921c04531d72a833d40445385eae3020c8bf 100644 (file)
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -6,8 +6,8 @@ AUX deluged.init 2055 SHA256 e61ad364bd7c2f87fc463a56f3f191341a9e528a3fb3f08a100
 AUX deluged.service 277 SHA256 6347ec82b7a28daabe441e3436fdc725e96dae2249ccf8fb2452168368750000 SHA512 fea157a271d768a1b6025b32b97b2b88f5b70472a7059da7fa4babb4f1a686e33e04cc4bd7a5daf70a5f682252687495bbe72eb1c1b335857817f45ed4f1dd33 WHIRLPOOL 38f66dffa09250a73990a4bc76f230e8d4c8e9ad4c87167fdb2144f0a7c3210017500030ed2a4a381bcba82ee8cc45cb518688d752a453be02f7ddd69b5c0e7d
 DIST deluge-1.3.11.tar.bz2 1792459 SHA256 83e1f41b8a2a6e7ba86a54474692d4686db509b75441173d9603447f9e0ec898 SHA512 d56c03f3c687cdee65f8d7f26728a46cae1fd665c49313bd2b91243d26df0f5b2292048fd542333cbc538383eb53cd961bc3427230f9081317268735df367272 WHIRLPOOL 52820837a24ef3d4917a1b018fa30c8ec662a6c2366cb848fb984b716175bad63131e7cc4eea7688405e380102cf0ebb5ae4b58dcd7c90fd7dde9dcc9dada444
 DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1
-EBUILD deluge-1.3.11.ebuild 2124 SHA256 6e56831a5e307f148275359998fb5a4807432a82c3cc7589beadc5576e8d66ef SHA512 9a4ed5cb7c80a226469a9d3ee8309b457f506af6d0f2c8d51c55af98748090103451dc8c0e1331bdf718ae771af883f2f8d85a6bc100bf82a4383b76f2dee412 WHIRLPOOL a96b1334026490a1f004aa3a811d42e47404448f2de622d3657c75d92525d379ce60a1286d711020c522d9b151dedd763eeabeb4c2a51592e662b1c7332879b9
+EBUILD deluge-1.3.11.ebuild 2378 SHA256 db86133d910d7afe3fc300d001f708adf28faf39dfbdf9c8c8b9c6a26b738c1c SHA512 e987c50c9657164199f519debb024716a966baf3b373d601e99fa78d406b50d4eeb56da026e0946ad1dbecec1a7a3e42aeb38c49c14c6dab02864389ca89196e WHIRLPOOL d3701e32f5c76974c6f3772938c096774133072e13ab898636af89b0295f1a55eac394c68a3d6e5eef0ed2678700c3c3e49399fba7069fc30ad7ced3b532b824
 EBUILD deluge-1.3.6.ebuild 2059 SHA256 b9032a10c27d1988778c2fa1ae047b2b33fae119fa988aceb0e43c565e40e21b SHA512 d256c48c186ce40e8fa37d3e1106cb5c2a2b8a1deb1b4980fcbc7587fdc3f7c572545013ccb16163bbe0fb13fba907c19a4289c3ea2d6957955018563fbbc9c7 WHIRLPOOL 4c4a87ba88ee9852b2599c8d9459ddb6fe78504385015a0dc6b7001380b83e4ed527e4e34e3d8023116536ef57d833f26793100a5201a9dd8c61440b7195a548
 EBUILD deluge-9999.ebuild 2123 SHA256 d6dc7e36bb883096dda22e08fc5b73c8aa9b3c789bd25e546a6ef98f8efcfa6f SHA512 b2782bb3160a0a526db6f941f4a715712ed9e7bfd0d33c15bebf088c03396ef3d69237b14af3921f4b625ccd8bfd620b39fa7d3edb31b9b3a668197556f58a7a WHIRLPOOL d667488eb1a2a8dbd8e9ca28a8d03d7bf0c4919b652bd96935735deae7453e4d5b6f87f93c01440f46220dc19dacd1ed937619bb6ddb5b5564ce087f44550cbe
-MISC ChangeLog 27191 SHA256 bb27c0680b684a7254a0977eb96593f520e0abbade41027cabf4d7c4e2fea4cd SHA512 a7f327414b19f3d2cc6ebb7587464c35dfcd97b9151e296c389cf005d987af820a40da0f36ded28db447c98f2ba15fb4aba4cdce765bf5c38b6c2bc58f037c04 WHIRLPOOL 1f0f00b83758c342f04973ced7ec2167b8555d728cb90827242e47a9da1ef62db7bbf48ac01c7c447693452f30165adf8a504efa080dec19fd59ac5e0ed0a4dd
+MISC ChangeLog 27454 SHA256 932712a1fb214817c8e2a475667be4970204afa51efcdd9d18c6d2615efdd767 SHA512 85c5fd11ed8fcee0156a6295c774c4b3bfba495b97567e19e48a9964e6991f068b6ad4ee3005e1f9218d32f3786769ec63b424138286a609e057fa1f8a01c0ef WHIRLPOOL 085d4c0fb86947c56b0d2a92bf45b90b3fd7d75ee636f56eaca715f2454fbbeb1b777f5fcabea182e8a1cab3a7b16a02f1d23d6005b9faf882b16eb83b5becac
 MISC metadata.xml 356 SHA256 659ce61ec4c1475764f4d7a515780577bcdfc81e814291fa429ed77fcb6c4bdb SHA512 c4aac10613fd08fb8e65b7f1e4141c569981d77629608a70309fbe0d5eade6c117d1a5883bf1baa37e6ced100fba807798594551219cfbb89a748dfdf730914d WHIRLPOOL 95f609ffb59d9e893047c83d51459e1f5b4197dbf1bf9f0cf85ef47f7903217f56fa3d479b5c2134469bd359c703b20c2dd77263e0f51811a41a46694b681582

diff --git a/net-p2p/deluge/deluge-1.3.11.ebuild b/net-p2p/deluge/deluge-1.3.11.ebuild
index 2322482b454db74266e0daec549da42df0f2fc7b..d08de503c0ecf013b038146b1eee2fb2ffcc579f 100644 (file)
--- a/net-p2p/deluge/deluge-1.3.11.ebuild
+++ b/net-p2p/deluge/deluge-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.11.ebuild,v 1.2 2014/12/21 09:12:14 heroxbd Exp $
 
 EAPI="5"
 
@@ -53,6 +53,13 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 }
 
+_distutils-r1_create_setup_cfg() {
+       # bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+       # Override this call from the distutils-r1 eclass.
+       # This does not respect the distutils-r1 API. DONOT copy this example.
+       :
+}
+
 python_install_all() {
        distutils-r1_python_install_all
        newinitd "${FILESDIR}"/deluged.init deluged