gentoo resync : 02.08.2019

5 files changed, 2 insertions, 197 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b23162bf236d..b0009b0cdd80 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,4 @@
-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
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
-EBUILD xkeyboard-config-2.25.ebuild 1255 BLAKE2B f1883e83820a59cfccdef343cbd001eb85583542421d4f13b4814c421e7c9f651bf68a41334e43f567d21866061938e957e16e92ee9091cf8fe6a3f9bdf62971 SHA512 71e9921d25b4578bf7ef268fbb5927d2d896f15756b5d4348aa5ad3a86c33be54f717d7106efa59572a82eb9542f6cb1260f65a09ae59ab2d1fe5df35eaee921
-EBUILD xkeyboard-config-2.26-r1.ebuild 1317 BLAKE2B 6479546b1af2d15f8f8f6492fa82003b02d10d748a0eb3803f5ce19bef0d84dc2b69733a5c0ded4d163b6c38d994457473c7793bf7cf8817f3fe89079b39aeb6 SHA512 9fdcb75bfa3176b7de13f9b6bb72951fe06648aaaab4412641477f30f91ff5ead6d325f26b8771fe20e6a022fb90a6785578cd8d350aa0851b81c94f85452d03
-EBUILD xkeyboard-config-2.27.ebuild 1257 BLAKE2B c7e340b6ba4e762d7f6b76b6d35043e0ec6ba4576faaa851377d86b86f8ac2e98fd65f74b42239bd46b5905ab5c7260c465bffb9b79e06a8a7edc35bbaef1cc1 SHA512 636f3799a560266c8b9efc5a4b3f4fd903fbaacade1a587b16ce2db2338b935299e6ef0053ef816f3497300484d0a91b2bcde76a78456c8579772adb3c2119ae
+EBUILD xkeyboard-config-2.27.ebuild 1255 BLAKE2B acba6a3442b60470401db9b898927172f7f32d0f2e625c85701bc47fb9e4cc806f1f51031b5375eb5b195d4b2f3ff53fb5e7af88cf1511f123813d6e07bd75b9 SHA512 b7e457f396689ee4653fbabe3a34025621026b14d1cb11638c20cc373d0931d379747cca2466dfb3b732d92e6a446c45a2bfe98fde0709b0c838157a286a2deb
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
 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
deleted file mode 100644
index 4728e4bebff3..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
deleted file mode 100644
index ba23a9053296..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.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 https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/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="
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-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-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
deleted file mode 100644
index 42d76fa397a9..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
+++ /dev/null
@@ -1,55 +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 https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/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.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
index 000cee665a89..0f026fc57687 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"