gentoo resync : 22.05.2018

12 files changed, 8 insertions, 96 deletions

diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 017e3229f195..6fe6f4a22e85 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.4 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.4
deleted file mode 100644
index 44f86d973de7..000000000000
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXfont >=app-portage/elt-patches-20170422 !<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 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=X.Org bdftopcf application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXfont
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.0.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=f6ab91dc34456aa0f6edcd7084bd4f20
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.0.5 b/metadata/md5-cache/x11-apps/bdftopcf-1.0.5
deleted file mode 100644
index 5030279cd304..000000000000
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXfont >=app-portage/elt-patches-20170422 !<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 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=X.Org bdftopcf application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXfont
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.0.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=f6ab91dc34456aa0f6edcd7084bd4f20
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1
index d2e90c33b370..13f61dcd6ea5 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.1
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.1
@@ -3,9 +3,9 @@ DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettex
 DESCRIPTION=X.Org bdftopcf application
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=b4d041d5609e3c97c5af4065d0a1cb8f
+_md5_=3e249ed85cc5d5adbaaa938ec42ef272
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.4-r3 b/metadata/md5-cache/x11-apps/xinit-1.3.4-r3
deleted file mode 100644
index ccf6c0fff461..000000000000
--- a/metadata/md5-cache/x11-apps/xinit-1.3.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 >=app-portage/elt-patches-20170422 !<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 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=X Window System initializer
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=+minimal systemd
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=MIT GPL-2
-PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
-RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xinit-1.3.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=c10ba45d21677701132b40618d52fb57
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.4-r4 b/metadata/md5-cache/x11-apps/xinit-1.3.4-r4
deleted file mode 100644
index 1443f3f4c295..000000000000
--- a/metadata/md5-cache/x11-apps/xinit-1.3.4-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 >=app-portage/elt-patches-20170422 !<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 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=X Window System initializer
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=+minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=MIT GPL-2
-PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
-RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xinit-1.3.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=9ba81d90ae20f394bc510d8f3dbcba12
diff --git a/metadata/md5-cache/x11-apps/xinit-1.4.0 b/metadata/md5-cache/x11-apps/xinit-1.4.0
index 8a3e747438b9..6616e2ecee78 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.4.0
+++ b/metadata/md5-cache/x11-apps/xinit-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=X Window System initializer
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=+minimal
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT GPL-2
 PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
 RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xinit-1.4.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=e3d651386468b2c390e9b796a76b0b2e
+_md5_=84d4f1f9848fb05c0d4ee0c1b29ed144
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.3.1 b/metadata/md5-cache/x11-apps/xkbcomp-1.3.1
deleted file mode 100644
index 2f10d58d34d3..000000000000
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-patches-20170422 !<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 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=compile XKB keyboard description
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.3.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=5d66436869b40f6e47a4041c223607aa
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.0 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.0
deleted file mode 100644
index a6397bc365ab..000000000000
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-patches-20170422 !<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 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=compile XKB keyboard description
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=9acfe23f38999e49b1c87fed836368d3
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.1 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.1
index b4f11fc2c180..78bdf0372815 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.4.1
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.4.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-pat
 DESCRIPTION=compile XKB keyboard description
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=323d1b98d646a4b9b5eb3f4a982449cd
+_md5_=9acfe23f38999e49b1c87fed836368d3
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1 b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
deleted file mode 100644
index 5290868e108b..000000000000
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<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 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=X.Org xtrap application
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXTrap
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xtrap-1.0.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=46efda779e9467d898c3399f3462d26c
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.3 b/metadata/md5-cache/x11-apps/xtrap-1.0.3
index 19698a52d9de..6291b5e13954 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.3
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXTrap x11-base/xorg-proto >=ap
 DESCRIPTION=X.Org xtrap application
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXTrap
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xtrap-1.0.3.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=53f423e7ca6e9c0e0cea09be28d419c9
+_md5_=49ecdb91916a0ee2d963f34a06d40008