Update desktop and lib for new themes.

sys-apps/calculate-desktop/Manifest

@@ -1,8 +1,9 @@
 AUX calculate-desktop-2.2.0.0_rc1-r1.patch 456 RMD160 f4f15ea8be06a9e0d71494f23126be5419f07685 SHA1 79dd0a07fcd6c6ec5330e6afa5dcbf6a9fa3208f SHA256 96fe2e348b986000f6d5b069543417df07af1f83099869e451764d385c6738f6
+AUX calculate-desktop-2.2.1-fix_color.patch 693 RMD160 6c3f01a50a17bd6c1ea6a34967de5420fd2f36c3 SHA1 88024d483c4435abc732b77338904587254b0a07 SHA256 c12e1e314da5383aaebc308c10584a52da46037f27b6e37dd69405e385512b98
 DIST calculate-desktop-2.2.0.0.tar.bz2 15132 RMD160 a1c358bdc47e0fa82695b8841f09e1056a0ae7cc SHA1 a5db6b8ede1b32d8c8ed82a4655df4ab5c7e0ac4 SHA256 6c81d7905c92c5195e40517b8b4b5995061048d5f4c02f5b0369b5dcbfc51b8f
 DIST calculate-desktop-2.2.1.tar.bz2 15309 RMD160 32ca82af42d8534bf10ad366f91c0fca4ac68caf SHA1 a55217e711289e89b90dc8df7889a40efde12da9 SHA256 8e49110eff8e13d629ba4e837e96c4011df806fa6d4eb4aad9b486c2d590d984
 EBUILD calculate-desktop-2.2.0.0.ebuild 870 RMD160 9a678c6353ed35d11dd08a8d340156bb35f72e96 SHA1 562527962fdde2620c45bbbe6af5cdd2dce0c648 SHA256 50646e0e42cd7afda09a0b05208c124652d1f8b3ba81fe8acdbb907c0ab339ed
-EBUILD calculate-desktop-2.2.1.ebuild 868 RMD160 c3e34cc56c780a243b5fb0ac011d14c434ced147 SHA1 be950851f25c70026eb62718c2c587882afee1a6 SHA256 ff66bb59a6e6a1e22f7ac67bac8af1f0ee367dbe092bc44e82bb63b0d1b1334f
+EBUILD calculate-desktop-2.2.1-r1.ebuild 994 RMD160 0786b3f683ba28e5508f391672c21dd9303e39c2 SHA1 5a87d504c748e475b4d31256bcad190dcb58e497 SHA256 8c35c0849905f741724706bf936ae933cd673d30dbc5897bdab11f22e6ac1109
 EBUILD calculate-desktop-2.2.1_rc17.ebuild 1173 RMD160 d2b967173c0fb14a0e379c76de4644c473174221 SHA1 0eee847c528be464164eab6a67cf0ed8782932bd SHA256 0aacfc2ea65a46aa715c97e569689700331b56f98ad4bacad002874fc7d462b8
 EBUILD calculate-desktop-2.2.9999.ebuild 1057 RMD160 3ea64ab7c3c63d250f831e58d076d0dce2d4f809 SHA1 381d8990544497841192c1562cc33a78a1cba461 SHA256 696a9915527447c6b93cfec102ec8738e5f1505f09cf7df8018d1b053b2a963a
 MISC ChangeLog 8712 RMD160 3f0e1fa17a4420fe9bfc54c3182c95106edf8a49 SHA1 2460f24667d8e87522269b3c9ecb29b497f659c5 SHA256 577ae88e90146ff0f7c817319f225484f0ab931a3c48e2aa3faa212323c19f8f

sys-apps/calculate-desktop/calculate-desktop-2.2.1-r1.ebuild

