Remove workaround now handled in the eclass.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 21 insertions, 28 deletions

diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index 82b388d6f89c..49d61d2bf06c 100644
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/tellico
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.127 2014/06/25 17:24:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.128 2014/07/17 13:11:58 kensington Exp $
+
+  17 Jul 2014; Michael Palimaka <kensington@gentoo.org> tellico-2.3.9.ebuild:
+  Remove workaround now handled in the eclass.
 
 *tellico-2.3.9 (25 Jun 2014)
 
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index af4f9075b2f8..43633ace80e1 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 DIST tellico-2.3.8.tar.bz2 4838958 SHA256 2d8a0d06951e0755c7987d0a07cc8157cd42c8b1c143170042183ff1e89e2ccb SHA512 80fbac2c8a5cbe419220a923980960ff7420104486e4b80ee504acd06c99a14e6e10eb673e7be2490af5980ae1b3e0eaf5f89093cf100a4b9513c18fb5afb3b3 WHIRLPOOL 8d86ff8dbb2c745216dff56f264befe3e2f870cb44683e69c328f57e726479e34bee99deeebd52259351a2fe16be746088bb46b949d8ac80653a604d960bc45f
 DIST tellico-2.3.9.tar.bz2 4855832 SHA256 5184c130ea7561be6e72580105f30d5f160fd2fd5c9ffc7f7e16faf227a20114 SHA512 bb98ec5a0ce016d7a0990260a22ecbb9e74c7ec3e9013a08623b26a3528c52f597d046a8118db356bf000956bae222a1fccdd445a89abbbb731930eddcc51535 WHIRLPOOL 4e083d5ddbb1bf7b33fa1d8fc0b228e9fbc8f5f15797a78530e0713388b5548e7df785b475e1e7a291379653bfb4ce7703c30e1cf2114e1550db47966e06d5c8
 EBUILD tellico-2.3.8.ebuild 1974 SHA256 c2f9d602f6510b289ac7b2cc8f18c246ba300b89ad7eca4d773eec18f40aa368 SHA512 2ec83ec8b163f0f8ec765dfe4df1c2e4ca30991ce818fdb7ba640c8837cf902a6d9977a0e0bdc74384c53805fd575c8ffdda5f44632d3c79971e8124ef8eb721 WHIRLPOOL 84445b7a8ba2c47da4e1a83dfaa4cde9e60c84b6eba7135e9294e6c1d9af2784595e62a1e507aea1f42dcbd86003e5c7e36314679722f8de9d49ac7faf3d823d
-EBUILD tellico-2.3.9.ebuild 2012 SHA256 e430c91fa91fb0a4c2a78e465e64842524657b62c3c94c47dd80eedc502d8616 SHA512 53ff09af49201e766693c5087150d05d40102742c1fffdb08c2d90713a99090d0f843fab1983763229cf68c705cd7c0c0c736153781b11fc2d34a97c9894b7ef WHIRLPOOL 18c24de94092350aa8c86e799148e748510f4e56f36ca6ebf881cafb9b8eb47b2476a4ec17a4c297c651940b6fee82be7c7bf47aeec0dc6abe95972c03f87930
-MISC ChangeLog 15941 SHA256 df00968272a40e53e5eaf181f438941201c18005f4b2582f6e04998ccf764615 SHA512 4e2ce0c318f46a09703c826fd94e3aa83545ce3c2212a58b87e6bdb65881680cf441048e8261a46c7e246123ce9c27c8f02fb3275c6b95361468fc1ffdcd22e0 WHIRLPOOL 845da93f491f9bb647bce990ad2fe3776b69aca4faf15a6cd3a29d54bd4afe217de1d03552c27f6ef5cb1eef7f4beb5b755dfde5b4b022136eb23866fde0e92e
+EBUILD tellico-2.3.9.ebuild 1694 SHA256 0ca24de62e5c967e61d66258921b7b1cdfc280a9f7361f1822c0cb40d88a9fc1 SHA512 e8f7653278c3afad846805272f5be41178c0b564bb6dd55dea6c2eddb2e8dd794352baba4847ce3f9a0cb6691e69a3c12cafc8850d69ddcf5885a14f79800b86 WHIRLPOOL 27638cf0366e3013371a53a8d100e6ca96743cfb6415d57dacdaff0354a9771bf4b0e52d0d2c8a71290652ee795074c3b010cc6d02dfb6f2674f2640dd63469c
+MISC ChangeLog 16067 SHA256 b1dd65d49e79c85422492c34a501ca2274d195e916d10ea001d7691bbcdae5fc SHA512 503e3508eff5a3ef3a90eea14dc32790fbc3754d0c6dd1052fa29f03aa1c37cb2075e22017495c46b31978692480c2bc7748154b4186df04e7165ba76d2d6509 WHIRLPOOL de07ca6982c5bb4d4162768f53616e65da59a440f4f5197083d020ee18ff995987a791772b132e2b6cbb5866607243cac53af64c58ed591cbd9b3ec4efda6370
 MISC metadata.xml 497 SHA256 d97e6f40107c07f33255592d4105a346b321fca57155db4c6b9301af659b7ffc SHA512 cdf6f347bfa04342e61c8d34a844fad33ba226295f887d9a327b78c28a43d058187168a28ccf8c3e8396edb7600d5afdc2107823e325f8ea1d2e88c21928bb87 WHIRLPOOL 25b871ee3270121569ff3e2eabcb4707ff2f15346cbd87cd4fa0f79fd1d592dc152a78d43a41f8723eab7a8a6d3e27a92e1793a362e21685d4ec0918f3d51ea2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJTqwXrRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJTx8ugRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7OgvD/0YqBlzoE6KdkgDIOvdqKw0W+wMgRRaVFjAnJ/iPmyO3IGNFw/YIhWR7Pyz
