diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog
index e339b1cd7..25085fb23 100644
--- a/sys-apps/calculate-templates/ChangeLog
+++ b/sys-apps/calculate-templates/ChangeLog
@@ -2,11 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*calculate-templates-2.2.8-r1 (23 Jan 2011)
+*calculate-templates-2.2.8-r2 (24 Jan 2011)
 
   23 Jan 2011; Alexander Tratsevskiy <at@calculate.ru>
-  +files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch,
-  +calculate-templates-2.2.8-r1.ebuild:
+  +files/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch,
+  +calculate-templates-2.2.8-r2.ebuild:
   Add patch for use Leafpad in CLDX
 
 *calculate-templates-2.2.8 (20 Jan 2011)
diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest
index b73003eac..df959db67 100644
--- a/sys-apps/calculate-templates/Manifest
+++ b/sys-apps/calculate-templates/Manifest
@@ -1,8 +1,8 @@
 AUX calculate-templates-2.2.3-fix_flash_install.patch 319 RMD160 c365b5a1b038f7f8ce2ba3e0056ffe0071731c2e SHA1 75ed08181e61050ecd79a51a63a5041161d98adb SHA256 0816aaedca262faa724bc034299a89e3009d2cf2ec72bded03b1104f7168910a
 AUX calculate-templates-2.2.3-fix_samsung_templates.patch 7129 RMD160 5708c2079b8269eeb0629b4b1319865950d61963 SHA1 2a25544357be1cc2e3312035ea1449610afd502a SHA256 01fcf0edd39634d0c85510371452e058eb4f94aeb3b4942ef577f1990d198dd5
-AUX calculate-templates-2.2.3-use_leafpad_in_CLDX.patch 4284 RMD160 a13d94464103dfebdcfb8dd9294021acfd39e679 SHA1 8fc5e06749e6407dcdd4f811b49213941efc3ec9 SHA256 d041a39758725533763624f695f6e4a9b1d7073ee1111249885c475d9c1067a5
 AUX calculate-templates-2.2.4-back_port.patch 595008 RMD160 fd94c29940fd079b29bb954485b8802e96010d4d SHA1 9f5bda50d15890367ab82c5ee5731a0510f7964a SHA256 97a4b66e0d7f3caf38fe922f78962f62b5441f1398555e959f682de543d12938
 AUX calculate-templates-2.2.5-assemble-python2.6.patch 445 RMD160 05f2f026180b1e2a01a6118495f7857456a639c6 SHA1 7fc10d3138d318129c5c3b37330a3ea28cafd19d SHA256 102bdf244390e51c473d8acf57a6655812161dc7661f405b53dd9ceb3f15a392
+AUX calculate-templates-2.2.8-use_leafpad_in_CLDX.patch 4285 RMD160 46d6581be82b975bd57286eb2bbeb5f853f15ed6 SHA1 6c5b8ec293af4d58df64bf8d507271f077501f5a SHA256 cb13503900001fab2460fba0dbf4bca8e715961edeb62ef17d174784f887b017
 DIST calculate-templates-2.2.3.tar.bz2 204601 RMD160 4353347ae2fb0f08435b4b432fd211dbafd5c10e SHA1 e891163f165c1657225bbce47fbf05296c7eaedc SHA256 4f56e61dd42d1d642fe953d75eff782dc4e3c53e640a87addd6624f5ee567c63
 DIST calculate-templates-2.2.4.tar.bz2 203885 RMD160 c1189caf3cf9499b5be5e232731f7150fa9b58e7 SHA1 3167a20dd43ef216f46c912fc53f65369fdca9c4 SHA256 27e206675b05ceea965297afecffa5120ee24037cf29cc66d7213671d0fbf63f
 DIST calculate-templates-2.2.5.tar.bz2 218513 RMD160 ed6d5e2ad5a597e39aac030313497f633793f365 SHA1 1ceb5b0cb37724f0d27c9fb3aa8a34a1ab4f6131 SHA256 4f026f06dcf942f7f3b80d3c8be3b8ff3fd19f528d410ecfe71b2a5afd6c329e
