gentoo resync : 04.05.2019

60 files changed, 73 insertions, 706 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e0660c016e80..b214f6a730e1 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 859a23a08936..c629742ecf80 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -14,10 +14,9 @@ AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a
 DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3764 BLAKE2B cce233125a8acb054628bd5010b042a01466e2ab6dc1e517e4a0a134d97b4651d189131c7defaee2854198217744c99f124475b3853b9ff33bc37fa4410af994 SHA512 af7ff591f510a0e8632d6068b04fc7ddfdc1250bdb75e5186964f5794dbccf53d04d67942a75659b4dd4619560304334e8bafe05f5c40477390924452c99c5b1
-EBUILD fltk-1.3.3-r5.ebuild 4394 BLAKE2B 6f8bd3caf45111057a3accf768c4309de717bccf01194bee88b5092c76e9e57fdd744c65f9e7d901a732b6c5eeb2d84752df537d9c93738f4778758f6053187e SHA512 8741f09384adad101f7989a561faa494e6a1c87e95747f34094d2ce14a90d6db09bfd26efe0704a854b62cfe672d5c13e30c10e1551e6e2ae504b4ead64cb36c
-EBUILD fltk-1.3.4.ebuild 4322 BLAKE2B 672541f7904f649927e3d42e1293f08bc6d9b1dc50b7c30407f77ccd052839b0bca9f5e493d6861c6ea34f91c07aacfacc57677d83fb4c27c2066554381b79a2 SHA512 de1a3d347ddebaaa835e6355b4c47136548e1a2853624f95cd1eeed0b868e08b0cf0b60863e715c7dd65cf8a57c92952a3a3b53399842164282da48c71ff3d60
-EBUILD fltk-1.3.5.ebuild 4426 BLAKE2B d98fe2e0530075e588dedad760ced0885ac9fd609f48054e8757fce4cc9443a84eed7db3feb01f5bf7e49d4357c16592ffd5721fd6ba2f978be10dde45f058ac SHA512 1b5fbc3a1885196564faf88d846af37af46624fd1c8d7a1148967151f87edcade526eef2e006a130b55cc332dd79ba68d9f8d59d4b6fd7c0374a92593d45ad39
-EBUILD fltk-1.3.9999.ebuild 4429 BLAKE2B a53e91a94d0e00c46083d2e19f7183fd181068d77d4d74625e229161427cbeeb51d263f11b55eb75989815ebbd4392a84109232f572919d0ada046b89b6492bf SHA512 fb9a084a0058229507823c4069e3228dc4d7191f398a37a9e3c5e52041784d31aa5b443eaf4845fda8726d540582c1ee806cabc861a751175cc09738f3d53842
-EBUILD fltk-1.4.9999.ebuild 4462 BLAKE2B 73e1dcf4ab86ce5d7b209ee6044fc07c6414f1e5095a5fae60cb183a805cd52161635dd34974b822aeafb17b8fae998b4f1e6c642c19ca3739eeee99c7c097df SHA512 fe67e96c4e82197b67e79288d2ca7528b929b22dc99f4177c7ac171346ccb1befba124827a41275911d1944a16a8521535c7b2086b6910f139610e222b12d908
+EBUILD fltk-1.3.3-r3.ebuild 3767 BLAKE2B 0d9bf5379a0ef12e54d89077d89dcae308ff5217d6fa345f71fe4da9e7e2a7c46897c68ecac427d596c289e15427e4ddb039e109fecd9a59963b26d686b3f785 SHA512 5c6058660979328aa1a1cf0b0b31b42123331faa7bdf8cf0f3239d0bdd9862cc0a51b94db984af5809b4d92e6c91834534e16e3881aa2daba01ccffbc1fcc185
+EBUILD fltk-1.3.4.ebuild 4325 BLAKE2B e0f6baeec8a670dd3ff9dba7d454d61de96c2b88fe160adf1baf0b15bc900c95a1cfb531ce0bfaffd42c467a7cab5d251ada155f4282038a339fb306c31407c4 SHA512 bfc2509e1cdef14292f267078f47a5346c9b9e2bbe4405e13520c096624bf983e4448a7ccdfee27b806e0ada9ad3f4cf798448a6d0cd16af99a3ba9fee46f325
+EBUILD fltk-1.3.5-r2.ebuild 4520 BLAKE2B 928734ae9eee59b85f822b7525e718a06aa0b74160498ab4ee433d387594c8202bcadbeefeee8d52a115c26c86067df9d7996eb57f85bb53c987f10575be991c SHA512 f50fa9afd9251c6dc8cc7d80bd627b04f1672f3243a9c449f1b5ecfec1af97451ffb691945fea4a52f648ec582b187f85c02cb8fc9c2103a62edca40aa922087
+EBUILD fltk-1.3.9999.ebuild 4518 BLAKE2B 719dbc412a4d3aa880146f7bda2d0859b41c03d17495d18e4a8226b3e103864dd8aba4d152a21c5fe139635913e8e18b65a0f24db1ac4201d4b4f90ab4f204d4 SHA512 07a58a821c8389207fe726d17663c06b777ae03efed187c2a8ff6dddae5da8ad8ea5f60e971819d13c6734646a27c61f1cfa3f338df7009d954b8ab20ce580ba
+EBUILD fltk-1.4.9999.ebuild 4551 BLAKE2B 2432478df1311381e0268b6abd710ee63494af57c5d6defefd323ce7a226aff9904d88b858e183a58032e06cabeb5a409a524c74a58ff88366078e33fae99a1a SHA512 a15b3a9955f01cc00745698b12a6df6a67f12cb56cccf4706b1e409bf3bccf11b3672a8f6bca3ca95caff526a49dd1bba5702a4060fe0842f73146552243318f
 MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 93aea9c564ef..e0631dc59cc9 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils fdo-mime flag-o-matic
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
diff --git a/x11-libs/fltk/fltk-1.3.3-r5.ebuild b/x11-libs/fltk/fltk-1.3.3-r5.ebuild
deleted file mode 100644
index 596b790d9751..000000000000
--- a/x11-libs/fltk/fltk-1.3.3-r5.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools fdo-mime flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
-
-SLOT="1"
-LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
-
-RDEPEND="
-	>=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	x11-libs/libICE[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(
-	ANNOUNCEMENT
-	CHANGES
-	CREDITS
-	README
-)
-FLTK_GAMES="
-	blocks
-	checkers
-	sudoku
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-share.patch
-	"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch
-	"${FILESDIR}"/${PN}-1.3.2-desktop.patch
-	"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch
-	"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
-	"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch
-	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
-	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
-	"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
-)
-
-pkg_setup() {
-	unset FLTK_LIBDIRS
-}
-
-src_prepare() {
-	default
-
-	rm -rf zlib jpeg png || die
-
-	sed -i \
-		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		-e "/SILENT:/d" \
-		makeinclude.in || die
-	sed -e "s/7/${PV}/" \
-		< "${FILESDIR}"/FLTKConfig.cmake \
-		> CMake/FLTKConfig.cmake || die
-	sed -e 's:-Os::g' -i configure.in || die
-
-	# also in Makefile:config.guess config.sub:
-	cp misc/config.{guess,sub} . || die
-
-	eautoconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
-	local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
-	FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
-
-	multilib_is_native_abi && use prefix &&
-		append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
-
-	econf \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama) \
-		--disable-localjpeg \
-		--disable-localpng \
-		--disable-localzlib \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xcursor \
-		--enable-xdbe \
-		--enable-xfixes \
-		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
-}
-
-multilib_src_compile() {
-	# Prevent reconfigure on non-native ABIs.
-	touch -r makeinclude config.{guess,sub} || die
-
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid
-		use doc && emake -C documentation html
-		use games && emake -C test ${FLTK_GAMES}
-	fi
-}
-
-multilib_src_test() {
-	emake -C fluid
-	emake -C test
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		emake -C fluid DESTDIR="${D}" install-linux install
-
-		use doc && \
-			emake -C documentation DESTDIR="${D}" install
-
-		use games && \
-			emake -C test DESTDIR="${D}" install-linux
-	fi
-}
-
-multilib_src_install_all() {
-	for app in fluid $(usex games "${FLTK_GAMES}" ''); do
-		dosym \
-			/usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die
-	echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die
-	doenvd 99fltk
-
-	# FIXME: This is bad, but building only shared libraries is hardly supported
-	# FIXME: The executables in test/ are linking statically against libfltk
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/fltk/*.a || die
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index d06a2da1ff68..19245b16e228 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools fdo-mime flag-o-matic multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
diff --git a/x11-libs/fltk/fltk-1.3.5.ebuild b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 008a5a20c956..5688e630c5ee 100644
--- a/x11-libs/fltk/fltk-1.3.5.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic multilib-minimal
+inherit autotools flag-o-matic xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+HOMEPAGE="https://www.fltk.org/"
+SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
@@ -118,7 +118,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -182,9 +184,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 4171029d334a..f5904db08e28 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
+inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
+HOMEPAGE="https://www.fltk.org/"
 EGIT_REPO_URI="https://github.com/fltk/fltk"
 EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3"
 
@@ -123,7 +123,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -190,9 +192,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 708271c605b5..11e65454e793 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools fdo-mime flag-o-matic git-r3 multilib-minimal
+inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
+HOMEPAGE="https://www.fltk.org/"
 EGIT_REPO_URI="https://github.com/fltk/fltk"
 
 SLOT="1"
@@ -127,7 +127,9 @@ multilib_src_configure() {
 		--enable-xdbe \
 		--enable-xfixes \
 		--includedir=${FLTK_INCDIR} \
-		--libdir=${FLTK_LIBDIR}
+		--libdir=${FLTK_LIBDIR} \
+		DSOFLAGS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 multilib_src_compile() {
@@ -194,9 +196,11 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 8939d894843c..6bf68ac899bb 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,3 @@
-DIST libFS-1.0.7.tar.bz2 315569 BLAKE2B ea629c9d935e4e2f159edd6e3513a571d4a145fcd3030605babd2b931aff3377509e8476859e4278bfbbe48cfe94444d9daa85628e9fcdfa384c4ac0a46dc01b SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
-EBUILD libFS-1.0.7-r1.ebuild 419 BLAKE2B cb445c4d687e39bd563d8c11250c41f0b0975be0f49255b1b06426e595d960e6c648a3b2d98b4e119c7942dc3cfba403495911975672b25193b4547e67d1c52a SHA512 de2fec0b2fd48a25f47c2813bf28bd2392d5b3a3e37c694911b3bbe81503508799495850ee42d06f3a680bf4d32b638e52f2cce909673c31555c242d0ad07d24
-EBUILD libFS-1.0.8.ebuild 383 BLAKE2B 61d5e276c714fc3e3690281991222d316b435a1d00d1b2ee118117e1262a87f3a65b2514d9bcf6dad45449adf691cfc173c2fed0bed7dcbe7d45fad9258d9a91 SHA512 fd83f346d16da3aca825df8518b1269649d9cc031438249bd7ae2b37ba419a59d01b5d65bcac9929a19036a697fd0cd2a1997b02dbd8197483516320f8980375
+EBUILD libFS-1.0.8.ebuild 381 BLAKE2B e0373f04e00d65782d78d03284b1321991d6890e7265778244eeef520722c8afedacf1dac9ec6c9ec2b2e047f9313fb3fa4a4acad688dc7a2c14f7702f8189ff SHA512 2ad8811e1697b11ade5f7170715bf14ca77723bc6e2712de59c3075336457dc8249a3388b8d3b82a487c6a6b3c2159ccaacad5cc1d1965c87f92d14e868baa15
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.7-r1.ebuild b/x11-libs/libFS/libFS-1.0.7-r1.ebuild
deleted file mode 100644
index 5c4bd97e8112..000000000000
--- a/x11-libs/libFS/libFS-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org FS library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index 66b11bc4a776..7819d9723554 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index b45449c301f3..79ee47e1843c 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,5 +1,3 @@
-DIST libXau-1.0.8.tar.bz2 295297 BLAKE2B 46c0cdf3382a75e197e48d556d44494dc8a91483fa27c86ae1b4264deb63320637232fe94d1286b38ba8f4efa5405f4b5c476266963ee3ee43b934af2e0a0e53 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.8-r1.ebuild 489 BLAKE2B e6e62286ebd46e04c217f933d6ff1b45f7e506f2738ce353bcf53583467317e480562519dbafe1b37a231050d4d1e663e3900c96d99e22619c13339dea81b91c SHA512 b9ca291f2c834fe4890b3f99f840be609615a1a41c555ad54f24d7c8c157b00c827c5f77bad0442970e36295dbed27fde328764e19b4a107aa6190285d519e34
-EBUILD libXau-1.0.9.ebuild 489 BLAKE2B d42f8fc926badac6e9eb9486a638c21466745500c2cb8d191c51a5036a007bfe8f7677133e962dfe5fd0ec97e82d5bb107569ac42b02faa0fb55294167071350 SHA512 373b4f5181f1f831142be802d5b312cb0ba2717e967f23269e82278652a87bd0e0da65d606e1a7c874a2f128cace73bf601ea9c05bf827c47f7263d972f34619
+EBUILD libXau-1.0.9.ebuild 486 BLAKE2B 340e4563cd4da5b9e2479c22fa62582060f4f57ed9748167c6473671601a61cf064c1ef5f90f49700dd4d4748e4c89be6d74dd9a49549393e3fb18a898fc7631 SHA512 3443581f64695c4758b18f4050f050ee45a7c8e73da71ac6473222e123cab2559055d82254d8a6ee5ff80d62930f5358dffbf00cb39bcd653d09bc7c09bda177
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.8-r1.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
deleted file mode 100644
index fbf754046123..000000000000
--- a/x11-libs/libXau/libXau-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org X authorization library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
index bd0324e1c3a1..64d78c38f3c4 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 3ee5bc3e429b..a502f6e61225 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,5 +1,3 @@
-DIST libXcomposite-0.4.4.tar.bz2 283746 BLAKE2B d72781ee1352027fab3c6dd543b367757c63d878235e324098c65a47bcafcf9b3404343be0af15743a40c092146493360b661bdc42367502f97667d7cedbb2a9 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.4-r2.ebuild 652 BLAKE2B 8f1ce4cf97bbbf5f348bbfc789302a5a151d720c57f06c446f85658f3109307c9439c048bfe1445263d8f9ffb63914f0b15785a6575474e183abd011600a87bb SHA512 aff44cb5660f2dbd1e3d4af73af57b3c0074d31271e6db26bcdf462acd4957cc1996ee1133ae835fc640f6399c57a314aae7ab3256cd45d16e721db170dca5d7
-EBUILD libXcomposite-0.4.5.ebuild 631 BLAKE2B bcd1986d68df8251151ae916fa4a6cb7f68a87c754b959b19dfe6b605c4b46b9673e024ab33846fa3bf1faae42b18d8441ff73d657ec36edd826ce8c688bb89b SHA512 8084d59db2da6b4439f0ffcc485f974361b7b8c66b1e44da975b47c589a8b5fead9835a82a105fedf4a51179f16128f604507b227b282bb9665dc55b2123deb1
+EBUILD libXcomposite-0.4.5.ebuild 628 BLAKE2B a417fb43f8d6eede8361bfbf88e065402663aaa2836dfca8bd5b9c3805da700a651a28befbdbd7c996d5260393ea4691c05f0b924ae94ffc312e755bcd740083 SHA512 fcc8f991b331d81d8db2985509d8029cf9411fc9cb2e03cc5e0d0594a72127a96bc2b0fec48e632449c4c1b2c5db2b05d24c991058c8a1d699e1b141387fe848
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
deleted file mode 100644
index 8fd7cd1df538..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcomposite library"
-
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index f17c60a29d1b..aaf238779f56 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
 
-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 ~sparc64-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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 670eb1456740..c95f14639c42 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,3 @@
-DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.1.15.ebuild 893 BLAKE2B b5faf01d58308ce71a746862a5e8b7a36cb4045e76ae3e020cb110f5cf769aa9f7867c035a93185fe85b72ae2268531bc5e77746782a2961cc838ce68770ddd0 SHA512 7784aa763260620de0090b04669d8aee49b81433aee71ff49ae356c5ff0827a941e66bb3e241c115e45016ab47a8ad0ef2841e4e5862e8e8f8c61e90b24227ab
-EBUILD libXcursor-1.2.0.ebuild 899 BLAKE2B b81dec8fd52c916feaa6f8d3946b0bab794f10aeefc894808ed3ac03558027b68864721312fca36be59ccb326c9b69cbb36749a6bac439cde17c72bf300e059f SHA512 130d423fb91eb2bd88f72edc263fe274f23aae90bab4184bfc67b6a70b6fb1ae7ad3217b3e148fd7e351de2f88568463099276a09f614fbe38a0c9d1fe47c62b
+EBUILD libXcursor-1.2.0.ebuild 896 BLAKE2B 400b1592d19bae78c3a4915eec58b4d71ad1eb3b8776bae8f8054ae6bee251d8285019078c9877de893d288bd252ce1e83de2d81d31320828b8438e4f80da80a SHA512 af4d507bd55ac530e06683727cfb3cc0ff5467868237420976953dca810f820bb486c7af53e16a28ddf036e3947c408b3663bb2b8bb0e841ce1ced8348eac360
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
deleted file mode 100644
index ec8fb077180c..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcursor library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 9d764b6b5071..0b21cf280e71 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 4afd0da3f351..84445cc0f1dc 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,5 +1,3 @@
-DIST libXdamage-1.1.4.tar.bz2 278937 BLAKE2B eff95312ae989893904fca167075c10a784222db1ba4850d941f26c4235ae39ddfa242037e48ccc4b7912c27bb5e92b58eb61d7ac1ee6185d0b872b0be3e0ed1 SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
-EBUILD libXdamage-1.1.4-r2.ebuild 534 BLAKE2B 5065cfdaa923f7e8b28ce657d34e84e5806d54a1b781a352a4d8a3e8bb1fabadf5c823a375a2ca9090fa516713d00b8562053e2004c05bb1bb918e143f11dce6 SHA512 c3407dc97ba81df8c69bb11bc92ceb13c2c3652ef4d7669c1cb5407d2cef45957c9bb9d03ee52c771ceb4c0771c62edd8ccdc4374d93b82869ddd6c9b711326e
-EBUILD libXdamage-1.1.5.ebuild 539 BLAKE2B a0940d1117b79f803ede83d715d145e62d517876c2ae333f582c771a324b09f0c05a04709ae1c901e349ffc3fd16ae8723646ee9e75dd422a88b3fdc865abd5b SHA512 5f6b042cb1f604e847e28309e632c80f6505b62517acdb6387aca692429c164cbf88368663bf1c9f3521fa62cab5b6f8961bfd72f63bd87826e72f6d11cba8b7
+EBUILD libXdamage-1.1.5.ebuild 536 BLAKE2B 4031fa1ac1252fa8d1cdc5a430e20836d5ef4b99c2452aa2c54747b5e8fc7eb6fbbc0d6522c075866c7732b9c92fc3a4def62a427ee3d252bce2e7a7a6c7202f SHA512 72f3a59f31c8f0aed54a7f989cceb2dae8cd2af4309e94ea9fc2ce93e466a5cab4e1e10cf1e757249f01f12fc5a441866ddfe21106c57e8f6c68cca8c84240c2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
deleted file mode 100644
index f790a4d81191..000000000000
--- a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xdamage library"
-
-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 ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 4a6df1638fbc..d3d80e924f66 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage library"
 
-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 ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index f541fec79f43..98d6cf4835b2 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,5 +1,3 @@
-DIST libXdmcp-1.1.2.tar.bz2 331518 BLAKE2B 1a6f98d03a2bce62cdf34be641096e0628ea133a1d2ce33d4cf35550c6cabddbe3519265644d44bec491bc246d7e1d361c86595b56d1d59fb72baaf6d1919316 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-EBUILD libXdmcp-1.1.2-r2.ebuild 685 BLAKE2B be687e3a7b1b78fac3c84b45523c3e4ed3f36a1d3c50637adce258e8a3fea4be0b4f13c45ea211f8cf418574bb9280a4f46d886a0a5f4bd050240bd816c12fe1 SHA512 66f7b3772682c81d047c65c670cc0993f111999d041436fb1dcc86400e319be836d49b087a9a600466ad55307e3abe30eb74cbaa779aee205b7bdfe1a70f71e0
-EBUILD libXdmcp-1.1.3.ebuild 666 BLAKE2B 4329df4b878f4730bd94f243490f0d80814912a12c896b2abda865de3d03ba5773972461b622845918ea75dd24c26f9ecae1b14481f7fec37a70395ccf232789 SHA512 442c8210ff8920a85b75c4de63f7413f21aea606d86b71688bb4dcd5fad2c355c01d4e1730be8e2e37f4e42ec485ed677a2b3124ea6679e1d525f87c0f0bdbcb
+EBUILD libXdmcp-1.1.3.ebuild 663 BLAKE2B b4d1c6d7d567a7d0d26aa266a89840b43e674ab34ddf15b22eaa49beae13a15b31f65c14b0f63d69523d28fe1b4591ad896759c35d1841194bb8708c2f061479 SHA512 09882be70d3836bd3695d0bfdc61c095ad599653789aaffaff86e142c7e7bb18b218056076aa674b657cb99b678c4c114cd11649b367fe1040513056cd60a249
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
deleted file mode 100644
index d5a2fe314b11..000000000000
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org X Display Manager Control Protocol library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 36bb97b6f3fe..564516ba151b 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 679dd54648bc..dc8fd508de96 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,3 @@
-DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
-EBUILD libXext-1.3.3-r1.ebuild 676 BLAKE2B be1c3db0252893768f8a3be19467e9a05749951636c9f9eedbce5d29125ff51df9c89d20794b6cf35f7697d311c284019d2a369125194bc8e0f5d24c62070574 SHA512 247e2f6c5f496a499f327ea9d7b34fe6ec46da8140e50e8e887d94b7a3e69d6b6bd41460ce8be3a970f441181fcf8400cb8bcc031180efeac08bcb3c0f1744ac
-EBUILD libXext-1.3.4.ebuild 650 BLAKE2B 586799d1de4c27641bd908ad2ce8a61ea6c06d20c6f4b860d7f47ea99ea3adfde55d36c102aac15f7948479377912615c3856d97ee56466a5a6c33878223090d SHA512 01f61fb5f80670e14373357dc7b4b85d5469465c42f8f25d0e29d28a222442959b01624bbb65aadaff5cf2f030a00ca825ac859186a8ff1631b50e7d870287ff
+EBUILD libXext-1.3.4.ebuild 647 BLAKE2B 7c9893a4130d3cd4520de16c2b7fa6a0e84c422d8f263e7045925fd53d470e58f065146dbd365f801c11b493d1c7dad7b2cf49924bc68182fa1219e6808b8a25 SHA512 3482500758dd3efd4e7d430de65bae81dbd6497236c5ac4dfab3c21bbd4c3b73e73990ed2423d7131ba0ef145f26204f85c4b729c1b34523350c020bbdc33862
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.3-r1.ebuild b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
deleted file mode 100644
index c318766369be..000000000000
--- a/x11-libs/libXext/libXext-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index c84b7063ed1a..97d36d2819a6 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index e9ea10d19ddf..d4b2169928d7 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,5 +1,3 @@
-DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
-EBUILD libXft-2.3.2-r1.ebuild 744 BLAKE2B 03dd006dabbb23349fdc3700bd6e6cf2b0d39f394f143f1bd15a67ab6f0159eb4359f78d031d9c2daca449196b1a55214148f4b7394099a496f80e5628b8ce61 SHA512 047fee7da75a91b71e9f77d8cd9f0242e9e1bab9de1eb0ebd56c0c36b6e1d3ca72d4302dbb6fde25bb9beb9ccc8b3b0e0a761124b328720d68ca27416f41d531
-EBUILD libXft-2.3.3.ebuild 734 BLAKE2B bbdb8cc3327310652e735697b17f772f875bb5fe14f540bb8d93727d2b484870b43ff69a0682da7b72d2e3e3d55c10f279e42e80ed8999af36bf8a0d03f29c1e SHA512 907280343110624fbe9ea64cbc30a65931edb5afe899ac89634086ba43f36055172ddf041249f9d398f28a29aeb36661660d471a19455b224f79d1b1277e0f29
+EBUILD libXft-2.3.3.ebuild 731 BLAKE2B 3484e5bc2936d6c1c83ef25f6475b461670cb633e7d995d8a23389508ec5fe928e23af9e430b7de38192193b6ff4dc6e8a162c03a04117df15f343306cc64f32 SHA512 731f8ec97925a4a60537724856f20fee621221623726b8625e15e539d22d60914911a4dc7373d26f74099e45f4b8b45e7605eaf0693394f4171ecef7401813de
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.2-r1.ebuild b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
deleted file mode 100644
index e93d08c43e2d..000000000000
--- a/x11-libs/libXft/libXft-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	virtual/ttf-fonts
-	x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index edf889018a0f..88f315e0188b 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index ad6fcc2c2bf7..310713bde9c7 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,5 +1,3 @@
-DIST libXmu-1.1.2.tar.bz2 396230 BLAKE2B adcea6ff4c9874b8f7022b236f9c0f76f6291b61ad2bc3ef16f9021d49c2cdee01b07e0bfa46afe3636bdbf2802f2c63f7e01854c1e0ca7acdaa274d348b2eb1 SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
-EBUILD libXmu-1.1.2-r1.ebuild 776 BLAKE2B b60176763dbeb092bf2633c953bb43a08148a512acf4178504b7ceefb41565acee26d1105782e8cab0e2f3b4ee939eae8e510942f28ac7e3587195eed561c14b SHA512 e1215d6808338ddf17a0f3f5e2a1ab6578f203e236baa381f65bd898e9bcfc55642a149f0b755d93aa3fabdff888b0c77b9bcdbfc94a983085937851764683a6
-EBUILD libXmu-1.1.3.ebuild 752 BLAKE2B 440a99c5a907b195bb847248361b7bd782e950eb88562c1c85738c7465225466e3cc9c6f7b00b49c5e5cc34916456172b0af8e9495fafd8ae6a7aabdf3d1ce51 SHA512 8a655d92583843572adf33ed664f10c41363ab3ccbb9a69dcf4bf545b6498c0dbf00eb886a0de5d3a05462a58fe65cc4b46475bd26049234113c60880970808a
+EBUILD libXmu-1.1.3.ebuild 749 BLAKE2B ae06db01c04fb015de8e26fd11741eea20f9bffc113f7225453c070a59d3a574a9eaac249f685260289134f2e4239583a1584d68d7ee8d872aefd3c631be26ef SHA512 085c2d6481654f710862781fa852d7020f68f9c1857c9949f12e427e805d67645448039a462ce21924bb2a8df322f7ebd0ac7b1b84d132f3d3ba67e7a8d46e49
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
deleted file mode 100644
index 4e3fe40f06f7..000000000000
--- a/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 842e4ca7c33f..cb88bb9d38b5 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index e3c2a9a137e0..833235e9cf7b 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,5 +1,3 @@
-DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
-EBUILD libXrandr-1.5.1-r1.ebuild 611 BLAKE2B 06fc667d8e66764bc37abad74f6445deec1ca70147cab1080c32e7c26f241bfb3b22dc44bf6ff95056d1cb2ab4d6f4f26f57a09b8be309a221068ea3f29f5b77 SHA512 0d5275e585b7b8cf645e39ccc556b80fe5420c4ed37dbf27ed6498291b8b0e532dabf34d62d4057f54e41b379d83ea9fd90deeaa6866e4bc77a74e15b2b82561
-EBUILD libXrandr-1.5.2.ebuild 616 BLAKE2B 5a4eb2a5385393baeede1cb027d1ee671d1933bd48b6060a24b1a869c33b48934fe4ef7a35e90071c06d9247434db998a2e5a02f1fc9c4e58554802a988fdf13 SHA512 ed52cd2e0f5551c03563bbdc1b44f580a7558afbad008a9f5c3aa5012554eb68bb536517ebb056e0abc306eb5fb00d488c448c26afd010cc4978142b65dea1c2
+EBUILD libXrandr-1.5.2.ebuild 613 BLAKE2B 91faa071a40ec67a21b48890ca6166b675cb33c86e5c8d7584e095e1b4f3bb848e271b499291390467f521e92495298072b291c6f41c78cfab3951931c4a6b95 SHA512 b9b61852f94ffe8fecaf20ca292428ff4befd1ad56d9175205ad2dae22268750dab8da0037d5d4604e74f8417d724d035e4d2141cda88220d5f664cd03251826
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
deleted file mode 100644
index 0a80a41e1842..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xrandr library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 0260ce681230..8ede69321012 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 0dfc6bb627f9..f4082ffae07d 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,5 +1,3 @@
-DIST libXvMC-1.0.10.tar.bz2 313887 BLAKE2B f5440e60c29e83be8945d215e484a995547411fa8e96b2fbf757b93bc618b5d1083f41ccc770c9e8f4b0e13e6230968575aa7054f036ed2443b85b6301078930 SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19
 DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476
-EBUILD libXvMC-1.0.10-r1.ebuild 562 BLAKE2B d414cbce81c1f625685b9684d17e6c568b659222ad12bdda3469c193ec6d7472305d1f0db8133a2b3fb4684a9e2351e6f775fd2d3679fc266a30c412dfa68f3d SHA512 5b9daa16cf33ca27e14219a81d83222c644c2ca6938ba2e2d2c20e7ce1dac32e1aa6fdf44299e0c40435dbca00770d3742c1fe90e3bcd032177b4bea3ac2c8d3
-EBUILD libXvMC-1.0.11.ebuild 564 BLAKE2B 6294b3495554b806c7521b252d776b46be7885dbe231b5fde473df652fd99ab454fd0bd9bf964b9289692789c612274d36ac3d24ad165471f21c692b3fce3692 SHA512 f7a229dce65be6ef562d8d3c0e102167f77134af7c4e1afeb46eacfe4d7608a9e3bafe13f83958e9670590b449ad20820c736bbaa4b7cdc957a09f39e0140c57
+EBUILD libXvMC-1.0.11.ebuild 561 BLAKE2B c953baaf4ad3a58c66d04548d61cf43f2b4c21a78dcd326e08ef3784c8a860de9c2a80e9aaee205afaf6ce6a8910e7c4bbbcbe9392e1405e193afa86bdf8a366 SHA512 ceb481b9ed6f856150da175cebe9a1142279e0ee95faac19d0ab7485df090ee421a16a64e309b4ae16e1a1c830a9909ac9ce58619a5e0654c50b96687b90c148
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild b/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
deleted file mode 100644
index 8202d43fea00..000000000000
--- a/x11-libs/libXvMC/libXvMC-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XvMC library"
-
-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-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
index 558799d0a327..85a4fb51580e 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-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-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-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index aef515991932..3ca9eb0cc881 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86dga-1.1.4.tar.bz2 280216 BLAKE2B e67a1e2fafc91cdce5b1d4f4ad2083080656f27fceaf167fcf6626c641f1dd7fa14ebe4f8508042ef0489e0fd689b05f6088487b9eda65995888158452898546 SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
-EBUILD libXxf86dga-1.1.4-r1.ebuild 500 BLAKE2B 21c0be8f011be2de53a59f3300757086e8f59089460091f0557203edac6c80a108249482d3ffb5f8c544cb116640fd58a7f5a6eb1d092bb9111f8bd43e00d16c SHA512 b5f69baa57f912ebe24a153cc74549fac5640fa919b0703a9e6780da11a7278d6ccfa6c1c3692c08f1c95e2e78702d90b92d3d62336221cbd428c252be349463
-EBUILD libXxf86dga-1.1.5.ebuild 505 BLAKE2B 742e828d1db1f4e3bf9bca538783aeb938c2a23ea44f3c40ecda0e54358d45d938f2c82726f745ff93585001f4328c2bbafb2204ef718a609e85f9f7f6ca6b8a SHA512 fbfbeb200d6baeffe7ddaa3923d8279fc94204722bf6fb283da06c49bc315cc3273576471da944f4418313b8b82faf79930c64aa81140c11887367dcbe1d5bb7
+EBUILD libXxf86dga-1.1.5.ebuild 502 BLAKE2B 941323657c99d3fe5125d7c690079ccbf69310dcf5d33766df0bf00e478aee239a579b137d08f7e0e255cf8fa75c6975c06206af1c19a39c5ab48de2046bb434 SHA512 a8408808f023fe42e2ea37dd016e2b0154c94ef5dd1f12c4967aed0b9d4f1cac623430ff803e13a17d8d73bf745db1660dd27a2148e15c69f634ce68b1a3e9d4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
deleted file mode 100644
index 435d1ae79aaf..000000000000
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86dga library"
-
-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"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 0d6f5909b7aa..8f51193b1a57 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-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"
+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"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index ef7308e01ed9..f1c7a8adce90 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,3 @@
-DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.3-r1.ebuild 539 BLAKE2B ecb19be659b4c3196f61a601523a60c1dd71efe169aafa26eaec87233803d6ea0390e20d64438549fe5f4bc6cebcc1578b0c7a7a5408d6e9bf3416ab3fc8a8f8 SHA512 afffae656694c41c6ea15be00b4efcf1cc0ef2377ab46c99577497495235fcecf5230b0f3f58d9db5b6cc31f7d55cae34c8762121522e9bee85e6179c23aedf5
-EBUILD libfontenc-1.1.4.ebuild 540 BLAKE2B 30d8ddec3ffce144ccf6cf6f1d2e7d94dafa784d8e7fdceb336116c2e62673cc6ed7bace91adef098bf0355c21e781180a139aa2e8fa9e5dca234d4a26e49d90 SHA512 db1307bb1fd9ed648adc71e690aef902dfc0ba53ea3d98e28c3709ebdf4497145b38c182e1f1ec1c33b2a282d3ce11802ef163eaa418ff32599581aa22270b29
+EBUILD libfontenc-1.1.4.ebuild 537 BLAKE2B 825fa6e31419ca70f6e1e159ada681fd177054cb30af49691717c9ea7c2dda074b2b7162101554d804751cd2af1a8dff21f313f089c59533ebfe3f92dc8ff47c SHA512 662015465c78c282ce7b1fd0354bdce58faa85a8f3a15cce688442396d36db2a14369396050050aa9ac4901166f6dedb348a756bb052d8e1b227becabb99a39e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
deleted file mode 100644
index d2b4e89fe49c..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fontenc library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 780869d7c306..6d9ac818b874 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 8503603c7e10..f0dbfe3f8c63 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,3 @@
-DIST libxkbcommon-0.8.2.tar.xz 644040 BLAKE2B c323384308d9730924d6f1cb7ad55fdb3d1a37289f648b981c54dc5997c67c857d33f8ad872fc7646b462ebc97252dca30efe2a2e12d1f1f08a8a1604a5de23f SHA512 b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172
-DIST libxkbcommon-0.8.3.tar.xz 646124 BLAKE2B c80d5065395ee8adec436243cf42fa82a05a5797be711b4e10d70d92ef742c707f034adf870480e1797e1b05135b5ce644e6ebefd036aaac7d3fb7435b5bd543 SHA512 0a3dfacc17eddfc10fe3edb946bede5070f2744effe642bd96076996f262a41addb691d62c0d738457da522d1fea02c297c9a2a8b1f56521adbf50ca917577c2
 DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
-EBUILD libxkbcommon-0.8.2.ebuild 928 BLAKE2B 08e1d3188c38bc14a9ba866d530e1768a2b8f4b13d1ad7eed9e342d54049e7e4f2c3e39d666b9ecc95e4f325720cb66ada4ce7d485a46dddb5e8c6937d4e75de SHA512 6717271f5b12543c3a47bc53c2d181bef7e2552c5234de51c693dadfda3f6287e41755674720e9fb31df3002fa8357f74e711c4637be195b8626b62ff3121f71
-EBUILD libxkbcommon-0.8.3.ebuild 939 BLAKE2B a9d45b076253fa3757162f9652ef043404b08c94177326e77bc0a6d36da69e07916be6b04ee9f81a8025358f4760bfdc90abdfa92650273f3f4c2a3d074ef670 SHA512 d380a6b36bedca1f265b75ca9a51ae665daff47d6e8b2555b80d74bea490e040eb947e0f9c25b030631cc849306684c4112c9dca95a9dcea51200e70e36f23d9
-EBUILD libxkbcommon-0.8.4.ebuild 886 BLAKE2B d75685ea2523577a68aa857cc41ee38553f6dd499247f340e23969f7737e0caf8b2b6e03f294fdd06a6a61e6c59c31002a64ef665bcc84ea48e1c7bd201176fc SHA512 d4c5ac673393cbb8a63306d2d05f3243d4c80bb3c6945989a2120e0656b29c2a7164f5fc6f9a7f813bedb91e0f599b5b094782462ed0f42a46aee7843f445a03
+EBUILD libxkbcommon-0.8.4.ebuild 883 BLAKE2B a15d0aa82065f12f9259df5d3e578525b10e5f1448764d9286da355fbddb756448c974628edfe1cfb30cd51db79036836a680ff8eef8ece73f185f03ec1f0d75 SHA512 e8df23bcc8d74d04264c2fcfbecf563d7b01960b929bde15d1d139de915a74098c8c17c5a87b0c9fe0bbcfe3f8324eb072c4cd9a78f134ec8ecf703dd99e1141
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild
deleted file mode 100644
index 8b8354c2a772..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-	)
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild
deleted file mode 100644
index 20521c37215d..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-	)
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
index e81f7cc5c56b..2b838286091f 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
@@ -17,7 +17,7 @@ inherit xorg-3 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 BDEPEND="
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 0f5be0d2c1c6..1ca265eed39f 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
-EBUILD libxkbfile-1.0.9-r2.ebuild 505 BLAKE2B cca836f2f61bcacdaaab12c2a3c441ce79788acb124fcbb2b69f4582c5e2d9659979ffce730912a4f174d2b464cc1dde7b0eae5ff624b9b9cc94cfe3217597a0 SHA512 652743dc378993a03bf281df0da9da023b0227e31fa37e14cc340376e3b73c5881fdaf6f1e365159102cc53ed93de9997c97f13c6ce8666a5c2d3f3234077e65
-EBUILD libxkbfile-1.1.0.ebuild 508 BLAKE2B b8ec40658c3b1a2e6612a78710a1c20c87fef66d83293b47a514d7ea5eb12cdbc08bdb9fe2b54671af8aa016d4a0bb9f84b4b14210a8d4bcc3d1949f472258a8 SHA512 97810c2e2f5f3e06be3afee496b43ac4214ae1c285ced5e416b23f972da2dc8edbafb271ed1cc667bb36c4d2a8e66419098914b781923be75963dfb5ea37d38e
+EBUILD libxkbfile-1.1.0.ebuild 505 BLAKE2B 9cd957ecca930acf400f7a771f27ad83ac43d2f90c4f4e06a6e7eaa6725d1d884b5c3fdaf8648a3b785e9529001cea13ca56982610117e3bfd07b6b9afbcffcc SHA512 67806292bb103b646792eb770cc472823b4c565e4f6e214aa9d99d2b65ec101ce32b930c996df62c1ed75b1f6513c8eed743c2b250d95fa25847e5ededab16bb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
deleted file mode 100644
index 3885ddc9a6dc..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbfile library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/libX11[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 330d08e566f8..15eb831dbc34 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 4e0cfe17ab52..4f8acbb2e08e 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,4 @@
-DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
-EBUILD pixman-0.36.0.ebuild 1011 BLAKE2B 39bdaceeb38639ce856d207792a88ee7f1237cb2b0ac8ca34d93503f3ce3b69146ea015657e7a9b55481f59a438d29ba491711716d7820ede4620d9dc56e7118 SHA512 034b0716e27095c89beeaa0bfcc12032a1d629800d91b308fea8de21e5c1f369fdf62d1ab14188126c8eaf7b3f802d5e007cf1fd7e0b0f1e5cf9f7673c5e8978
-EBUILD pixman-0.38.4.ebuild 1623 BLAKE2B 11cb9273c2a62526645c957ab6a652a8a3e0e1a6af157e0bc067dfd1cfb67e375367f5254259c56ad694fcc63f0bf7fd05db19df9853ffefbe2a2208bbd6ca11 SHA512 85f0a56b2b757bfdb98d49ba803fe8a65077fc86063afbe3188299db8ce98c60dcf15c994626ed999a8f01bbf32e598dbcd69bb936e3ec2a655dc7b63803e832
+EBUILD pixman-0.38.4.ebuild 1620 BLAKE2B 593dd2d9eed6c74ef03b5f93891b761fff42179b25b3a9d58d323f2c6af89c94a4673b72e4fe971a6c07fdffbe7fab2861094363eaa563cb0d96552d78629a9f SHA512 969252535e65df7c4cbca27c20ec80c1849ac03f0048e1882eff4c6971ee00318aed084f1c9aa6f044a72beacb372c38eda4db89f4a36bd92d1270bc72a4fd8a
 EBUILD pixman-9999.ebuild 1631 BLAKE2B 9d7f4de4ba2af8d0f5ab6b6e1112380897e82ad46bf8ba8345ccb5cfe8007a307b1ec7cb4550a220bfaa3332ea90122a29f0eb95e66dfee9aa70c668b2a5e0a9 SHA512 005dd50814a4f8d6ddfa399f573ca92f3e7825f2ad02f3a8e6950353b532aa5c21063568ddd5bb0713bbb6cffda6a9e0ecf4a308068ed4e1126fa9ec377a626f
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.36.0.ebuild b/x11-libs/pixman/pixman-0.36.0.ebuild
deleted file mode 100644
index 118922ce9112..000000000000
--- a/x11-libs/pixman/pixman-0.36.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-DESCRIPTION="Low-level pixel manipulation routines"
-
-if [[ $PV != 9999* ]]; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-IUSE="altivec loongson2f cpu_flags_arm_iwmmxt cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable cpu_flags_arm_iwmmxt arm-iwmmxt)
-		$(use_enable cpu_flags_x86_mmxext mmx)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		$(use_enable loongson2f loongson-mmi)
-		--disable-gtk
-		--disable-libpng
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index d8a7e4dbca4f..3fbd5e9c8325 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 16d08aa44d1c..26c07f9eb0fe 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,5 +1,3 @@
-DIST xtrans-1.3.5.tar.bz2 186833 BLAKE2B 890506df749d9a1e873ff626614bfd0989115916a896baaf811d0e1568fc939073f8226b096dfda86f5c917b7af72478560fcfaa7d8fb160107f9adddd0091d7 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
-EBUILD xtrans-1.3.5.ebuild 695 BLAKE2B 9433835133efffe7a141f536e3ec894339200253ff12236ad04079791c924d172f44ced45a3cb67d009802d0b39a00e50b9212e462e02d02f4818465092d8809 SHA512 a87771ea8b4d07565d4e5c595a7a7723cd5489ffe2b5ad1164adac7fb242e69dbeab8f1d776bca9862be35a6dbe7c2f8ec6f80ce39a78a36db6ea4601d74ce9d
-EBUILD xtrans-1.4.0.ebuild 659 BLAKE2B 8281ba9a6fc1f6a87bb664f65d4cbad1414ec637eeafb2d5997185161a5f8677ceac2f1000f93f19cd08331815487e4b2f12b160eb1efade9bfe4f6b06d1f78e SHA512 87010f2d4662b0d8e6fdbd90c0627d584e3c7914c349477e3c42e26da8211e281b0ce67287126f128ff0829744b396f9746a1ca365ded3890533601036309bac
+EBUILD xtrans-1.4.0.ebuild 656 BLAKE2B 264ef8237eda66362c99046435a8e1c5b410e8e2b75240056faf964110c137353781b44bddb61e6d9708dacc4c70dc3d79ccdcb3dfa114907852099e596506e7 SHA512 4461ed7de4c9d0070392558bc030b51e4112eaf9a61ab8ff137f0796d7af3b0fec35c382d50846d8776f73437ed2b8eb5d3ab55ac835e7acbeffb4f3ddb749cf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
deleted file mode 100644
index 2f0195136379..000000000000
--- a/x11-libs/xtrans/xtrans-1.3.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_PACKAGE_NAME="lib${PN}"
-# this package just installs some .c and .h files, no libraries
-XORG_STATIC=no
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index 7290d4569957..d3841390aa30 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""