Clean up. Remove MANIFEST update since the issue needed to be hacked around in the eclass anyway.

Package-Manager: portage-2.2.1_p5/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 24 insertions, 45 deletions

diff --git a/dev-python/chameleon/ChangeLog b/dev-python/chameleon/ChangeLog
index 66aa6cdfacc0..e446ad30846e 100644
--- a/dev-python/chameleon/ChangeLog
+++ b/dev-python/chameleon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/chameleon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.18 2013/08/17 21:20:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.19 2013/08/26 07:50:04 mgorny Exp $
+
+  26 Aug 2013; Michał Górny <mgorny@gentoo.org> chameleon-2.11-r1.ebuild:
+  Clean up. Remove MANIFEST update since the issue needed to be hacked around in
+  the eclass anyway.
 
 *chameleon-2.11-r1 (17 Aug 2013)
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 7826cdbcc05d..18e467d8b724 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -6,28 +6,28 @@ DIST Chameleon-2.11.tar.gz 157097 SHA256 4bebbc129c84344fff58ad032130ab85f1891b1
 DIST Chameleon-2.8.3.tar.gz 148662 SHA256 273811890999a5fee966298192311cc57f15b594d0fe370009df5d48d3e56a2b SHA512 627470f93c7be844f4dacebf2213cb27c9d5deba1dd49cc244b4df6c0118d2604b395f1b040352de90169841cff862c22b4ae31dd835537906e4a30ad4543b09 WHIRLPOOL 875267f4763e3cdfdb79a11fb045591d88e0453af944ce6b48a9c7573a9697d1b5bf22440612bc93475dc5e0f7ee4f29fa674defa99ead0abb04ffff2db4e7bb
 DIST Chameleon-2.9.2.tar.gz 151036 SHA256 92ff7b6bef0655033005257200d05dfa35a124c5b0b8e0a1ddde339d84668be0 SHA512 120486f72cf3b363fe7fdacd059e969604bb7fe6854ad786aa67afcc5934e86f7fb02259fa4af39f35f305f2259fe575361b9a92791bf2e6952954f0799d1ea8 WHIRLPOOL 891c9b1c64f502b92778e93eb68c7a009b2709aba3e2a00cf52f02b39f99bb4c58c51f27d7f9b538303f1fc19944de591309821a485756c32db67c48ee08a6be
 EBUILD chameleon-2.10.ebuild 1432 SHA256 5576fddbd472f01aae7659767e4f40ab87c6858057dcf506488f2d97d346de63 SHA512 838119d6a42a1d4adaf39e4d53eb54f27f86d68c098062b5db495744fadcdd9efc2a3711f3dfaede156bac90362ef1ca75aabf0da747a922f4f063b529980904 WHIRLPOOL d542cb514f340311195504aa627370c78e0aeb31d63f74609a23cce1063b183e6a856b1cfb2d46d513710301105d60a26a0a813e3d67ab48ffaffaab03ce43cb
