From b064b9fb45e660b0a4456e93e79edfa80087f4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BB=D0=BE=D1=85=D0=B8=D0=BD=20=D0=AE=D1=80=D0=B8?= =?UTF-8?q?=D0=B9?= Date: Mon, 19 Nov 2012 17:25:59 +0400 Subject: [PATCH] Revert templates changes; New ebuild for elementary-icon-theme --- .../xfce-accessories.directory | 3 - .../xfce-graphics.directory | 6 -- .../desktop-directories/xfce-office.directory | 6 -- .../xfce-accessories.directory | 12 ---- .../60-patch-icons-13/xfce-graphics.directory | 3 - .../60-patch-icons-13/xfce-office.directory | 3 - .../xfce-accessories.directory | 3 - .../xfce-graphics.directory | 6 -- .../desktop-directories/xfce-office.directory | 6 -- .../xfce-accessories.directory | 12 ---- .../60-patch-icons-13/xfce-graphics.directory | 3 - .../60-patch-icons-13/xfce-office.directory | 3 - x11-themes/elementary-icon-theme/Manifest | 1 + .../elementary-icon-theme-2.7.1-r1.ebuild | 58 +++++++++++++++++++ 14 files changed, 59 insertions(+), 66 deletions(-) delete mode 100644 profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory delete mode 100644 profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory delete mode 100644 profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-accessories.directory delete mode 100644 profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-graphics.directory delete mode 100644 profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-office.directory delete mode 100644 profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory delete mode 100644 profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory delete mode 100644 profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-accessories.directory delete mode 100644 profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-graphics.directory delete mode 100644 profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-office.directory create mode 100644 x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r1.ebuild diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory index 8df6b1ced..eeb9cc61f 100644 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory +++ b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory @@ -1,9 +1,6 @@ # Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror [Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-utilities -#pkg# Name=Utilities Name[de]=Dienstprogramme Name[es]=Utilidades diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory deleted file mode 100644 index ddaecc571..000000000 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-graphics.directory mirror - -[Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-painting -#pkg# diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory deleted file mode 100644 index 299bddcc6..000000000 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-office.directory mirror - -[Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-other -#pkg# diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-accessories.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-accessories.directory deleted file mode 100644 index 382aa750e..000000000 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-accessories.directory +++ /dev/null @@ -1,12 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror path=~/.local/share/desktop-directories name=xfce-accessories.directory -[Desktop Entry] -Icon=applications-utilities -Name=Utilities -Name[de]=Dienstprogramme -Name[es]=Utilidades -Name[fr]=Utilitaires -Name[it]=Accessori -Name[pl]=Narzędzia -Name[pt_BR]=Utilitários -Name[ru]=Служебные -Name[uk]=Утиліти diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-graphics.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-graphics.directory deleted file mode 100644 index 496e31e2c..000000000 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-graphics.directory +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-graphics.directory mirror path=~/.local/share/desktop-directories name=xfce-graphics.directory -[Desktop Entry] -Icon=applications-painting diff --git a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-office.directory b/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-office.directory deleted file mode 100644 index a1819786e..000000000 --- a/profiles/templates/3.1-beta/3_ac_desktop_desktop/2-desktop-user/60-patch-icons-13/xfce-office.directory +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-office.directory mirror path=~/.local/share/desktop-directories name=xfce-office.directory -[Desktop Entry] -Icon=applications-other diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory index 8df6b1ced..eeb9cc61f 100644 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory +++ b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-accessories.directory @@ -1,9 +1,6 @@ # Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror [Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-utilities -#pkg# Name=Utilities Name[de]=Dienstprogramme Name[es]=Utilidades diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory deleted file mode 100644 index ddaecc571..000000000 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-graphics.directory +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-graphics.directory mirror - -[Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-painting -#pkg# diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory deleted file mode 100644 index 299bddcc6..000000000 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/40-xfce-4.10/.local/share/desktop-directories/xfce-office.directory +++ /dev/null @@ -1,6 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-office.directory mirror - -[Desktop Entry] -#?pkg(x11-themes/elementary-icon-theme)!=&&pkg(x11-themes/calculate-icon-theme)>=13# -Icon=applications-other -#pkg# diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-accessories.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-accessories.directory deleted file mode 100644 index 382aa750e..000000000 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-accessories.directory +++ /dev/null @@ -1,12 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror path=~/.local/share/desktop-directories name=xfce-accessories.directory -[Desktop Entry] -Icon=applications-utilities -Name=Utilities -Name[de]=Dienstprogramme -Name[es]=Utilidades -Name[fr]=Utilitaires -Name[it]=Accessori -Name[pl]=Narzędzia -Name[pt_BR]=Utilitários -Name[ru]=Служебные -Name[uk]=Утиліти diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-graphics.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-graphics.directory deleted file mode 100644 index 496e31e2c..000000000 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-graphics.directory +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-graphics.directory mirror path=~/.local/share/desktop-directories name=xfce-graphics.directory -[Desktop Entry] -Icon=applications-painting diff --git a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-office.directory b/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-office.directory deleted file mode 100644 index a1819786e..000000000 --- a/profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/60-patch-icons-13/xfce-office.directory +++ /dev/null @@ -1,3 +0,0 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-office.directory mirror path=~/.local/share/desktop-directories name=xfce-office.directory -[Desktop Entry] -Icon=applications-other diff --git a/x11-themes/elementary-icon-theme/Manifest b/x11-themes/elementary-icon-theme/Manifest index 7eb677858..436e298d3 100644 --- a/x11-themes/elementary-icon-theme/Manifest +++ b/x11-themes/elementary-icon-theme/Manifest @@ -1,3 +1,4 @@ DIST elementary-icon-theme-2.7.1.tar.gz 4100761 SHA256 4cfe73d9da3f6262a724bd787126dcbf0957b107e3f36d22a0baf60fef7706e6 SHA512 55af14b171756f2e8ba6b5a9956eb28bbe9bae3ac15acbd0088e177077b84f10efc30d4c5cb5508829f67dc924654f52a5a758f9b4fd455c9baa01bd997ce84c WHIRLPOOL 60ab35db6022050342aa2102315e30e54ab455f3efcf8cf925ab8b400f5100228ee7f95fbc4f70f6c12b7414eb0ea0f4fa88f4ccb9a3b4282601f2b42aa585e3 +EBUILD elementary-icon-theme-2.7.1-r1.ebuild 1227 SHA256 d8334b5b9ca46a6fe8f8820534a786c33ddf380ce99b03f7e83870024471837b SHA512 ef1eb906e9988dfe4ae0752fd1b7b40f37de5a2cb7703685d77449998635588bf2c79463720b3936a66fb367de47fee8ad4ecefac4c215945a1dc2a81f9025aa WHIRLPOOL 0413c7a18e1076e8ec9598de9b7900ce9898f6a30fd4a5228a81fa0141f12f6b92cd3d2e2ecf1d0c2052e6cd46e8f08abbf6c824d5d39ea9737f27d2b90f93c7 EBUILD elementary-icon-theme-2.7.1.ebuild 960 SHA256 7aa82a51dc5d196b1665909c2ec56dd2b378bbce3df75fa8026538df0d050886 SHA512 299be2d435269c9962f15348cdf15a11dc817a6a48712a8081ea278977b5c0aaf0c08a589e2a5ab9fdaca4954267e37a0277f99aa96d13f59d0a344f0a451104 WHIRLPOOL cefea9f11b3aae6f0390abc15de0c398747a72c27bdc746943518ef01b230c3edebe20751cfdc11a02c3b781feae833e3688d6b7c61674f4e54c89c1f2aa941b EBUILD elementary-icon-theme-9999.ebuild 770 SHA256 ec8d0381993db449fc08b9893fee598be045e5114c7eeb263eab775f6120cb22 SHA512 d85798da9eeb503c125f9b93148473f044b114a7738927e52dde968d83a9b8ddb97faa084e46f3a376c616e4c52867f9c0f295c28c8dfec148ff8c91eb19339a WHIRLPOOL 6570f964b17b36016e3839a002cfd995eccd0e2427f7a22ecf0ffbb3b874611b8181e5d8c67be5507e98716a64d1485f87ba703bc7ba3c2fad349bce37f03cf3 diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r1.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r1.ebuild new file mode 100644 index 000000000..b87bba0cf --- /dev/null +++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit gnome2-utils + +DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient" +HOMEPAGE="https://launchpad.net/elementaryicons" +SRC_URI="http://launchpad.net/elementaryicons/2.0/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="monochrome" + +ICON_PATH="/usr/share/icons/elementary/categories/48" + +CDEPEND="" +RDEPEND="${CDEPEND}" +DEPEND="${CDEPEND} + x11-libs/gtk+:2" + +RESTRICT="binchecks strip" + +pkg_setup() { + DOCS="elementary/AUTHORS elementary/COPYING elementary/CONTRIBUTORS" + S="${WORKDIR}/${PN}" +} + +src_install() { + dodoc ${DOCS} + rm ${DOCS} + + rm -r elementary/status/48/untitled\ folder + + dosym applications-other.svg $ICON_PATH/applications-office.svg + dosym applications-painting.svg $ICON_PATH/applications-graphics.svg + dosym applications-utilities.svg $ICON_PATH/applications-accessories.svg + + insinto /usr/share/icons + doins -r elementary + use monochrome && doins -r elementary-mono-dark +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} +