From 852eccbcf7dfef4ba6a4ba25f80b11a3222723bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 9 Dec 2020 13:32:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20x11?= =?UTF-8?q?-libs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit x11-libs/gtk+ x11-libs/libX11 x11-libs/pango x11-libs/qtermwidget x11-libs/wxGTK --- merge/x11-libs/.calculate_directory | 1 + merge/x11-libs/gtk+/.calculate_directory | 1 + merge/x11-libs/gtk+/gtkrc | 12 +++ merge/x11-libs/libX11/.calculate_directory | 1 + merge/x11-libs/libX11/99libX11 | 4 + merge/x11-libs/libX11/Compose | 24 ++++++ .../libX11/Compose.remove_empty_strings | 3 + merge/x11-libs/pango/.calculate_directory | 1 + merge/x11-libs/pango/pango.modules | 1 + .../x11-libs/qtermwidget/.calculate_directory | 1 + .../qtermwidget/Calculate.colorscheme | 73 +++++++++++++++++++ merge/x11-libs/wxGTK/.calculate_directory | 1 + merge/x11-libs/wxGTK/select-default | 11 +++ 13 files changed, 134 insertions(+) create mode 100644 merge/x11-libs/.calculate_directory create mode 100644 merge/x11-libs/gtk+/.calculate_directory create mode 100644 merge/x11-libs/gtk+/gtkrc create mode 100644 merge/x11-libs/libX11/.calculate_directory create mode 100644 merge/x11-libs/libX11/99libX11 create mode 100644 merge/x11-libs/libX11/Compose create mode 100644 merge/x11-libs/libX11/Compose.remove_empty_strings create mode 100644 merge/x11-libs/pango/.calculate_directory create mode 100644 merge/x11-libs/pango/pango.modules create mode 100644 merge/x11-libs/qtermwidget/.calculate_directory create mode 100644 merge/x11-libs/qtermwidget/Calculate.colorscheme create mode 100644 merge/x11-libs/wxGTK/.calculate_directory create mode 100644 merge/x11-libs/wxGTK/select-default diff --git a/merge/x11-libs/.calculate_directory b/merge/x11-libs/.calculate_directory new file mode 100644 index 0000000..fe9987a --- /dev/null +++ b/merge/x11-libs/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip' %} diff --git a/merge/x11-libs/gtk+/.calculate_directory b/merge/x11-libs/gtk+/.calculate_directory new file mode 100644 index 0000000..c305ab4 --- /dev/null +++ b/merge/x11-libs/gtk+/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc', name='gtk-2.0', package='x11-libs/gtk+' %} diff --git a/merge/x11-libs/gtk+/gtkrc b/merge/x11-libs/gtk+/gtkrc new file mode 100644 index 0000000..eb563b5 --- /dev/null +++ b/merge/x11-libs/gtk+/gtkrc @@ -0,0 +1,12 @@ +{% calculate comment='#' %} +gtk-fallback-icon-theme = "gnome" +gtk-cursor-theme-name = "Calculate" +style "gdmfont" +{ +{% if pkg('media-fonts/droid') %} + font_name = "Droid Sans" +{% else %} + font_name = "Verdana" +{% endif %} +} +widget "*" style "gdmfont" diff --git a/merge/x11-libs/libX11/.calculate_directory b/merge/x11-libs/libX11/.calculate_directory new file mode 100644 index 0000000..6717a78 --- /dev/null +++ b/merge/x11-libs/libX11/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='>=x11-libs/libX11-1.6.3' %} diff --git a/merge/x11-libs/libX11/99libX11 b/merge/x11-libs/libX11/99libX11 new file mode 100644 index 0000000..b4cd03b --- /dev/null +++ b/merge/x11-libs/libX11/99libX11 @@ -0,0 +1,4 @@ +{% calculate comment='#', path='/etc/env.d' %} +# need for correct entry compose sequences +QT_IM_MODULE="xim" +GTK_IM_MODULE="xim" diff --git a/merge/x11-libs/libX11/Compose b/merge/x11-libs/libX11/Compose new file mode 100644 index 0000000..72b7538 --- /dev/null +++ b/merge/x11-libs/libX11/Compose @@ -0,0 +1,24 @@ +{% calculate append='before', comment='#', path='/usr/share/X11/locale/en_US.UTF-8', not grep('/usr/share/X11/locale/en_US.UTF-8/Compose','Calculate definitions') %} + +# UTF-8 (Unicode) compose sequence +# Calculate definitions + +

: "₽" U20bd # RUBLE-CURRENCY SIGN +

: "₽" U20bd # RUBLE-CURRENCY SIGN +

: "₽" U20bd # RUBLE-CURRENCY SIGN +