@@ -21,8 +21,8 @@ EBUILD calculate-templates-2.2.5-r2.ebuild 696 RMD160 76f6e413019fa14c59370eec5b
 EBUILD calculate-templates-2.2.5-r3.ebuild 696 RMD160 76f6e413019fa14c59370eec5b3ee75d1c6797e9 SHA1 73fdd77eec5684c299c7782a221b447a2800f5f6 SHA256 fafc4ff41e5abd757d18e5b6e3f0b824c02e7c22bd339c8fb82376879e033e27
 EBUILD calculate-templates-2.2.6.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
 EBUILD calculate-templates-2.2.7.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
-EBUILD calculate-templates-2.2.8-r1.ebuild 702 RMD160 0c91f8d0ced915267d1f51bffe70c19181d743a4 SHA1 e19a807105c023ac9e43c6f071909d3b6b5a9fbb SHA256 fd5d6a3a73b56cc38eac926af822d747640af71975bd86f91d47d83b2278425c
+EBUILD calculate-templates-2.2.8-r2.ebuild 702 RMD160 fe73a0ae8a6202e8ae26dee434f4d0594a3bf154 SHA1 d39dca52aaf2c95e62bf7f9712eda33433ae9a07 SHA256 9d20ee8023df3a99b81d84f0eaa5ff7ff0ffc2f204d8f331d77004840d2e0a46
 EBUILD calculate-templates-2.2.8.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
 EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70
-MISC ChangeLog 14097 RMD160 ce241cda5dd77b93c68ffb8f6bf3a0ec32fd45a3 SHA1 549f976ef12986775b216d8bd548fdd5808adff1 SHA256 e84e15ef635cd54bf94d1a2e5cdbceb072a373d07052b5705937b52a03bc3cff
+MISC ChangeLog 14097 RMD160 1ca98b7ff0f3d83dfa8369a19d4a59fe87237428 SHA1 697165050b9a5f9e5cc06bc51c4625ed1f20f24a SHA256 7195b666f46686ae1adfea01a20bff7fcd166382e53b6edcd1b045558ec19739
 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d
diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.8-r2.ebuild
similarity index 90%
rename from sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild
rename to sys-apps/calculate-templates/calculate-templates-2.2.8-r2.ebuild
index 637709b96..bd2917a13 100644
--- a/sys-apps/calculate-templates/calculate-templates-2.2.8-r1.ebuild
+++ b/sys-apps/calculate-templates/calculate-templates-2.2.8-r2.ebuild
@@ -23,7 +23,7 @@ src_unpack() {
 	cd "${S}"
 
 	#Use Leafpad in CLDX
-	epatch "${FILESDIR}/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch"
+	epatch "${FILESDIR}/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch"
 }
 
 src_compile() {
diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch
similarity index 97%
rename from sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch
rename to sys-apps/calculate-templates/files/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch
index 7ee146c52..61c5388da 100644
--- a/sys-apps/calculate-templates/files/calculate-templates-2.2.3-use_leafpad_in_CLDX.patch
+++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch
@@ -56,11 +56,11 @@ index 0000000..35b0f29
 +patch = on
 diff --git a/desktop/desktop/00-patch-2.2.8/kcminputrc b/desktop/desktop/00-patch-2.2.8/kcminputrc
 new file mode 100644
-index 0000000..c710477
+index 0000000..059b0d8
 --- /dev/null
 +++ b/desktop/desktop/00-patch-2.2.8/kcminputrc
 @@ -0,0 +1,8 @@
-+# Calculate format=kde ini(ver.kde)!= path=~/.kde/share/config
++# Calculate format=kde ini(ver.kde)!= path=~/.kde4/share/config
 +[$Version]
 +#для отмены сброса настройки cursorTheme
 +update_info=mouse_cursor_theme.upd:kde3.4.99