@@ -23,6 +23,14 @@ DEPEND="~sys-apps/calculate-lib-2.2.1
 
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# color fix patch
+	epatch "${FILESDIR}/calculate-desktop-2.2.1-fix_color.patch"
+}
+
 pkg_postinst() {
 	#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
 	einfo "For configure calculate-desktop perform:"

sys-apps/calculate-desktop/files/calculate-desktop-2.2.1-fix_color.patch

@@ -0,0 +1,24 @@
+diff --git a/data/login.d/00init b/data/login.d/00init
+index 876c171..7076476 100644
+--- a/data/login.d/00init
++++ b/data/login.d/00init
+@@ -14,7 +14,7 @@
+ #  limitations under the License.
+ 
+ # set background color
+-xsetroot -solid rgb:17/0b/0a
++xsetroot -solid rgb:30/64/8b
+ 
+ if [[ "`ps axeo command | grep 'xdm/xdm --logout' | grep -v grep | \
+ 	sed -n -r 's/.* USER=([^ ]+) .*/\1/p'`" == "$USER" ]];
+diff --git a/data/logout.d/00init b/data/logout.d/00init
+index b73ae14..52c0006 100644
+--- a/data/logout.d/00init
++++ b/data/logout.d/00init
+@@ -14,5 +14,5 @@
+ #  limitations under the License.
+ 
+ # set background color
+-xsetroot -solid rgb:17/0b/0a
++xsetroot -solid rgb:30/64/8b
+ exit 0

sys-apps/calculate-lib/Manifest

@@ -1,10 +1,11 @@
+AUX calculate-lib-2.2.1-fix_resolution.patch 652 RMD160 bd192bd2d32ddad0f467f698de789de951b50cab SHA1 61150a3489438799568fa90b5693495c398f0aa7 SHA256 6431a0bb302940adf95e45febdabc5de2eebd6af080545941bd0313b5344d515
 AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2
 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
 DIST calculate-lib-2.2.0.0.tar.bz2 97837 RMD160 6bc2c880ceca1a694bcb1010b85325bd926629a4 SHA1 8fc8299aa03c426bf4691fa278dfc9cd81e59b69 SHA256 0d2928cc9767bb24c3e43d0937adc7b290e9c5cef998a2b5cfdfd708ae519b10
 DIST calculate-lib-2.2.1.tar.bz2 105708 RMD160 297d11e2164592520d917ed50fbed7e11ba703e7 SHA1 4db2ff8b775cf3e636ca08782b4b640d307b3edb SHA256 6df14e0f8a0c5c9104d941f096c462dadf71c40e62cb542c8b69a79bc5393b72
 EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a3e9d20526f3078d1f1dc8894a3ac88a090cf968 SHA1 6bc25d2449e5f54df3675311ff5211bc00dcf907 SHA256 764f5b146cc9064de5e1c920ec88b0b91c5fb696c73c853435c7f7750b8bf0db
 EBUILD calculate-lib-2.2.0.0.ebuild 673 RMD160 d001857a4549aa24cdff07c6371de3a8eb497978 SHA1 fae71f1bdd825d51e20066238b5e5f28f08a5877 SHA256 b7827fe65d2a76a93c1542e36db3d01fc95e3ae72db2fbf07a19514aaf9dfe60
-EBUILD calculate-lib-2.2.1.ebuild 657 RMD160 af602b375db98e23c1e64f65c49de347e2f17587 SHA1 aa5f7a2b6e13eeceeea13c0337834e6ed4c12af5 SHA256 288abd77c0079fa3b19ee98505c334164fbe99bce8dfb412d89a8e2c1f6f56c2
+EBUILD calculate-lib-2.2.1-r1.ebuild 790 RMD160 fabd7bde2151bd1f5edfdc050029a9684ead135a SHA1 571c070f96d32299600a9315708cea2dde56e925 SHA256 0df4cfbc10ebf09768d89339eb83137400af6d42bbf5aa27a44dd5f0a4d697df
 EBUILD calculate-lib-2.2.1_rc17.ebuild 843 RMD160 85d844021fbf2b54afa500b885d747c0b352b19a SHA1 bf87891730cad4dc5903cfb610590d1314499fcd SHA256 cf0177dad6de996a0d705e577f05cb666eca47dab7f835dee8caaf204daf1188
 EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf
 EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578

sys-apps/calculate-lib/calculate-lib-2.2.1-r1.ebuild

@@ -22,3 +22,12 @@ DEPEND="~sys-apps/calculate-templates-2.2.1
 	>=dev-python/pyxml-0.8
 	sys-apps/file[python]"
 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# resolution fix patch
+	epatch "${FILESDIR}/calculate-lib-2.2.1-fix_resolution.patch"
+}
+

sys-apps/calculate-lib/files/calculate-lib-2.2.1-fix_resolution.patch

@@ -0,0 +1,20 @@
+diff --git a/i18n/cl_lib_ru.mo b/i18n/cl_lib_ru.mo
+index c6c3102..f57a6af 100644
+Binary files a/i18n/cl_lib_ru.mo and b/i18n/cl_lib_ru.mo differ
+diff --git a/pym/cl_fill.py b/pym/cl_fill.py
+index 35ad6c6..08b61ab 100644
+--- a/pym/cl_fill.py
++++ b/pym/cl_fill.py
+@@ -499,9 +499,11 @@ class fillVars(varsShare):
+             return ""
+         width = int(widthVal)
+         height = int(heightVal)
+-        res = [(1024,768),
++        res = [(1024,600),
++               (1024,768),
+                (1280,1024),
+                (1280,800),
++               (1366,768),
+                (1440,900),
+                (1600,1200),
+                (1680,1050),