From 0ae2713258d4cea5fdbe43b5cbb84fc0fa543ab2 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 6 Sep 2010 15:12:14 +0200 Subject: [PATCH] [sys-apps/entropy] add another backported patch, revision bump --- sys-apps/entropy/Manifest | 3 ++- ...r6.ebuild => entropy-0.99.49.21-r7.ebuild} | 1 + ...entropy-client-remove-debugging-code.patch | 20 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) rename sys-apps/entropy/{entropy-0.99.49.21-r6.ebuild => entropy-0.99.49.21-r7.ebuild} (97%) create mode 100644 sys-apps/entropy/files/entropy-client-remove-debugging-code.patch diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest index e0b680f88..4c5d91e17 100644 --- a/sys-apps/entropy/Manifest +++ b/sys-apps/entropy/Manifest @@ -2,6 +2,7 @@ AUX 0.99.3.1-patches/entropy.git-51c1fdb0770a63ee7cf80922517a3296076e579c.patch AUX 0.99.3.1-patches/entropy.git-7973f22c095636ec2ebf829590d2cd9e41a21038.patch 1910 RMD160 a2ba12eb867fe517d03303ea506c0ecdc9012688 SHA1 80526bc0ffb2b05c54fa16eae2b932a53edd9e70 SHA256 d85d4136ed2bb4960121d288a79e1a44baaddd60c40765709df69518276fc487 AUX 0.99.3.1-patches/entropy.git-8fedd189f902c290a106d42053c996d76623a3ba.patch 4093 RMD160 b4a755606c27f74c1101fb3a504e7d38d4d167bf SHA1 c52518e55b26aa2cb56a4e7630cc67184ea76e75 SHA256 09cdae8b0cc564dd4fe1ce0d2b5a1a81742e55eb1482e4e1577bfb09815dc3ab AUX 0.99.3.1-patches/entropy.git-b78f7ef42ddd595b1ade969ce0a5959405257211.patch 4154 RMD160 a6c87e65386577f4f64425cf090d6f721390bbe9 SHA1 05ff54214d18633e9fecfc5597cb6e3b4af33e52 SHA256 fa5a23d0724bdcd387d313e4d7c2a48e0bde1873299614293319c78fa3017fa6 +AUX entropy-client-remove-debugging-code.patch 768 RMD160 d6c7217827b4b479dbd215b48cd92d4ab672b28d SHA1 69305d8a0bab2ce2515c7689035d0a1d57fd1065 SHA256 4df7a5cd52c726bc556c9d1d0248abe9fe5f30a42c72b41b28f95cbf2d1f9966 AUX entropy-db-fix-retrieveUseflags.patch 665 RMD160 2f31093a6030b0b6c32e88713038de89b5aeda53 SHA1 321379fc22ecb87efe86a8fc442e26f443448a2d SHA256 1f8ea7defaafdf7b0a59ca99e41398994f2472b328dd382a0bc9c9dab607ed66 AUX entropy-fetchers-api-fix.patch 714 RMD160 9b237a4ed3fd3eb676ea3e8d5c2f92edb659d037 SHA1 fa59c6794b78fd3a09451aeebfe1ccd9692b6309 SHA256 a15fc186d97c86ef413a42dcc44415e49e54b426fcf37bb2257bfd5556a8be96 AUX entropy-fetchers-zero-div.patch 2722 RMD160 f88c2f41367ce7034d6c95c2b79cb537964c7e41 SHA1 4ec28d3bdf95309f1a599055bc0eaa714272febb SHA256 23f3fdc50cb493d1324d12a40be6e94f06b6b86ee1ef80bc0d00c268b09a8c37 @@ -62,7 +63,7 @@ EBUILD entropy-0.99.49.12-r1.ebuild 2710 RMD160 d99f1e4ff2dc09b962a118edf15f79e6 EBUILD entropy-0.99.49.12.ebuild 2559 RMD160 6039eb80a4588c0becea557114c8dec3fbac874a SHA1 b089e74bec27e1fc89b0493e1a0b77380a94c843 SHA256 6de981c3d8f6c5eba5ae274b778c2a16ecdad3c786904e77861b212267a6535a EBUILD entropy-0.99.49.2.ebuild 2270 RMD160 bc83b5300a59e9482d16b40bea0849c23b62de94 SHA1 d4b8eae83cd3afd97ff3fba1a7f35b230e1a4488 SHA256 6c06b32ec363889afc482f1fdca2e118488bf474b171975998c31e083981274b EBUILD entropy-0.99.49.20.ebuild 2559 RMD160 6039eb80a4588c0becea557114c8dec3fbac874a SHA1 b089e74bec27e1fc89b0493e1a0b77380a94c843 SHA256 6de981c3d8f6c5eba5ae274b778c2a16ecdad3c786904e77861b212267a6535a -EBUILD entropy-0.99.49.21-r6.ebuild 3132 RMD160 855b07616a2cd73a4ad85faa3d553ea129a68d40 SHA1 4b07be6e378844a1af68c4461dcf04a342bc64c1 SHA256 1df6d7d3e6789316c3cc20049eaafc411483f10dd3b20773c1cab23bf8510dfc +EBUILD entropy-0.99.49.21-r7.ebuild 3197 RMD160 48f8e165a793e47097afd0f5f17b7f30dd615ec4 SHA1 fe475e8711eeb4e7bacb261405216cbf58163c80 SHA256 af6aafd6380cba0835bb01defd157956efa36073d5b4c1c8c31a47e8acc60977 EBUILD entropy-0.99.49.21.ebuild 2577 RMD160 9664bc806cc22cb77461114cc08f9060d401d994 SHA1 5b760dcfda0702e866b1d7a62b3bfddcae10d075 SHA256 5792678cdf44ac68701a5156d552d4d2a1d25bb5d751fff2f2024190af2c98d4 EBUILD entropy-0.99.49.3.ebuild 2270 RMD160 bc83b5300a59e9482d16b40bea0849c23b62de94 SHA1 d4b8eae83cd3afd97ff3fba1a7f35b230e1a4488 SHA256 6c06b32ec363889afc482f1fdca2e118488bf474b171975998c31e083981274b EBUILD entropy-0.99.49.4.ebuild 2270 RMD160 bc83b5300a59e9482d16b40bea0849c23b62de94 SHA1 d4b8eae83cd3afd97ff3fba1a7f35b230e1a4488 SHA256 6c06b32ec363889afc482f1fdca2e118488bf474b171975998c31e083981274b diff --git a/sys-apps/entropy/entropy-0.99.49.21-r6.ebuild b/sys-apps/entropy/entropy-0.99.49.21-r7.ebuild similarity index 97% rename from sys-apps/entropy/entropy-0.99.49.21-r6.ebuild rename to sys-apps/entropy/entropy-0.99.49.21-r7.ebuild index 995373a06..c3ce22603 100644 --- a/sys-apps/entropy/entropy-0.99.49.21-r6.ebuild +++ b/sys-apps/entropy/entropy-0.99.49.21-r7.ebuild @@ -45,6 +45,7 @@ src_prepare() { epatch "${FILESDIR}/entropy-spm-fix-worldfile-handling.patch" epatch "${FILESDIR}/entropy-server-commit-asap.patch" epatch "${FILESDIR}/entropy-spm-fix-write_contents.patch" + epatch "${FILESDIR}/entropy-client-remove-debugging-code.patch" cd misc/po && rm POTFILES.in && make POTFILES.in && make update-po } diff --git a/sys-apps/entropy/files/entropy-client-remove-debugging-code.patch b/sys-apps/entropy/files/entropy-client-remove-debugging-code.patch new file mode 100644 index 000000000..dcbd9cfec --- /dev/null +++ b/sys-apps/entropy/files/entropy-client-remove-debugging-code.patch @@ -0,0 +1,20 @@ +commit 3c5d0fb6845eee341ebdf7861b028c6e2c609ae8 +Author: Fabio Erculiani +Date: Mon Sep 6 15:09:10 2010 +0200 + + [entropy.client] remove debugging code + +diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py +index 0754f07..9e5ed2d 100644 +--- a/libraries/entropy/client/interfaces/dep.py ++++ b/libraries/entropy/client/interfaces/dep.py +@@ -402,9 +402,6 @@ class CalculatorsMixin: + unsatisfied = set() + for dependency in dependencies: + +- if dependency == "~x11-drivers/xf86-video-virtualbox-3.2.8": +- import pdb; pdb.set_trace() +- + if dependency in depcache: + # already analized ? + is_unsat = depcache[dependency]