setxkbmap: upgraded package to upstream
Upgraded x11-apps/setxkbmap to version 1.3.2 on amd64
BUG=chromium:1121686
TEST=sudo emerge x11-apps/setxkbmap
Change-Id: I1b125a10d6a66147d2d0b004c82938daf734bd89
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2375881
Tested-by: Allen Webb <allenwebb@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
deleted file mode 100644
index 3d862e2..0000000
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Controls the keyboard layout of a running X server.
-EAPI=3
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-libs/libxkbfile x11-libs/libX11
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.2.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 3727db64c7b960903d5033280f108080 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-2 50dd640df6d0554c259daa81531ed3ee
-_md5_=36f01eb383517b4ba202fe56b243d852
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
new file mode 100644
index 0000000..b4c8d57
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-base/xorg-proto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Controls the keyboard layout of a running X server
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/setxkbmap
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=01ed899566aa0516686599ad42ef920c
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 74b3d6a..2fb4570 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1 +1 @@
-DIST setxkbmap-1.2.0.tar.bz2 112465 RMD160 242cb0f1b06262d35a222b937a6840b744787685 SHA1 860785e16313d30792fe62604f65d84281812322 SHA256 999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
+DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
diff --git a/x11-apps/setxkbmap/metadata.xml b/x11-apps/setxkbmap/metadata.xml
index 01c4c00..e943b72 100644
--- a/x11-apps/setxkbmap/metadata.xml
+++ b/x11-apps/setxkbmap/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
deleted file mode 100644
index 3fb0cfc..0000000
--- a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild,v 1.9 2011/02/14 23:04:23 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Controls the keyboard layout of a running X server."
-
-KEYWORDS="*"
-IUSE=""
-RDEPEND="x11-libs/libxkbfile
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
new file mode 100644
index 0000000..e113d48
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="*"
+IUSE=""
+COMMON_DEPEND="
+ x11-libs/libxkbfile
+ x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/xkeyboard-config"