-EBUILD chameleon-2.11-r1.ebuild 1719 SHA256 43016a7a491db85d0b0f5bf3c36fa09c858979b816fd7c2694bffc132b0c7c19 SHA512 7b1510381a345c84f06832cfe90b3cf5a7387b0f1f0b8b538647841841baef712e6c8da1754daff889c7c09ddf703eca0d7373ae983ceb527eb39483dba49728 WHIRLPOOL c58ad2f286d483fd5de8aa9328766aa7f3e5056880f80fedc3a8de387a15d7ae4f05795651d51d9aa48237da69f4fd83d920b269f555349094bb8cd3ffd3ac7d
+EBUILD chameleon-2.11-r1.ebuild 1003 SHA256 c0b4b5ea79e774137de2509bd199311c4a5916f78a3bd61d46a72cb66454fc63 SHA512 30646e2ce22e0184544aef48df732a57bc3bcf4db5e1b5e8a38ef7b52d7e7da4f54347dd3437b35686c36bfec3425b93fbd295c51832c6f3bef90f86b9ada317 WHIRLPOOL c2006534969f6ab9d6e0ec263849cb267c3bc59375d6d5cb1a9c5ad6d71016a6d98d8889feeb76661fa928541a2fd526886b50dc6589e463e14614186c4597f8
 EBUILD chameleon-2.11.ebuild 1432 SHA256 802471f27149406b1a7e9e4e8f5760402f55509fb5d0c738e3654ab16b51db74 SHA512 3e8b2a342aa4626aa482ae7008283053a2a319c8a958e22c371a19e595bfeac9ba0d441eb62b6850eb378cf69e6e3ecab2baa1957c6219148c6aaf234c4167bc WHIRLPOOL 44345551b93c38182f7a0c1dfb7b0a6838f37d56655c6a4ff94dad7b51f29522ca2b6cdc95af00db396c914855add8e9b605f57c4b662140816344bbeca4e35c
 EBUILD chameleon-2.8.3-r1.ebuild 1436 SHA256 dc1054b421019db7af9d270a4e97a33e1422cd76b3a5a8e3fb515394066cd3d8 SHA512 a84877bb4553c24964bd9388f1fbea0e777c56538e660e93d88396479da7a93a833c5a2f44c0059b2d126f11dd4861c42eb1d549d2d3b1f6a7d41c4dd81e188b WHIRLPOOL 0ac22300d0a7bbf0168affb3da0d78710f608d76a3f33b2f3c75d59acdabb15fcf2cdc921422dff32da04331b22e14e8b218ea2064c306eb776f11e79fa41243
 EBUILD chameleon-2.9.2.ebuild 1433 SHA256 0eb6b4d2696bf4802dca92ee0449496c5e1a431eb65d4cd0f1d299aa9dbd7a46 SHA512 05c5f8c82d20b441c1c7f9ce44c43e00eb5a6235dbdcb4bb5423d06e92285626080b0b3c79b199c51e2c79b4cdfeb8dacf6f54ed6e172d4c59034a3193d2f2b4 WHIRLPOOL fdf03ea64a22842df7fcd2c65412727ff7306d53913bfd610f23584ff654c21268c9cbdbc1d771c854e1fcef28a9f09cd04c7dc14cb43d51b5994794ea8cb9a4
-MISC ChangeLog 2784 SHA256 e33438757039d8323109cb43cec0a50d925620c408bc84dae5ad438b597a321f SHA512 373571c9d058bc2a52cb960ee2b92fa01706a7d336de0c597a9c3430e26aebea22bd704391ec2c5fa8737c798d4e1e8075bfdb301ffa19467a42da704fb221be WHIRLPOOL acc1fff1d1fb55a11768a1bdea9f9ccd4ba06b755216d7eeff23646a02d17852fc88540377b32a6a2aaa0c5d807537e6801a9539ca5030ae8ab7ff6de7f5a401
+MISC ChangeLog 2963 SHA256 789bcfbc64b9092b15e47dd581a62b484d0bb028b46d27511c8b3c4365828ddf SHA512 0822f0292daa033c61a227e4eff33a2ca51dc3fbd72270a093b67541a296bb8b93fe2d26a4a70bb74725099847c6cf801d4bd84919344a8a3333002e40e209cd WHIRLPOOL be21e8d2a64c276c438eac255c8c574f98e00b80b424bfa8ee27ffde0a908b790cfc59a41561228809038db522fc5d13a42ef5aa0e297eb67ed542c4816c3906
 MISC metadata.xml 232 SHA256 c0cac02ffe32edb941fbfe04c5572a09534a29f17eefc8edb585a873eb061a86 SHA512 04c8fe97873a13e1adbb87e0a45fbbed06fc62a4ed817472da405d146e5302d2c5960ad1ea1d127f5938d552a506452a882fe2e54c6a99f8252caf2e18f1a48a WHIRLPOOL 8d6a77e092bcaac34f13e6a160cd065d78c240a9e22b7e10c5240da869e5580ae625327fa1e40b325a4ff5b073e186a77a878d26097712b636b268e1cc9f4ab4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSD+kpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDKF4QALXo83lSt+elhOUd3Cq2KE1+