-+VUVDyybkmPPSuwII8I5285ffYNnABa+xpMmfTOAHrLPdRE971V7/XvW1sdCzRk8
-D6Duxgnh0jiKytXF81RTCbKje4GhRjVUU6ojl5prxmdWQg7M7CPjW3p1u0h6Zg4B
-29Wa8TMzJC12kONqkbwrBaod5IPatODf3TVKQk88ZbrQ9vcWHZ7og6SLMhOkp9/M
-CQpTlJTNCX8BMHnq/9x65fMwJc5b2StrfUX2BxqLLGCZxXIjSSZM+gM1gNTQoPos
-E8rXmeyWvJFaVB6YUKpuCkfT+SjIEwcKvppt8/KUttH4WQOvX40DNfAyvjoirHuy
-uKkEGgS6PsZpc/l0lWMjyQo7iZfeVDm/js6XYoHNfe98E5whoD/PAgQNuti2JVax
-cnU6VoXl05l6mQ2jy+aC2A7hLtsWviBklfRre4nix+jvFEgralesFAa9lBnKNv4L
-R/3WjxK4j4whSyEWodqPfTa4LiBBGxop6CEzR2fGqQ3OvKN+SXM1kRRmMmTL0r8t
-gWJETMPmyE8Q2D24pYMwHMcQPR96ezs4ome4xc7uI+XgKJAggEpINwyh4Mb0HxBC
-VIZONJ5e+I0stt6ee+dcszgqlTqA6S+zGlAetJeXZPOmgFp6KA==
-=Y7DV
+7IyAD/981U+YZJSVwF39cUGPKCi0H9udpfkb6qgSM0HNufuARMVNAuC3rHX1otMU
+tDRjgoGu+/uUBlPkmWjxVEV505b6qySAbTirLWEAg2T4Jf5zUq1E8SorYwpklQD4
+nMmVjMALyBfVZGaj3gX8hk1YEyGhsCChqsAUSN2Ul5h1Pg1w1g/r+4lWTT8V8H78
+i8sEyE5F4Lp1OwnUvuV81kmwWl1GMQ5pGZiOtfvJE/AES47nqufDUCmCfYHKZK2m
+DpXMJs3iGgWUtSp3Ozcdw1cY/6jEWXhpiTtdhFaum6Zio8JBoKKM9NJ9ivCqE5Ct
+HGegqclY1C7AIUdzxLbf9GsznQI0JrTBUC5JcTxaODNmv/zX7mLgBJMlkOC2hpLA
+fCxPdxwiXqNOCNv5VClRbJfXwEh3ChKAUqsasFz7NQmK0hsuP1kOJpP5Gpvk0wnd
+OPBcPhAWLk7UZuhq6hMHITk7xdZQV+WbaNeasVM2OgQnnyZX5rEZMAWB2gsfmJw8
+q/GE7XQ5pvrr68bBSeviLygD29ITpYx9Za0se/VMqLzQF4SODF+GYKJjus+0B/1O
+U2I+DS7wYA6E/0c/M0BIB1QqLI/aY9i2X4TmzZ36rFQNwNcYmHpOikJDR8swQDJM
+IupgewLvgvWxuf9RJIDB9zTFkFy7pwPJQp3pFlFds6FqG2rYeg==
+=p64O
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tellico/tellico-2.3.9.ebuild b/kde-misc/tellico/tellico-2.3.9.ebuild
index 4423de3decf8..626a5fc2f11f 100644
--- a/kde-misc/tellico/tellico-2.3.9.ebuild
+++ b/kde-misc/tellico/tellico-2.3.9.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/kde-misc/tellico/tellico-2.3.9.ebuild,v 1.1 2014/06/25 17:24:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.9.ebuild,v 1.2 2014/07/17 13:11:58 kensington Exp $
 
 EAPI=5
 
@@ -44,16 +44,6 @@ RESTRICT="test"
 
 DOCS=( AUTHORS ChangeLog README )
 
-src_prepare() {
-	# KDE_LINGUAS is also used to install appropriate handbooks
-	# since there is no en_US 'translation', it cannot be added
-	# hence making this impossible to install
-	mv doc/en_US doc/en || die "doc move failed"
-	sed -i -e 's/en_US/en/' doc/CMakeLists.txt || die "sed failed"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable v4l WEBCAM)