From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 19 Mar 2019 11:37:34 +0000
Subject: gentoo resync : 19.03.2019

---
 x11-misc/xkeyboard-config/Manifest                 |  3 +-
 ...yboard-config-2.26-Fixed-broken-pt-layout.patch | 84 ++++++++++++++++++++++
 .../xkeyboard-config-2.26-r1.ebuild                | 55 ++++++++++++++
 .../xkeyboard-config/xkeyboard-config-2.26.ebuild  | 51 -------------
 4 files changed, 141 insertions(+), 52 deletions(-)
 create mode 100644 x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
 create mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
 delete mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild

(limited to 'x11-misc/xkeyboard-config')

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7b238f4190af..c1efbe83de4f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,7 @@
+AUX xkeyboard-config-2.26-Fixed-broken-pt-layout.patch 5000 BLAKE2B a535925839ee58cafa11151cc9cd5079d6e236444264221f1f59bdd11a44e6d3d66625eb3f25d5c5b71a52642c97af00431a7d14381fddaa5c8a77e39ddcf555 SHA512 b552ebcb902101f06da5454489b659493f2bf6fe5fcf171cb83dba52f4eaaf6f703ebc770ec90416011ab14bca809008a488e364a9c5e0dabd9689172f4e15d6
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
 EBUILD xkeyboard-config-2.25.ebuild 1178 BLAKE2B 7eb3a66b616bbf51ff8f28ae9fae57f1842ca6af23956be1d3a97a7efe4378975f557cef979e0d91c34dc2610e97bce1e0549c54d7e1d445fc2d01b12b1cabc0 SHA512 fce43266643ef25c8274a6b0fe3812ae69c49fbe610835870e8a6bdd42667e0ca00d26c3ba9b229ca9b0c6c4e760af099ed1ccb1bf114ab3d1b47eeb5e05d890
-EBUILD xkeyboard-config-2.26.ebuild 1189 BLAKE2B 5eb12b9045e87c0a139df9ff4c475d246fbf15ba9ea3347fa4f4ad9efb93f8ac0f0bbcc3cbecebc8f19630618bcfb99bb3e6a5049fa5e0de64836e21ed7599d5 SHA512 712068ad436d86e8bfc97e7654f30a0e6ecdc20b0fea81be2e4b9bf1136d3ec9c6e5512a0027d709eb147d50622c22cf442796875ea11918251934f01a86140f
+EBUILD xkeyboard-config-2.26-r1.ebuild 1251 BLAKE2B b0f229c3db0bd852e6c0e9f569c8484249731573a5b6a9c9bb34e0398456f5e377bf044e69f4b7fabce8838cdc51f7e548f5cb49e05c4bc96cf656189d3fda08 SHA512 ec185e074b42ad923ac1e2d5b02bc196f28073835a653b2347f894c7dd0a34a2f859d34cecab6d6941071c7470d06aef71d46474a8e3d48d6595885bdf90a5df
 EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 5eb12b9045e87c0a139df9ff4c475d246fbf15ba9ea3347fa4f4ad9efb93f8ac0f0bbcc3cbecebc8f19630618bcfb99bb3e6a5049fa5e0de64836e21ed7599d5 SHA512 712068ad436d86e8bfc97e7654f30a0e6ecdc20b0fea81be2e4b9bf1136d3ec9c6e5512a0027d709eb147d50622c22cf442796875ea11918251934f01a86140f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
new file mode 100644
index 000000000000..85d56e7d72f7
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Fixed-broken-pt-layout.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
deleted file mode 100644
index 6ec7db351529..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
-- 
cgit v1.2.3