-jqoUi4wSBYy2sVellfAEY7YGMSpp6v3Eo5AcVjTFI7o3OMc24K5rkdwFrkvlG/5h
-zeQ0GS4mXcqxmlY8dMgSXpUPiCq0uZ3OdwJ7nLU4Mj0bVr/+K6y8FxblFnfBxBUv
-sdZUFq9aVYQuel6OVGKwdyoAPXwWY4K52+f7t38WGC21i7Y9XWRdXP5EL74QoOSo
-koQONuZbVV0splIP4ANWIAglsUCqHbse0qbmviJYCjexsTxhEavCjcUocpeMpW9x
-tIU4+U/BGpU8F8oSv38ABBjMlsDvc0fGwkH7wo+WVFGvBx/qi8/ZKO55qtKwtUmV
-p2sdELADY4pyY0ABcD1uzlCMjYHOfYe6gBTBhD835phWQC+h45pS02N588IsFvsV
-TztIh8NTpwqT/Vo5WqehbHgcdgf/Pa5hGql5jdKew3Ig1tAjmelc57eIjVN39eI/
-Q2nRXZiGUr6YldZ60MIS94WXo2vsA5Qw0fNIH+4+QFRrecmFhpJUB4Wc8yrhe+HL
-zlTak0bLbEcUfAEIjg9OWLijTZSKC8V6Pr++Ph5cL3gh6f2VSq3d3ll8TgfxS3Ds
-h/udysAyqLMWo+LTc4itMMdKr/fanXi+Hj1FmF+vS63GWJ4GVNzaex/2IC4qUd5e
-6COGohEbM9WEDHyTjC+U
-=cLFU
+iQJ8BAEBCABmBQJSGwi8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOv6QQAKXfpZMdyWUKEuGKraaeaOmq
+bR0rLxewIqtKmKcSd532M5yLzJP44CDLsCIxmzkEcyiC82yA4645G4T2paO9lN0/
+MCPfcStiFp2BinuDQa0R7nTlTzoeYU3WrO0YUhsSeRBjiVU0WmkWxGJ9Dst/4Y4z
+NDnIR/jLvB+ZEweBpeZMPcFOlGcPw7IO3rZRc5asBPT1fWCCcWPjPZuMqtrSiekZ
+zr2yiFIl/11BiS95QhQdKa5qqNzRyn/KNQRlnJQtmsU2umLtG7jwIlvBpn+GMD3e
+zZq5cw71y2GmjhtVz57cEz+/Hoxg7bUfKhZd1TkKCXed6hv3PfFTYd6fu2YHVBYs
+3nHsgJ2acu4uWTBxB6xI0R3vjzuuYEgQ66xgdtCGUCKZiDLkxhIfBIr8H36TiWJG
+QVz27BDezlVc+ReHjn0XnP7Xk1kZkKpEdcpxTWYOm3ddLnob5ufgqeA8iJmPHmdk
+EHRLlbrN71NIIugq9R2ygpxz4nrtZeepBW7wIVNvf2MZ5+VMiPNbQlA8iuOwIYf4
+ZldbAQvAdMML04zJoFAeh6YYn0w2gwXeqVyjjiEG087BYMvajGtwsiPFK9lqgJUe
+rJXRCGlVedrfWuv74m6LJI2FMD/USprSW4RKY9s1md7p4NH3XhULMZlL1YM4ovAc
+w7Bl4FHztACMJT9/4IDJ
+=T2s3
 -----END PGP SIGNATURE-----
diff --git a/dev-python/chameleon/chameleon-2.11-r1.ebuild b/dev-python/chameleon/chameleon-2.11-r1.ebuild
index 516f9d91cb55..58f324717699 100644
--- a/dev-python/chameleon/chameleon-2.11-r1.ebuild
+++ b/dev-python/chameleon/chameleon-2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.11-r1.ebuild,v 1.1 2013/08/17 21:20:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.11-r1.ebuild,v 1.2 2013/08/26 07:50:04 mgorny Exp $
 
 EAPI=5
 
@@ -27,16 +27,6 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-python_prepare_all() {
-	# https://github.com/malthe/chameleon/commit/710e0dba76da2
-	cat > MANIFEST.in <<_EOF_ || die
-recursive-include src/chameleon/tests/inputs *
-recursive-include src/chameleon/tests/outputs *
-_EOF_
-
-	distutils-r1_python_prepare_all
-}
-
 python_compile_all() {
 	use doc && emake html
 }
@@ -49,19 +39,4 @@ python_install_all() {
 	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
 
 	distutils-r1_python_install_all
-
-#	delete_tests_and_incompatible_modules() {
-#		rm -fr "${ED}$(python_get_sitedir)/chameleon/tests"
-#
-#		if [[ "$(python_get_version -l --major)" == "3" ]]; then
-#			rm -f "${ED}$(python_get_sitedir)/chameleon/"{benchmark.py,py25.py}
-#		fi
-#
-#		if [[ $(python_get_version -l) == "2.5" ]]; then
-#			echo "raise SyntaxError" > \
-#				"${ED}$(python_get_sitedir -b)/chameleon/py26.py"
-#		fi
-#	}
-#	python_execute_function -q delete_tests_and_incompatible_modules
-#
 }