From: Matt Turner <mattst88@gentoo.org>
Date: Thu, 14 Mar 2019 21:06:40 +0000 (-0700)
Subject: x11-misc/xkeyboard-config: Add upstream patch to fix pt layout
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d179736226a636501c3d423f1f92f822b114471a;p=gentoo.git

x11-misc/xkeyboard-config: Add upstream patch to fix pt layout

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
new file mode 100644
index 000000000000..4728e4bebff3
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
@@ -0,0 +1,84 @@
+From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
+From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
+Date: Thu, 7 Feb 2019 20:40:35 +0000
+Subject: [PATCH] Fixed broken pt layout
+
+Backticks broke it, removed
+---
+ symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/symbols/pt b/symbols/pt
+index 73a1b7b..3ec0981 100644
+--- a/symbols/pt
++++ b/symbols/pt
+@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
+ 
+     name[Group1]="Portuguese (Colemak)";
+ 
+-    key `<AD01>`  { [         q,          Q,           at,   Greek_OMEGA ] };
+-    key `<AD02>`  { [         w,          W,      lstroke,       Lstroke ] };
+-    key `<AD03>`  { [         f,          F,      dstroke,   ordfeminine ] };
+-    key `<AD04>`  { [         p,          P,        thorn,         THORN ] };
+-    key `<AD05>`  { [         g,          G,          eng,           ENG ] };
+-    key `<AD06>`  { [         j,          J,    dead_hook,     dead_horn ] };
+-    key `<AD07>`  { [         l,          L,      lstroke,       Lstroke ] };
+-    key `<AD08>`  { [         u,          U,    downarrow,       uparrow ] };
+-    key `<AD09>`  { [         y,          Y,    leftarrow,           yen ] };
+-    key `<AD10>`  { [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
+-
+-    key `<AC01>`  { [         a,          A,           ae,           AE ] };
+-    key `<AC02>`  { [         r,          R,    paragraph,   registered ] };
+-    key `<AC03>`  { [         s,          S,       ssharp,      section ] };
+-    key `<AC04>`  { [         t,          T,       tslash,       Tslash ] };
+-    key `<AC05>`  { [         d,          D,          eth,          ETH ] };
+-    key `<AC06>`  { [         h,          H,      hstroke,      Hstroke ] };
+-    key `<AC07>`  { [         n,          N,            n,            N ] };
+-    key `<AC08>`  { [         e,          E,     EuroSign,         cent ] };
+-    key `<AC09>`  { [         i,          I,   rightarrow,     idotless ] };
+-    key `<AC10>`  { [         o,          O,       oslash,     Ooblique ] };
+-
+-    key `<AB01>`  { [         z,          Z, guillemotleft,        less ] };
+-    key `<AB02>`  { [         x,          X, guillemotright,    greater ] };
+-    key `<AB03>`  { [         c,          C,         cent,    copyright ] };
+-    key `<AB04>`  { [         v,          V, leftdoublequotemark, leftsinglequotemark ]   };
+-    key `<AB05>`  { [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
+-    key `<AB08>`  { [         k,          K,          kra,    ampersand ] };
+-    key `<AB07>`  { [         m,          M,           mu,    masculine ] };
+-
+-    key `<CAPS>` { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
++    key <AD01>  { [         q,          Q,           at,   Greek_OMEGA ] };
++    key <AD02>  { [         w,          W,      lstroke,       Lstroke ] };
++    key <AD03>  { [         f,          F,      dstroke,   ordfeminine ] };
++    key <AD04>  { [         p,          P,        thorn,         THORN ] };
++    key <AD05>  { [         g,          G,          eng,           ENG ] };
++    key <AD06>  { [         j,          J,    dead_hook,     dead_horn ] };
++    key <AD07>  { [         l,          L,      lstroke,       Lstroke ] };
++    key <AD08>  { [         u,          U,    downarrow,       uparrow ] };
++    key <AD09>  { [         y,          Y,    leftarrow,           yen ] };
++    key <AD10>  { [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
++
++    key <AC01>  { [         a,          A,           ae,           AE ] };
++    key <AC02>  { [         r,          R,    paragraph,   registered ] };
++    key <AC03>  { [         s,          S,       ssharp,      section ] };
++    key <AC04>  { [         t,          T,       tslash,       Tslash ] };
++    key <AC05>  { [         d,          D,          eth,          ETH ] };
++    key <AC06>  { [         h,          H,      hstroke,      Hstroke ] };
++    key <AC07>  { [         n,          N,            n,            N ] };
++    key <AC08>  { [         e,          E,     EuroSign,         cent ] };
++    key <AC09>  { [         i,          I,   rightarrow,     idotless ] };
++    key <AC10>  { [         o,          O,       oslash,     Ooblique ] };
++
++    key <AB01>  { [         z,          Z, guillemotleft,        less ] };
++    key <AB02>  { [         x,          X, guillemotright,    greater ] };
++    key <AB03>  { [         c,          C,         cent,    copyright ] };
++    key <AB04>  { [         v,          V, leftdoublequotemark, leftsinglequotemark ]   };
++    key <AB05>  { [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
++    key <AB08>  { [         k,          K,          kra,    ampersand ] };
++    key <AB07>  { [         m,          M,           mu,    masculine ] };
++
++    key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
+ };
+-- 
+2.19.2
+
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
similarity index 95%
rename from x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
rename to x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
index 6ec7db351529..85d56e7d72f7 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
 	${LIVE_DEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Fixed-broken-pt-layout.patch
+)
+
 src_prepare() {
 	default
 	[[ ${PV} == 9999 ]] && eautoreconf