Fix the sandbox issue for real this time.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 26 insertions, 5 deletions

diff --git a/net-p2p/kmldonkey/ChangeLog b/net-p2p/kmldonkey/ChangeLog
index 9d350c9d8651..af3cc102f005 100644
--- a/net-p2p/kmldonkey/ChangeLog
+++ b/net-p2p/kmldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/kmldonkey
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/ChangeLog,v 1.38 2009/05/25 16:57:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/ChangeLog,v 1.39 2009/05/25 19:52:30 scarabeus Exp $
+
+  25 May 2009; Tomas Chvatal <scarabeus@gentoo.org> kmldonkey-0.11.ebuild,
+  +files/kmldonkey-0.11-sandbox.patch:
+  Fix the sandbox issue for real this time.
 
   25 May 2009; Tomas Chvatal <scarabeus@gentoo.org> kmldonkey-0.11.ebuild:
   Apply sandbox issue patch from older releases. Per bug #270927.
diff --git a/net-p2p/kmldonkey/Manifest b/net-p2p/kmldonkey/Manifest
index 61dbf85d9131..478b66ea2215 100644
--- a/net-p2p/kmldonkey/Manifest
+++ b/net-p2p/kmldonkey/Manifest
@@ -1,11 +1,12 @@
 AUX kmldonkey-0.10-sandbox.patch 575 RMD160 07dbe02443a6421b33c248efb23fbcc56753fab8 SHA1 2dd9d91b70f21d9dfa867acfbac15f0306a489bf SHA256 34fe2fd5a320f86e9b9cbd07159811be18ece3076e7bb167b1a69c95e35d7913
 AUX kmldonkey-0.10.1-failed-dialog-189334.diff 647 RMD160 be09bf10b6b9fa7887eafd8856e8ab8da957d3a5 SHA1 364554ab9ef1ffd58cbc8f46a8bcb4ee6c43188f SHA256 51c044de38b23d983f4c8ab688edecbfc9a994a5e3b9190cc056d53063fa611a
 AUX kmldonkey-0.10.1-sandbox.patch 583 RMD160 88df42bb1415f8b6396c68f25ff562079945a644 SHA1 1198b9467a29d8c06ae3f6410be8c4b1260fb8c2 SHA256 65d300c0c51f91d569a616586fa74da055f366518f196190466bdbc6cf1ceacd
+AUX kmldonkey-0.11-sandbox.patch 594 RMD160 ed92a98cba8e12cfbb7524a8d54bddfb877727be SHA1 ed3ed0e9bd7624d3f10105f5ad7ad91ca874bf50 SHA256 47211c6f46f9d1c8475d710a1a5819a41e0fefeaddca0a21c691cb852dfedd3f
 DIST kmldonkey-0.10.1.tar.bz2 960967 RMD160 fb1c89bd8790c9f937ee6dae26a80200157dcf1f SHA1 6c46f690c77aa9182635d863bdaecc6bd902c181 SHA256 d73efc6d967494b1e13f174aee18fa5e4cd2232f480e9d88310d17cfd6e3e5d1
 DIST kmldonkey-0.11.tar.gz 1002254 RMD160 b59422dd9a8a302cacf7591a335b9cb6991580a7 SHA1 d61db36637e9c59d72440b9e246c72713657767f SHA256 6de59b1cb2341fad2acf486f3ad0b2ffd037af2ef8c3774846c289e1877f8a4b
 DIST kmldonkey-2.0.2-kde4.2.0.tar.bz2 356427 RMD160 24a7966cc8ed98218c5b7e71d8b6d18cce084d7a SHA1 63572bfb25342dda3906c00665c07a964335c327 SHA256 c71f873dae515ce36ec939f9dad02245078897de24d41970dfe40fae271d29b1
 EBUILD kmldonkey-0.10.1-r1.ebuild 819 RMD160 2f9c355298c1502f3c9ea0f02640b675384e3447 SHA1 2bacc1d9201621cb1995d62bdaa96dc3730b6c0a SHA256 14b2eb07ce5971988e856fad21035eb8980e6fb9a4048490b8d3842af91e5ad8