: "₽" U20bd # RUBLE-CURRENCY SIGN + + : "₽" U20bd # RUBLE-CURRENCY SIGN + : "₽" U20bd # RUBLE-CURRENCY SIGN + : "₽" U20bd # RUBLE-CURRENCY SIGN + : "₽" U20bd # RUBLE-CURRENCY SIGN + + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN + : "₴" U20bd # HRYVNIA-CURRENCY SIGN diff --git a/merge/x11-libs/libX11/Compose.remove_empty_strings b/merge/x11-libs/libX11/Compose.remove_empty_strings new file mode 100644 index 0000000..1a8db3b --- /dev/null +++ b/merge/x11-libs/libX11/Compose.remove_empty_strings @@ -0,0 +1,3 @@ +{% calculate format='regex', comment='#', path='/usr/share/X11/locale/en_US.UTF-8', name='Compose' %} +\n{4,} +\n\n\n diff --git a/merge/x11-libs/pango/.calculate_directory b/merge/x11-libs/pango/.calculate_directory new file mode 100644 index 0000000..8800af3 --- /dev/null +++ b/merge/x11-libs/pango/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/etc', name='pango', package='>=x11-libs/pango-1.36.8' %} diff --git a/merge/x11-libs/pango/pango.modules b/merge/x11-libs/pango/pango.modules new file mode 100644 index 0000000..e45386b --- /dev/null +++ b/merge/x11-libs/pango/pango.modules @@ -0,0 +1 @@ +{% calculate append='remove' %} diff --git a/merge/x11-libs/qtermwidget/.calculate_directory b/merge/x11-libs/qtermwidget/.calculate_directory new file mode 100644 index 0000000..7d1052f --- /dev/null +++ b/merge/x11-libs/qtermwidget/.calculate_directory @@ -0,0 +1 @@ +{% calculate path='/usr/share/qtermwidget5', name='color-schemes', package='x11-libs/qtermwidget' %} diff --git a/merge/x11-libs/qtermwidget/Calculate.colorscheme b/merge/x11-libs/qtermwidget/Calculate.colorscheme new file mode 100644 index 0000000..0e87f36 --- /dev/null +++ b/merge/x11-libs/qtermwidget/Calculate.colorscheme @@ -0,0 +1,73 @@ +[Background] +Color=44,44,44 + +[BackgroundIntense] +Bold=true +Color=44,44,44 + +[Color0] +Color=44,44,44 + +[Color0Intense] +Bold=true +Color=112,144,128 + +[Color1] +Color=112,80,80 + +[Color1Intense] +Bold=true +Color=220,163,163 + +[Color2] +Color=96,180,138 + +[Color2Intense] +Bold=true +Color=114,213,163 + +[Color3] +Color=223,175,143 + +[Color3Intense] +Bold=true +Color=240,223,175 + +[Color4] +Color=154,184,215 + +[Color4Intense] +Bold=true +Color=148,191,243 + +[Color5] +Color=220,140,195 + +[Color5Intense] +Bold=true +Color=236,147,211 + +[Color6] +Color=140,208,211 + +[Color6Intense] +Bold=true +Color=147,224,227 + +[Color7] +Color=220,220,204 + +[Color7Intense] +Bold=true +Color=255,255,255 + +[Foreground] +Color=220,220,204 + +[ForegroundIntense] +Bold=true +Color=220,220,204 + +[General] +Description=Calculate +Opacity=1 diff --git a/merge/x11-libs/wxGTK/.calculate_directory b/merge/x11-libs/wxGTK/.calculate_directory new file mode 100644 index 0000000..be7abe5 --- /dev/null +++ b/merge/x11-libs/wxGTK/.calculate_directory @@ -0,0 +1 @@ +{% calculate append='skip', package='x11-libs/wxGTK' %} diff --git a/merge/x11-libs/wxGTK/select-default b/merge/x11-libs/wxGTK/select-default new file mode 100644 index 0000000..807689e --- /dev/null +++ b/merge/x11-libs/wxGTK/select-default @@ -0,0 +1,11 @@ +{% calculate exec='/bin/bash', action='!disk' %} + +{% if pkg('x11-libs/wxGTK:3.0-gtk3') %} +/usr/bin/eselect wxwidgets set gtk3-unicode-3.0-gtk3 &>/dev/null +{% elif pkg('x11-libs/wxGTK:3.0') %} +/usr/bin/eselect wxwidgets set gtk2-unicode-3.0 &>/dev/null +{% elif pkg('x11-libs/wxGTK:2.8') %} +/usr/bin/eselect wxwidgets set gtk2-unicode-release-2.8 &>/dev/null +{% endif %} + +true