From ed602511c4af6dfb1552be3f71a2c5c6e2e53d19 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 8 Sep 2011 18:01:27 +0400 Subject: [PATCH] Update templates. --- sys-apps/calculate-templates/ChangeLog | 7 + sys-apps/calculate-templates/Manifest | 4 +- .../calculate-templates-2.2.23-r3.ebuild | 37 + .../files/calculate-templates-2.2.23-r3.patch | 872 ++++++++++++++++++ sys-apps/calculate-utilities/ChangeLog | 6 + sys-apps/calculate-utilities/Manifest | 3 +- .../calculate-utilities-2.2.23-r6.ebuild | 36 + 7 files changed, 963 insertions(+), 2 deletions(-) create mode 100644 sys-apps/calculate-templates/calculate-templates-2.2.23-r3.ebuild create mode 100644 sys-apps/calculate-templates/files/calculate-templates-2.2.23-r3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-2.2.23-r6.ebuild diff --git a/sys-apps/calculate-templates/ChangeLog b/sys-apps/calculate-templates/ChangeLog index 1eaa6d612..a47524750 100644 --- a/sys-apps/calculate-templates/ChangeLog +++ b/sys-apps/calculate-templates/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-templates-2.2.23-r3 (08 Sep 2011) + + 08 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-templates-2.2.23-r3.ebuild, + +files/calculate-templates-2.2.23-r3.patch: + Update for feature + *calculate-templates-2.2.23-r2 (06 Sep 2011) 06 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-templates/Manifest b/sys-apps/calculate-templates/Manifest index cdfffbbea..9dec216b4 100644 --- a/sys-apps/calculate-templates/Manifest +++ b/sys-apps/calculate-templates/Manifest @@ -13,6 +13,7 @@ AUX calculate-templates-2.2.22-r1.patch 1001 RMD160 84681dfcf97292c962995e8171b5 AUX calculate-templates-2.2.22-r2.patch 26325 RMD160 16cedf1b883e122382681d5968d867f749b911c9 SHA1 184bccd9da9d0b6ff59106eeb40d01c5e5bf0468 SHA256 01c91d55b87170a1febdb6a147896424d1c4afac932ef302ec5e762e648a425e AUX calculate-templates-2.2.23-r1.patch 355 RMD160 542c930c91be186dbea77edaf0c889d244c0d62e SHA1 008741a06ecdf0a079b704e81e2fd2ce8fff7e4b SHA256 2b972fc7f4e02a1ea48eab0c61591516a9592d9d2eeb90361632f297b338431f AUX calculate-templates-2.2.23-r2.patch 1968 RMD160 e0265a6da151e64a91c9c3c0f4003637b818b52f SHA1 9ef7c9899109c46c0987017e61ea844bc3819873 SHA256 3c07f4c5534cf03b48a21be39b1d4a6b00fe731e7e2b8eb8b8e8255da4bd287a +AUX calculate-templates-2.2.23-r3.patch 36717 RMD160 7a3bbfac4c9fc3c84c4f2cc4a4af05091d9fadf3 SHA1 65d89c9b0dca3bcb856dbc9bd44fb58c68565761 SHA256 d82dc73323106a242a270c83ab0b5be0df583c8e3ad065253766a6fac7b88026 DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984 DIST calculate-templates-2.2.19.tar.bz2 233495 RMD160 bd6ec2efa456b838c15664e7779d01cd760cb124 SHA1 c0f79506fb676a8c37efbdff4a0514a3a8ddb29e SHA256 f5124a64393a3c6d4a03bd3c0065cc7f5a3586f6d5de5362d1b373048b2303ab DIST calculate-templates-2.2.20.tar.bz2 234266 RMD160 7368253076289f8e255ae325e629ffe73da060ec SHA1 b39b75801f8361a36eb6e8ce92da63dfef5230ca SHA256 b907b4630aca4942af66ffe24144959723879d25f4ce72e344639f86223b828a @@ -40,7 +41,8 @@ EBUILD calculate-templates-2.2.22-r2.ebuild 740 RMD160 9fda92b6fff58b820767a7db3 EBUILD calculate-templates-2.2.22.ebuild 581 RMD160 1cba8f7d4582bf790b2da63e98e1e0efe564c0bd SHA1 10d710aadae8bb9e8df406339d348428a835d098 SHA256 2aeed6089507412176e069d5190717bd618830cdd2c740ae39a50a0f6b283d4e EBUILD calculate-templates-2.2.23-r1.ebuild 708 RMD160 a79fc5bd6ed64800c56e983dd9da45e09bc8e797 SHA1 3b320ce2e5c8e0b17e1c452defa86bb10f2a7dec SHA256 2072d300dcc1e534e07246812ca51824214b21f28e5d39e1fac68c28c1b3bb50 EBUILD calculate-templates-2.2.23-r2.ebuild 711 RMD160 a5475e0624b9d7cf20186dc29a4d00886bfa160c SHA1 5896c88f5b4cfae8c8009b39e35c32294b7f170e SHA256 dc4f242a517bdc73b8ca8fae2393c846dec80301efb7a5263608a0c71d5d0706 +EBUILD calculate-templates-2.2.23-r3.ebuild 737 RMD160 8c0fa8054ea68237f5d771497132a2ce70755a6b SHA1 8fe9e8be5becb243e4654e2cc0a553c4fbf6dd2d SHA256 fe6417626baf776123faac7b5189efab3fe5db66347f38983bf343f0abba1713 EBUILD calculate-templates-2.2.23.ebuild 583 RMD160 a7354d64c92e7e7668f3d14de0ad6e8b29842795 SHA1 d70032a967d562caa0c41282bc28207fdf106f09 SHA256 6fc8a45fdd8bd8c4c1f597037c6122f1493f78d839bf4ed74c0152fc4bcc8b2d EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f -MISC ChangeLog 30000 RMD160 667bd9ddba1620969c3d48696539ac86c7feeb8a SHA1 4a0d2ab93741863de8b2f1f51f9611e7b6cc7442 SHA256 3ba3080eeaa5aca3fb9ddae63872a8533d6d683b11258ba20fb7fa36e4a24dc9 +MISC ChangeLog 30215 RMD160 150f02e2de7f1ba7e81601f98c1307b4142d9d0b SHA1 3969c2337180fb92410d3bd85c59ceba1364a87f SHA256 8552d55f686dac753d535ccbcad180341275bd08311d0389d7bc464e6a7dd321 MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d diff --git a/sys-apps/calculate-templates/calculate-templates-2.2.23-r3.ebuild b/sys-apps/calculate-templates/calculate-templates-2.2.23-r3.ebuild new file mode 100644 index 000000000..12ec0d6c2 --- /dev/null +++ b/sys-apps/calculate-templates/calculate-templates-2.2.23-r3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit eutils + +SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="Templates for calculate utilities 2.2" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND="~sys-apps/calculate-lib-2.2.23" + +RDEPEND="${DEPEND}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # fix gimp configuration, add adblock for chromium + epatch "${FILESDIR}/calculate-templates-2.2.23-r3.patch" +} + +src_compile() { + : +} + +src_install() { + dodir /usr/share/calculate/templates + insinto /usr/share/calculate/templates + doins -r * +} diff --git a/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r3.patch b/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r3.patch new file mode 100644 index 000000000..cea747932 --- /dev/null +++ b/sys-apps/calculate-templates/files/calculate-templates-2.2.23-r3.patch @@ -0,0 +1,872 @@ +diff --git builder/squash/etc/init.d/calculate builder/squash/etc/init.d/calculate +new file mode 100644 +index 0000000..35c0c98 +--- /dev/null ++++ builder/squash/etc/init.d/calculate +@@ -0,0 +1,3 @@ ++# Calculate format=patch cl_builder_live_set==off ++LANG=C /usr/bin/cl-install --startup --live ++LANG=C /usr/bin/cl-install --startup +diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +index 150bd84..0a2655a 100644 +--- desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals ++++ desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals +@@ -5,7 +5,7 @@ emoticonsTheme=KMess-Cartoon + + #Fonts + [General] +-BrowserApplication[$e]=file:///usr/share/applications/calculate-browser.desktop ++BrowserApplication[$e]=calculate-browser.desktop + XftHintStyle=hintmedium + #?pkg(media-fonts/droid)!=# + desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0 +diff --git desktop/desktop/40-xfce-4.8-always/.config/xfce4/desktop/icons.screen0.rc desktop/desktop/40-xfce-4.8-always/.config/xfce4/desktop/icons.screen0.rc +index be2a74e..0108a26 100644 +--- desktop/desktop/40-xfce-4.8-always/.config/xfce4/desktop/icons.screen0.rc ++++ desktop/desktop/40-xfce-4.8-always/.config/xfce4/desktop/icons.screen0.rc +@@ -26,15 +26,15 @@ col=1 + + #env# + #?env(client.os_remote_auth)!=&&ur_domain_set==on# +-[Home.desktop] ++[Home] + row=0 + col=0 + +-[Share.desktop] ++[Share] + row=0 + col=1 + +-[FTP.desktop] ++[FTP] + row=0 + col=2 + #env# +diff --git desktop/desktop/60-chromium-5.0/.calculate/ini.env desktop/desktop/60-chromium-5.0/.calculate/ini.env +deleted file mode 100644 +index 5908f2a..0000000 +--- desktop/desktop/60-chromium-5.0/.calculate/ini.env ++++ /dev/null +@@ -1,7 +0,0 @@ +-# Calculate format=samba +- +-[ver] +-chromium = 5.0 +- +-[update] +-chromium = on +diff --git desktop/desktop/60-chromium-5.0/.calculate_directory desktop/desktop/60-chromium-5.0/.calculate_directory +deleted file mode 100644 +index 8af9047..0000000 +--- desktop/desktop/60-chromium-5.0/.calculate_directory ++++ /dev/null +@@ -1 +0,0 @@ +-# Calculate append=skip belong(chromium)!=&&exists(~/.config/chromium)==&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg(www-client/chromium)>=5.0 +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.en desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.en +deleted file mode 100644 +index ea21e90..0000000 +--- desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.en ++++ /dev/null +@@ -1,68 +0,0 @@ +-# Calculate os_locale_language!=ru name=Bookmarks +-{ +- "roots": { +- "bookmark_bar": { +- "children": [{ +- "name": "Home", +- "type": "url", +- "url": "http://www.calculate-linux.org" +- }, +- { +- "name": "Docs", +- "type": "url", +- "url": "http://www.calculate-linux.org/main/en" +- }, +- { +- "name": "Forums", +- "type": "url", +- "url": "http://www.calculate-linux.org/projects/en/boards" +- }, +- { +- "name": "Lists", +- "type": "url", +- "url": "http://www.calculate-linux.org/main/en/maillist" +- }, +- { +- "name": "Bugs", +- "type": "url", +- "url": "http://www.calculate-linux.org/projects/calculatelinux/issues" +- }, +- { +- "name": "Blogs", +- "type": "url", +- "url": "http://www.calculate-linux.org/blogs/en" +- }], +- "type": "folder" +- }, +- "other": { +- "children": [ +- { +- "name": "Calculate Linux | Facebook", +- "type": "url", +- "url": "http://www.facebook.com/group.php?gid=97309000613" +- }, +- { +- "name": "Calculate - LinuxQuestions.org", +- "type": "url", +- "url": "http://www.linuxquestions.org/questions/calculate-89/" +- }, +- { +- "name": "DistroWatch.com", +- "type": "url", +- "url": "http://distrowatch.com/" +- }, +- { +- "name": "Gentoo Linux", +- "type": "url", +- "url": "http://www.gentoo.org/" +- }, +- { +- "name": "LinuxTracker", +- "type": "url", +- "url": "http://linuxtracker.org/" +- }], +- "type": "folder" +- } +- }, +- "version": 1 +-} +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.ru desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.ru +deleted file mode 100644 +index 9b94ce2..0000000 +--- desktop/desktop/60-chromium-5.0/.config/chromium/Default/Bookmarks.ru ++++ /dev/null +@@ -1,63 +0,0 @@ +-# Calculate os_locale_language==ru name=Bookmarks +-{ +- "roots": { +- "bookmark_bar": { +- "children": [{ +- "name": "Домашняя", +- "type": "url", +- "url": "http://www.calculate-linux.ru" +- }, +- { +- "name": "Документация", +- "type": "url", +- "url": "http://www.calculate-linux.ru/main/ru" +- }, +- { +- "name": "Форумы", +- "type": "url", +- "url": "http://www.calculate-linux.ru/projects/ru/boards" +- }, +- { +- "name": "Рассылка", +- "type": "url", +- "url": "http://www.calculate-linux.ru/main/ru/maillist" +- }, +- { +- "name": "Ошибки", +- "type": "url", +- "url": "http://www.calculate-linux.ru/projects/calculatelinux/issues" +- }, +- { +- "name": "Блоги", +- "type": "url", +- "url": "http://www.calculate-linux.ru/blogs/ru" +- }], +- "type": "folder" +- }, +- "other": { +- "children": [ +- { +- "name": "DistroWatch.com", +- "type": "url", +- "url": "http://distrowatch.com/" +- }, +- { +- "name": "Gentoo Linux", +- "type": "url", +- "url": "http://www.gentoo.ru/" +- }, +- { +- "name": "Lunuxoid", +- "type": "url", +- "url": "http://tux.in.ua" +- }, +- { +- "name": "В Контакте | Calculate Linux", +- "type": "url", +- "url": "http://vkontakte.ru/club10221243" +- }], +- "type": "folder" +- } +- }, +- "version": 1 +-} +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak +deleted file mode 100644 +index 179d05f..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA +deleted file mode 100644 +index e58e2d2..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA +deleted file mode 100644 +index c0e1abc..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA +deleted file mode 100644 +index 74e359a..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA +deleted file mode 100644 +index 7b191b6..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json +deleted file mode 100644 +index be93954..0000000 +--- desktop/desktop/60-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json ++++ /dev/null +@@ -1,32 +0,0 @@ +-{ +- "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", +- "name": "Minimal", +- "theme": { +- "colors": { +- "bookmark_text": [ 149, 149, 149 ], +- "frame": [ 255, 255, 255 ], +- "ntp_background": [ 255, 255, 255 ], +- "ntp_link": [ 170, 170, 170 ], +- "ntp_section": [ 235, 235, 235, 1 ], +- "ntp_section_link": [ 149, 149, 149 ], +- "ntp_section_text": [ 149, 149, 149 ], +- "ntp_text": [ 149, 149, 149 ], +- "tab_background_text": [ 149, 149, 149 ], +- "tab_text": [ 149, 149, 149 ], +- "toolbar": [ 255, 255, 255 ] +- }, +- "images": { +- "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", +- "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", +- "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", +- "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" +- }, +- "properties": { +- +- }, +- "tints": { +- "buttons": [ 0.001, 0, 0.706 ] +- } +- }, +- "version": "1.0" +-} +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/History desktop/desktop/60-chromium-5.0/.config/chromium/Default/History +deleted file mode 100644 +index b667cdd..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/History and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Preferences desktop/desktop/60-chromium-5.0/.config/chromium/Default/Preferences +deleted file mode 100644 +index 0b0ee65..0000000 +--- desktop/desktop/60-chromium-5.0/.config/chromium/Default/Preferences ++++ /dev/null +@@ -1,162 +0,0 @@ +-{ +- "alternate_error_pages": { +- "enabled": true +- }, +- "autofill": { +- "auxiliary_profiles_enabled": false, +- "default_profile": "", +- "enabled": true, +- "infobar_shown": true +- }, +- "bookmark_bar": { +- "show_on_all_tabs": true +- }, +- "browser": { +- "check_default_browser": false, +- "clear_data": { +- "browsing_history": true, +- "cache": true, +- "cookies": true, +- "download_history": true, +- "form_data": true, +- "passwords": false, +- "time_period": 0 +- }, +- "custom_chrome_frame": false, +- "enable_spellchecking": true, +- "ntp": { +- "promo_image_remaining": -79, +- "promo_line_remaining": -79 +- }, +- "show_home_button": true +- }, +- "content_settings_window": { +- "last_tab_index": 4 +- }, +- "countryid_at_install": 21077, +- "default_search_provider": { +- "id": "2", +- "name": "Google", +- "prepopulate_id": "1", +- "search_url": "{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}&q={searchTerms}", +- "suggest_url": "{google:baseSuggestURL}search?client=chrome&hl={language}&q={searchTerms}" +- }, +- "devtools": { +- "open_docked": false +- }, +- "dns_prefetching": { +- "enabled": true +- }, +- "download": { +- "directory_upgrade": true, +- "extensions_to_open": "", +- "prompt_for_download": false +- }, +- "extensions": { +- "autoupdate": { +- "last_check": "12918142274298271", +- "next_check": "12918215676716661" +- }, +- "blacklistupdate": { +- "lastpingday": "12918121200665425" +- }, +- "chrome_url_overrides": { +- "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ] +- }, +- "settings": { +- "hnfhcmjkebafbfikmbkhdpbmfpfjgiog": { +- "lastpingday": "12918121199767875", +- "location": 1, +- "manifest": { +- "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", +- "name": "Minimal", +- "theme": { +- "colors": { +- "bookmark_text": [ 149, 149, 149 ], +- "frame": [ 255, 255, 255 ], +- "ntp_background": [ 255, 255, 255 ], +- "ntp_link": [ 170, 170, 170 ], +- "ntp_section": [ 235, 235, 235, 1 ], +- "ntp_section_link": [ 149, 149, 149 ], +- "ntp_section_text": [ 149, 149, 149 ], +- "ntp_text": [ 149, 149, 149 ], +- "tab_background_text": [ 149, 149, 149 ], +- "tab_text": [ 149, 149, 149 ], +- "toolbar": [ 255, 255, 255 ] +- }, +- "images": { +- "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", +- "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", +- "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", +- "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" +- }, +- "tints": { +- "buttons": [ 0.001, 0, 0.706 ] +- } +- }, +- "version": "1.0" +- }, +- "path": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0", +- "state": 1 +- } +- }, +- "theme": { +- "id": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog", +- "pack": "/home/#-ur_login-#/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak", +- "use_system": false +- }, +- "toolbarsize": -1, +- "ui": { +- "developer_mode": true +- } +- }, +- "geolocation": { +- "default_content_setting": 3 +- }, +-#?os_locale_language==ru# +- "homepage": "http://www.calculate-linux.ru/", +-#os_locale_language# +-#?os_locale_language!=ru# +- "homepage": "http://www.calculate-linux.org/", +-#os_locale_language# +- "homepage_is_newtabpage": false, +- "profile": { +- "block_third_party_cookies": false, +- "clear_site_data_on_exit": false, +- "content_settings": { +- "pref_version": 1 +- }, +- "exited_cleanly": true, +- "password_manager_enabled": true, +- "per_host_zoom_levels": { +- "www.computerra.ru": 1 +- } +- }, +- "safebrowsing": { +- "enabled": true +- }, +- "search": { +- "suggest_enabled": true +- }, +- "session": { +- "restore_on_startup": 0 +- }, +- "sync": { +- "autofill": true, +- "bookmarks": true, +- "has_setup_completed": true, +- "last_synced_time": "12918205902976887", +- "preferences": true, +- "themes": true +- }, +- "translate": { +- "enabled": true +- }, +- "translate_language_blacklist": [ "en" ], +- "webkit": { +- "webprefs": { +- "inspector_settings": "lastActivePanel:string:scripts\n", +- "uses_universal_detector": false +- } +- } +-} +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/Default/Thumbnails desktop/desktop/60-chromium-5.0/.config/chromium/Default/Thumbnails +deleted file mode 100644 +index 2cb2b4a..0000000 +Binary files desktop/desktop/60-chromium-5.0/.config/chromium/Default/Thumbnails and /dev/null differ +diff --git desktop/desktop/60-chromium-5.0/.config/chromium/First Run desktop/desktop/60-chromium-5.0/.config/chromium/First Run +deleted file mode 100644 +index 8b3bbff..0000000 +--- desktop/desktop/60-chromium-5.0/.config/chromium/First Run ++++ /dev/null +@@ -1,2 +0,0 @@ +-# Calculate exists(~/.mozilla)== +-# will not migrate if Firefox had not run +\ No newline at end of file +diff --git desktop/desktop/60-chromium-6.0/.calculate/ini.env desktop/desktop/60-chromium-6.0/.calculate/ini.env +new file mode 100644 +index 0000000..3a94e61 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.calculate/ini.env +@@ -0,0 +1,7 @@ ++# Calculate format=samba ++ ++[ver] ++chromium = 6.0 ++ ++[update] ++chromium = on +diff --git desktop/desktop/60-chromium-6.0/.calculate_directory desktop/desktop/60-chromium-6.0/.calculate_directory +new file mode 100644 +index 0000000..45adab3 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.calculate_directory +@@ -0,0 +1 @@ ++# Calculate append=skip belong(chromium)!=&&exists(~/.config/chromium)==&&ini(update.chromium)!=off&&ini(ver.chromium)==&&pkg(www-client/chromium)>=6.0 +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.en desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.en +new file mode 100644 +index 0000000..ea21e90 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.en +@@ -0,0 +1,68 @@ ++# Calculate os_locale_language!=ru name=Bookmarks ++{ ++ "roots": { ++ "bookmark_bar": { ++ "children": [{ ++ "name": "Home", ++ "type": "url", ++ "url": "http://www.calculate-linux.org" ++ }, ++ { ++ "name": "Docs", ++ "type": "url", ++ "url": "http://www.calculate-linux.org/main/en" ++ }, ++ { ++ "name": "Forums", ++ "type": "url", ++ "url": "http://www.calculate-linux.org/projects/en/boards" ++ }, ++ { ++ "name": "Lists", ++ "type": "url", ++ "url": "http://www.calculate-linux.org/main/en/maillist" ++ }, ++ { ++ "name": "Bugs", ++ "type": "url", ++ "url": "http://www.calculate-linux.org/projects/calculatelinux/issues" ++ }, ++ { ++ "name": "Blogs", ++ "type": "url", ++ "url": "http://www.calculate-linux.org/blogs/en" ++ }], ++ "type": "folder" ++ }, ++ "other": { ++ "children": [ ++ { ++ "name": "Calculate Linux | Facebook", ++ "type": "url", ++ "url": "http://www.facebook.com/group.php?gid=97309000613" ++ }, ++ { ++ "name": "Calculate - LinuxQuestions.org", ++ "type": "url", ++ "url": "http://www.linuxquestions.org/questions/calculate-89/" ++ }, ++ { ++ "name": "DistroWatch.com", ++ "type": "url", ++ "url": "http://distrowatch.com/" ++ }, ++ { ++ "name": "Gentoo Linux", ++ "type": "url", ++ "url": "http://www.gentoo.org/" ++ }, ++ { ++ "name": "LinuxTracker", ++ "type": "url", ++ "url": "http://linuxtracker.org/" ++ }], ++ "type": "folder" ++ } ++ }, ++ "version": 1 ++} +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.ru desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.ru +new file mode 100644 +index 0000000..9b94ce2 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Bookmarks.ru +@@ -0,0 +1,63 @@ ++# Calculate os_locale_language==ru name=Bookmarks ++{ ++ "roots": { ++ "bookmark_bar": { ++ "children": [{ ++ "name": "Домашняя", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru" ++ }, ++ { ++ "name": "Документация", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru/main/ru" ++ }, ++ { ++ "name": "Форумы", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru/projects/ru/boards" ++ }, ++ { ++ "name": "Рассылка", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru/main/ru/maillist" ++ }, ++ { ++ "name": "Ошибки", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru/projects/calculatelinux/issues" ++ }, ++ { ++ "name": "Блоги", ++ "type": "url", ++ "url": "http://www.calculate-linux.ru/blogs/ru" ++ }], ++ "type": "folder" ++ }, ++ "other": { ++ "children": [ ++ { ++ "name": "DistroWatch.com", ++ "type": "url", ++ "url": "http://distrowatch.com/" ++ }, ++ { ++ "name": "Gentoo Linux", ++ "type": "url", ++ "url": "http://www.gentoo.ru/" ++ }, ++ { ++ "name": "Lunuxoid", ++ "type": "url", ++ "url": "http://tux.in.ua" ++ }, ++ { ++ "name": "В Контакте | Calculate Linux", ++ "type": "url", ++ "url": "http://vkontakte.ru/club10221243" ++ }], ++ "type": "folder" ++ } ++ }, ++ "version": 1 ++} +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh +new file mode 100644 +index 0000000..077edd2 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/adblock-install.sh +@@ -0,0 +1,4 @@ ++# Calculate path=/tmp pkg(www-apps/chromium-adblock)!= exec=/bin/bash ++ ++cp -r /usr/share/chromium-adblock/gighmmpiobklfepjocnamgkkbiglidom #-ur_home_path-#/.config/chromium/Default/Extensions/ ++exit 0 +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak +new file mode 100644 +index 0000000..179d05f +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA +new file mode 100644 +index 0000000..e58e2d2 +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA +new file mode 100644 +index 0000000..c0e1abc +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA +new file mode 100644 +index 0000000..74e359a +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA +new file mode 100644 +index 0000000..7b191b6 +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json +new file mode 100644 +index 0000000..be93954 +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json +@@ -0,0 +1,32 @@ ++{ ++ "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", ++ "name": "Minimal", ++ "theme": { ++ "colors": { ++ "bookmark_text": [ 149, 149, 149 ], ++ "frame": [ 255, 255, 255 ], ++ "ntp_background": [ 255, 255, 255 ], ++ "ntp_link": [ 170, 170, 170 ], ++ "ntp_section": [ 235, 235, 235, 1 ], ++ "ntp_section_link": [ 149, 149, 149 ], ++ "ntp_section_text": [ 149, 149, 149 ], ++ "ntp_text": [ 149, 149, 149 ], ++ "tab_background_text": [ 149, 149, 149 ], ++ "tab_text": [ 149, 149, 149 ], ++ "toolbar": [ 255, 255, 255 ] ++ }, ++ "images": { ++ "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", ++ "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", ++ "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", ++ "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" ++ }, ++ "properties": { ++ ++ }, ++ "tints": { ++ "buttons": [ 0.001, 0, 0.706 ] ++ } ++ }, ++ "version": "1.0" ++} +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/History desktop/desktop/60-chromium-6.0/.config/chromium/Default/History +new file mode 100644 +index 0000000..b667cdd +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/History differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage desktop/desktop/60-chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage +new file mode 100644 +index 0000000..944f58f +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Local Storage/chrome-extension_gighmmpiobklfepjocnamgkkbiglidom_0.localstorage differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Preferences desktop/desktop/60-chromium-6.0/.config/chromium/Default/Preferences +new file mode 100644 +index 0000000..f018d5d +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/Default/Preferences +@@ -0,0 +1,123 @@ ++{ ++ "bookmark_bar": { ++ "show_on_all_tabs": true ++ }, ++ "browser": { ++ "check_default_browser": false, ++ "enable_spellchecking": true, ++ "show_home_button": true ++ }, ++ "extensions": { ++ "chrome_url_overrides": { ++ "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ] ++ }, ++ "settings": { ++ "hnfhcmjkebafbfikmbkhdpbmfpfjgiog": { ++ "location": 1, ++ "manifest": { ++ "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", ++ "name": "Minimal", ++ "theme": { ++ "colors": { ++ "bookmark_text": [ 149, 149, 149 ], ++ "frame": [ 255, 255, 255 ], ++ "ntp_background": [ 255, 255, 255 ], ++ "ntp_link": [ 170, 170, 170 ], ++ "ntp_section": [ 235, 235, 235, 1 ], ++ "ntp_section_link": [ 149, 149, 149 ], ++ "ntp_section_text": [ 149, 149, 149 ], ++ "ntp_text": [ 149, 149, 149 ], ++ "tab_background_text": [ 149, 149, 149 ], ++ "tab_text": [ 149, 149, 149 ], ++ "toolbar": [ 255, 255, 255 ] ++ }, ++ "images": { ++ "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", ++ "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", ++ "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", ++ "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" ++ }, ++ "tints": { ++ "buttons": [ 0.001, 0, 0.706 ] ++ } ++ }, ++ "version": "1.0" ++ }, ++ "path": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0", ++ "state": 1 ++#?pkg(www-apps/chromium-adblock)!=# ++ }, ++ "gighmmpiobklfepjocnamgkkbiglidom": { ++ "allowFileAccess": true, ++ "app_launcher_index": 0, ++ "granted_permissions": { ++ "api": [ "contextMenus", "tabs" ], ++ "full": false, ++ "host": [ "*://*.hk-pub.com/forum/thread-*", "*://*.mail.live.com/*", "*://*.youtube.com/*", "http://*/*", "https://*/*" ] ++ }, ++ "install_time": "12959953182540259", ++ "location": 1, ++ "manifest": { ++ "background_page": "background.html", ++ "browser_action": { ++ "default_icon": "img/icon19.png", ++ "default_title": "\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B AdBlock", ++ "popup": "button/popup.html" ++ }, ++ "content_scripts": [ { ++ "all_frames": true, ++ "js": [ "port.js", "jquery/jquery.min.js", "functions.js", "filtering/filteroptions.js", "filtering/filtertypes.js", "filtering/filterset.js", "adblock_start.js" ], ++ "matches": [ "http://*/*", "https://*/*" ], ++ "run_at": "document_start" ++ }, { ++ "all_frames": true, ++ "js": [ "bandaids.js" ], ++ "matches": [ "*://*.mail.live.com/*", "*://*.hk-pub.com/forum/thread-*", "*://*.youtube.com/*" ], ++ "run_at": "document_end" ++ }, { ++ "all_frames": true, ++ "js": [ "adblock.js" ], ++ "matches": [ "http://*/*", "https://*/*" ], ++ "run_at": "document_end" ++ }, { ++ "all_frames": false, ++ "js": [ "uiscripts/blacklisting/rightclick_hook.js" ], ++ "matches": [ "http://*/*", "https://*/*" ], ++ "run_at": "document_end" ++ } ], ++ "current_locale": "ru", ++ "default_locale": "en", ++ "description": "\u041D\u0430\u0438\u0431\u043E\u043B\u0435\u0435 \u043F\u043E\u043F\u0443\u043B\u044F\u0440\u043D\u043E\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0435 Chrome \u0441 \u0431\u043E\u043B\u0435\u0435 \u0447\u0435\u043C 2 \u043C\u0438\u043B\u043B\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439! \u0411\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0440\u0435\u043A\u043B\u0430\u043C\u0443 \u043F\u043E \u0432\u0441\u0435\u043C\u0443 \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0443.", ++ "icons": { ++ "128": "img/icon128.png", ++ "16": "img/icon16.png", ++ "48": "img/icon48.png" ++ }, ++ "incognito": "spanning", ++ "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZWWNkerYNFB0SIg87WwcrcniMYkCqxLz4OB3CLNoogUUsHN+Rk9vRB7o3Jjc4shlz2LBvAbtPbrGkU+NK9Hc3ubVydzpnoRDEl1RKz3GhqKFkECvTyAxrsKainXH+4Ni2+K7bg1U0tLoQMPJ9f3ieYLIwXeHh9+lYXQi6soq0pwIDAQAB", ++ "minimum_chrome_version": "6", ++ "name": "AdBlock", ++ "options_page": "options/index.html", ++ "permissions": [ "http://*/*", "https://*/*", "contextMenus", "tabs" ], ++ "update_url": "http://clients2.google.com/service/update2/crx", ++ "version": "2.4.27" ++ }, ++ "path": "gighmmpiobklfepjocnamgkkbiglidom/2.4.27_0", ++ "state": 1 ++#pkg# ++ } ++ }, ++ "theme": { ++ "id": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog", ++ "pack": "/home/#-ur_login-#/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak", ++ "use_system": false ++ } ++ }, ++#?os_locale_language==ru# ++ "homepage": "http://www.calculate-linux.ru/", ++#os_locale_language# ++#?os_locale_language!=ru# ++ "homepage": "http://www.calculate-linux.org/", ++#os_locale_language# ++ "homepage_is_newtabpage": false ++} +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/Default/Thumbnails desktop/desktop/60-chromium-6.0/.config/chromium/Default/Thumbnails +new file mode 100644 +index 0000000..2cb2b4a +Binary files /dev/null and desktop/desktop/60-chromium-6.0/.config/chromium/Default/Thumbnails differ +diff --git desktop/desktop/60-chromium-6.0/.config/chromium/First Run desktop/desktop/60-chromium-6.0/.config/chromium/First Run +new file mode 100644 +index 0000000..8b3bbff +--- /dev/null ++++ desktop/desktop/60-chromium-6.0/.config/chromium/First Run +@@ -0,0 +1,2 @@ ++# Calculate exists(~/.mozilla)== ++# will not migrate if Firefox had not run +\ No newline at end of file +diff --git desktop/desktop/99-final/.dmrc desktop/desktop/99-final/.dmrc +index 1406119..0894b2b 100644 +--- desktop/desktop/99-final/.dmrc ++++ desktop/desktop/99-final/.dmrc +@@ -1,2 +1,2 @@ +-# Calculate path=~ name=.dmrc append=remove ++# Calculate path=~ name=.dmrc append=remove belong(calculate-desktop)!= + # To delete a file necessary when changing the system +diff --git install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop +new file mode 100644 +index 0000000..71984f2 +--- /dev/null ++++ install/1merge/Desktop/300-ImageEdit/gimp/calculate/zzz-gimp-2.6.11.desktop +@@ -0,0 +1,9 @@ ++# Calculate format=kde link=/usr/share/applications/zzz-gimp.desktop name=calculate-imageedit.desktop mirror pkg(media-gfx/gimp)>=2.6.11&&exists(/usr/share/applications/zzz-gimp.desktop)!= ++ ++# Update info ++#-ini(desktop.imageedit, gimp)-# ++ ++# Hide icon ++[Desktop Entry] ++OnlyShowIn=X-NeverShowThis; ++ +diff --git install/1merge/gimp/.calculate_directory install/1merge/gimp/.calculate_directory +new file mode 100644 +index 0000000..d2e799d +--- /dev/null ++++ install/1merge/gimp/.calculate_directory +@@ -0,0 +1,2 @@ ++# Calculate belong()!=&&pkg(media-gfx/gimp)!= path=/etc name=env.d ++ +diff --git install/1merge/gimp/99gimp install/1merge/gimp/99gimp +new file mode 100644 +index 0000000..615128e +--- /dev/null ++++ install/1merge/gimp/99gimp +@@ -0,0 +1,3 @@ ++# discard /usr/lib64/gimp/2.0/plug-ins/hot due to an segfault prelink ++# prelink (20110106-20110511), gimp (2.6.11) (CLD-64) ++PRELINK_PATH_MASK=/usr/lib64/gimp/2.0/plug-ins/hot diff --git a/sys-apps/calculate-utilities/ChangeLog b/sys-apps/calculate-utilities/ChangeLog index 7319d5766..b784c3089 100644 --- a/sys-apps/calculate-utilities/ChangeLog +++ b/sys-apps/calculate-utilities/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-utilities-2.2.23-r6 (08 Sep 2011) + + 08 Sep 2011; Mike Hiretsky (mhiretskiy) + +calculate-utilities-2.2.23-r6.ebuild: + Update for templates + *calculate-utilities-2.2.23-r5 (08 Sep 2011) 08 Sep 2011; Mike Hiretsky (mhiretskiy) diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index b3702ac68..50ddc291f 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -46,6 +46,7 @@ EBUILD calculate-utilities-2.2.23-r2.ebuild 870 RMD160 9dba2c47d21f10441e159edb6 EBUILD calculate-utilities-2.2.23-r3.ebuild 876 RMD160 3bdc5646d8409dd241e0311bef7d082f1daf421c SHA1 085fb664e1699320b65edbc99e3f83129ea64197 SHA256 4082b7e280e4b68c9f894aa78e0213111677180a27091d60136aa888adc26656 EBUILD calculate-utilities-2.2.23-r4.ebuild 876 RMD160 be214e346a469a15139ecb604d6e3c828a78141c SHA1 09164743b8a2ebca2b5f13e9e69e8283f8e0af5d SHA256 f712dc356cbfa69ecd3eb7ae3f58e264188648fc518f189f08b1c640ef004a9b EBUILD calculate-utilities-2.2.23-r5.ebuild 876 RMD160 26cfb870a5bc59cd7f77718ee909f29a730a9307 SHA1 adccd1369435e6d87b8a9ebdb326c6fb31117ee0 SHA256 9de6c1116603521ff7366fc334e6abca6e38f9880d364f3d0654372c0e5fafbd +EBUILD calculate-utilities-2.2.23-r6.ebuild 876 RMD160 0641258249161080943dfe38ea9c634735969f88 SHA1 4c7cf3e4768fd52484a12b92bdedd54d160232a5 SHA256 3817151888150d6616b56e612d02cd6010e2685a1588b54c9b7316f0c2db1b5a EBUILD calculate-utilities-2.2.23.ebuild 861 RMD160 a625469de75e5f99cc6d7b39496787b4a0c405f6 SHA1 bcbd37e0e4b92a070f68b8aac7a0c3f2c62a9b21 SHA256 4b5b2b88c9a225f33e7b3175bd02e38ccc03c5ae3be54894e92162b9b34ba106 EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66 -MISC ChangeLog 22895 RMD160 c2ac310f2d2fc91cf5b58241fa61b2d8c37d98eb SHA1 a937c2c70baf2b78d17f3203c3b1c39e45e2cb1f SHA256 8b34b90dc2e6d3fdb117cc97c5342ce916263009ad14a884a5cca4b21d776c65 +MISC ChangeLog 23066 RMD160 8d9c6b65ecb825015e6c26a7ecba809d25e2a034 SHA1 13ae1cdf74bec0b618b3245ea2c82150bb6c66ed SHA256 918eb98659440e374bc21063c793325e98c5e38d3120d560f97d294aba4f28fc diff --git a/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r6.ebuild b/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r6.ebuild new file mode 100644 index 000000000..a8c7d016b --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.23-r6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +DESCRIPTION="Calculate Utilities meta package" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE=" +cl_assemble +cl_builder +cl_client +cl_desktop +cl_installgui +cl_server +" + +RDEPEND="${RDEPEND} + =sys-apps/calculate-install-2.2.23 + =sys-apps/calculate-templates-2.2.23-r3 + =sys-apps/calculate-lib-2.2.23 + =sys-apps/calculate-i18n-2.2.23-r2 + + cl_assemble? ( =sys-apps/calculate-assemble-2.2.23 ) + cl_builder? ( =sys-apps/calculate-builder-2.2.23-r2 ) + cl_client? ( =sys-apps/calculate-client-2.2.23-r2 ) + cl_desktop? ( =sys-apps/calculate-desktop-2.2.23-r2 ) + cl_installgui? ( =app-misc/calculate-install-gui-2.2.23 ) + + cl_server? ( =sys-apps/calculate-server-2.1.14-r6 ) +"