-EBUILD kmldonkey-0.11.ebuild 631 RMD160 28d5bea7eb86a09cc241780c815f180fd987d884 SHA1 502c2f0d5a27da1d5ad5805bb051f5fd46be1434 SHA256 8cb071b35f9abf7520e679727ebd17408bea7bb86b5d283e5a0e5861543544ee
+EBUILD kmldonkey-0.11.ebuild 688 RMD160 2c955532371abad38b707948fbf2230d8aefe7ad SHA1 f63ec424b3156efd915114a0aece79a5eeaca2a9 SHA256 1f7acab2a92399a302e167266bf6f9394a3e05707eb6693e978e351597d8c4c3
 EBUILD kmldonkey-2.0.2-r1.ebuild 892 RMD160 4580a01015597dfd085879147d9c020067cada08 SHA1 9ad4282974dfb96a1cd541aa16d19341149bda87 SHA256 1cb6cb170a92cb9e77b35803e534e4b8968ca9d3f03a953f4aaafb760a35285b
-MISC ChangeLog 5235 RMD160 7988ad550f405ff8af6efb36f686af14d5b43164 SHA1 0bf1b50ad5f709bcc9ba3f026ce463578c03d9ac SHA256 9b11ca542694ef818daf69969e43575b9af068ef3ee98fd998281555144ac006
+MISC ChangeLog 5394 RMD160 81d8a729117cc90cb2c5a7a3b712ab64193fe734 SHA1 93a0bc20f3d87992548adaa68a2e8cf9abd42cd6 SHA256 b1fd016be4c373079740ce869eb7bdfdf958c7dae81a0ef68d01293355d40031
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
diff --git a/net-p2p/kmldonkey/files/kmldonkey-0.11-sandbox.patch b/net-p2p/kmldonkey/files/kmldonkey-0.11-sandbox.patch
new file mode 100644
index 000000000000..ae9a436a0893
--- /dev/null
+++ b/net-p2p/kmldonkey/files/kmldonkey-0.11-sandbox.patch
@@ -0,0 +1,10 @@
+--- kmldonkey/kded_mldonkey/Makefile.am.old	2009-05-25 21:38:29.000000000 +0200
++++ kmldonkey/kded_mldonkey/Makefile.am	2009-05-25 21:38:44.000000000 +0200
+@@ -21,5 +21,5 @@
+ 
+ # Remove obsolete files which this module replaces
+ install-data-hook:
+-	-rm -f $(kde_servicesdir)/kded/mobilemule.desktop $(kde_servicesdir)/kded/kmldonkey.desktop
+-	-rm -f $(kde_moduledir)/kded_mobilemule.* $(kde_moduledir)/kded_kmldonkey.*
++#	-rm -f $(kde_servicesdir)/kded/mobilemule.desktop $(kde_servicesdir)/kded/kmldonkey.desktop
++#	-rm -f $(kde_moduledir)/kded_mobilemule.* $(kde_moduledir)/kded_kmldonkey.*
diff --git a/net-p2p/kmldonkey/kmldonkey-0.11.ebuild b/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
index 6d5cc66d3652..13a276208e6f 100644
--- a/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
+++ b/net-p2p/kmldonkey/kmldonkey-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-0.11.ebuild,v 1.2 2009/05/25 16:57:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/kmldonkey/kmldonkey-0.11.ebuild,v 1.3 2009/05/25 19:52:30 scarabeus Exp $
 
 ARTS_REQUIRED="never"
 
@@ -18,7 +18,13 @@ IUSE=""
 DEPEND="|| ( =kde-base/kcontrol-3.5* =kde-base/kdebase-3.5* )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.10.1-sandbox.patch"
+	"${FILESDIR}/${PN}-0.11-sandbox.patch"
 )
 
 need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+
+	rm -f "${S}/configure"
+}