Sync with portage [Sun Aug 23 21:40:38 MSK 2020].

4 years ago · 36a937c6d2
parent ee1a39d74a
commit 36a937c6d2
2729 changed files with 19882 additions and 35429 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/named/Manifest
+++ b/acct-group/named/Manifest
--- a/acct-group/named/metadata.xml
+++ b/acct-group/named/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/named/named-0.ebuild
+++ b/acct-group/named/named-0.ebuild
@ -0,0 +1,8 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 ACCT_GROUP_ID=40
--- a/acct-group/sanlock/Manifest
+++ b/acct-group/sanlock/Manifest
--- a/acct-group/sanlock/metadata.xml
+++ b/acct-group/sanlock/metadata.xml
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/sanlock/sanlock-0.ebuild
+++ b/acct-group/sanlock/sanlock-0.ebuild
@ -0,0 +1,9 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 DESCRIPTION="shared storage lock manager"
 ACCT_GROUP_ID=340
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/named/Manifest
+++ b/acct-user/named/Manifest
--- a/acct-user/named/metadata.xml
+++ b/acct-user/named/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/named/named-0.ebuild
+++ b/acct-user/named/named-0.ebuild
@ -0,0 +1,15 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="User for net-dns/bind"
 ACCT_USER_ID=40
 ACCT_USER_HOME=/etc/bind
 ACCT_USER_HOME_OWNER=named:named
 ACCT_USER_GROUPS=( named )
 acct-user_add_deps
--- a/acct-user/sanlock/Manifest
+++ b/acct-user/sanlock/Manifest
--- a/acct-user/sanlock/metadata.xml
+++ b/acct-user/sanlock/metadata.xml
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/sanlock/sanlock-0.ebuild
+++ b/acct-user/sanlock/sanlock-0.ebuild
@ -0,0 +1,13 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="shared storage lock manager"
 ACCT_USER_ID=340
 ACCT_USER_HOME=/dev/null
 ACCT_USER_GROUPS=( ${PN} disk )
 acct-user_add_deps
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@ -1,2 +1,3 @@
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
--- a/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch
@ -0,0 +1,22 @@
 From b3a1f6e778c0dad12ce65f9f1fb25354e2667ef6 Mon Sep 17 00:00:00 2001
 From: Peter Levine <plevine457@gmail.com>
 Date: Fri, 29 May 2020 21:18:55 -0400
 Subject: [PATCH] Remove erroneous declaration of editline_history_file
 An extern qualified forward declaration of editline_history_file is supplied in editline.h and its definition/initialization is supplied in siodeditline.c.
 ---
 siod/editline.c | 1 -
 1 file changed, 1 deletion(-)
 diff --git a/siod/editline.c b/siod/editline.c
 index f6eb5c6..138f476 100644
 --- a/siod/editline.c
 +++ b/siod/editline.c
@@ -73,7 +73,6 @@
 /* modified by awb to allow specifcation of history size at run time  */
 /* (though only once)                                                 */
 int editline_histsize=256;
 -char *editline_history_file;
 /* If this is defined it'll be called for completion first, before the */
 /* internal file name completion will be                               */
 EL_USER_COMPLETION_FUNCTION_TYPE*el_user_completion_function = NULL;
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@ -0,0 +1,136 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit multilib toolchain-funcs
 MY_P=${P/speech-/speech_}
 PATCHSET="r3"
 DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
 	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nas openmp X"
 RDEPEND="
 	media-libs/alsa-lib
 	sys-libs/ncurses:0=
 	nas? ( media-libs/nas )
 	X? ( x11-libs/libX11
 		x11-libs/libXt
 	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/speech_tools"
 DOCS=( README.md lib/cstrutt.dtd lib/example_data )
 PATCHES=(
 	"${WORKDIR}/patch/02_all_gcc42.patch"
 	"${WORKDIR}/patch/03_all_GentooLinux.patch"
 	"${WORKDIR}/patch/05_all_sharedlib.patch"
 	"${WORKDIR}/patch/06_all_gcc43-include.patch"
 	"${WORKDIR}/patch/09_all_remove-shared-refs.patch"
 	"${WORKDIR}/patch/10_all_base_class.patch"
 	"${WORKDIR}/patch/81_all_etcpath.patch"
 	"${WORKDIR}/patch/91_all_gentoo-config.patch"
 	"${WORKDIR}/patch/92_all_ldflags_fix.patch"
 	"${WORKDIR}/patch/94_all_ncurses_tinfo.patch"
 	# Fix underlinking, bug #493204
 	"${FILESDIR}/${PN}-2.1-underlinking.patch"
 	"${FILESDIR}/${PN}-2.5.0-fno-common.patch"
 )
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 src_prepare() {
 	default
 	sed -i -e '/^CXXFLAGS  =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \
 		config/compilers/gcc_defaults.mak || die
 	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
 		main/siod_main.cc || die
 	#WRT bug #309983
 	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
 		"${S}"/config/systems/sparc_SunOS5.mak || die
 	sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \
 		-e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \
 		-e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \
 		config/compilers/gcc_defaults.mak
 }
 src_configure() {
 	local CONFIG=config/config.in
 	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
 	if use nas; then
 		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
 			${CONFIG} || die
 	fi
 	if ! use X; then
 		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
 	fi
 	econf
 }
 src_compile() {
 	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 }
 src_install() {
 	default
 	dolib.so lib/libest*.so*
 	insinto /usr/share/speech-tools
 	doins -r config base_class
 	insinto /usr/share/speech-tools/lib
 	doins -r lib/siod
 	mv include speech-tools || die
 	doheader -r speech-tools
 	dosym ../../include/speech-tools /usr/share/speech-tools/include
 	for file in bin/*; do
 		[ "${file}" = "bin/Makefile" ] && continue
 		dobin ${file}
 		dstfile="${ED}/usr/${file}"
 		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
 			${dstfile} || die
 		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
 			${dstfile} || die
 		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
 			${dstfile} || die
 		# This just changes LD_LIBRARY_PATH
 		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
 	done
 	exeinto /usr/$(get_libdir)/speech-tools
 	for file in `find main -perm /111 -type f`; do
 		doexe ${file}
 	done
 	# Remove bcat (only useful for testing on windows, see bug #418301).
 	rm "${D}/usr/bin/bcat" || die
 	rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
 }
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,4 +1,2 @@
 DIST ansible-2.9.10.tar.gz 14237929 BLAKE2B 52230b18efa94dbcbd6e4fba3d0915e2375fc8de7412944eaeefc054f50ea888a1aeb86b688a7ae97184b1a8a10180e67a7004d48906235ce4e1b83976d10e9a SHA512 c0d5e26491f52d1eb8d1c3755903bb6a8d50634df5fb50a970076d49d99cfda424fa60c258a6a5821e01c435a8ef077d46ced4b2f8c4f4a8d381737e6f14afb4
 DIST ansible-2.9.11.tar.gz 14243995 BLAKE2B afd60d69f53c79c778f122db902ba149030fd995650566f6edcfa41178e92d56cf200089b76de3c6999a824725c793e57c222733ed5b9d9c401bccea942cde5b SHA512 b157a5cfb5ba7cb651c7afc0dc92cfe3b8f9eebd06de6d7a1e4917ffca3c542c5207c8e1820acc5be840190c8754f111e2501304ad7e64867247e5b973aec81e
 DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
 DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
--- a/app-admin/ansible/ansible-2.9.10.ebuild
+++ b/app-admin/ansible/ansible-2.9.10.ebuild
@ -1,68 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
 SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
 		export CPUS=4
 		emake -f Makefile.sphinx html
 	fi
 }
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
 	dodoc -r examples
 }
--- a/app-admin/ansible/ansible-2.9.11.ebuild
+++ b/app-admin/ansible/ansible-2.9.11.ebuild
@ -1,68 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eutils
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
 SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
 		export CPUS=4
 		emake -f Makefile.sphinx html
 	fi
 }
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
 	dodoc -r examples
 }
--- a/app-admin/ansible/ansible-2.9.12.ebuild
+++ b/app-admin/ansible/ansible-2.9.12.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
--- a/app-admin/sudo/sudo-1.9.2.ebuild
+++ b/app-admin/sudo/sudo-1.9.2.ebuild
@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@ -1,3 +1,4 @@
 DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
 DIST supervisor-4.1.0.tar.gz 459020 BLAKE2B 0c4bdc2c89f54c08ad536b43852941f1aadb0173013e0f73337302f500b779023bfa0fcf8cc3ace4968cfc724998a08ea5a63680e290051d13c7cd8ac788dd24 SHA512 1ae343293707ebf33d0a0c0bda2c6cc78278e12737940a79e51b2365e7a20b07d9f5e50134ed2abbf8e7af1ebd8f1746002a159cde1cfc35e83fda0a77dae9c5
 DIST supervisor-4.2.0.tar.gz 456056 BLAKE2B 51b66cfc34505b937c47c9b510d81bcc777b9372fdeb2e08fc25153d2718cd2682258b812630160954587ceb992e1a528cdd5bf0d270139f7ffac9463ac2f015 SHA512 626d806f4b03be7cbff795afd1bdb3ff5ca5ecf44f035909ea1aa9360da9fa3047b2fe05543190bf1442f01dcdd403be19fcd907519bf7e26615900bc4bf9d0f
 DIST supervisor-4.2.1.tar.gz 460935 BLAKE2B 0c65f904599c1e8a04cd3a71085e2b2a5460691c2bfd790d3b7c10449cae08472bcd72a870cbe611801434624f405ea3e245f156cab93f25a8df784b58d948d7 SHA512 c560ef959f8d580fb20c1812aa2a838c9feaeb3726a754e8084fa8c7406ff9258139b55b081558b8d8f33e4672cdfad40695170f55412a5e85a6c1aed0f11657
--- a/app-admin/supervisor/supervisor-4.2.1.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.1.ebuild
@ -0,0 +1,54 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 systemd
 MY_PV="${PV/_beta/b}"
 DESCRIPTION="A system for controlling process state under UNIX"
 HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="acct-group/supervisor"
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 python_install_all() {
 	distutils-r1_python_install_all
 	newinitd "${FILESDIR}/init.d-r2" supervisord
 	newconfd "${FILESDIR}/conf.d-r1" supervisord
 	dodoc supervisor/skel/sample.conf
 	keepdir /etc/supervisord.d
 	insinto /etc
 	doins "${FILESDIR}/supervisord.conf"
 	keepdir /var/log/supervisor
 	systemd_dounit "${FILESDIR}/supervisord.service"
 }
 pkg_preinst() {
 	fowners :supervisor /var/log/supervisor
 	fperms 750 /var/log/supervisor
 }
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation
 		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
 		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
 		elog ""
 		elog "By default, only members of the supervisor group can run supervisorctl."
 	fi
 }
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 PATCHES=(
--- a/app-arch/unrar/unrar-5.9.4.ebuild
+++ b/app-arch/unrar/unrar-5.9.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79
+DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c
--- a/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.1-r1.ebuild
@ -18,7 +18,7 @@ IUSE="+fapi libressl"
 RESTRICT="test"
 RDEPEND="net-misc/curl:=
-	fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
+	>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}"
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 x86"
 IUSE="doc libressl selinux" # gtk
 # gtk support presently does NOT compile.
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@ -3,9 +3,7 @@
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils xdg-utils
 inherit autotools gnome2-utils python-single-r1 xdg-utils
 MY_P=${P/_/-}
@ -16,8 +14,7 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
+IUSE="+gtk3 gucharmap nls spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	sys-libs/zlib
@ -26,7 +23,6 @@ RDEPEND="
 		x11-libs/gtk+:3
 		gucharmap? ( gnome-extra/gucharmap:2.90 )
 	)
 	python? ( ${PYTHON_DEPS} )
 	spell? ( >=app-text/enchant-1.4:0 )"
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
@ -48,8 +44,6 @@ pkg_setup() {
 		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
 		ewarn "Disabling charmap plugin."
 	fi
 	use python && python-single-r1_pkg_setup
 }
 PATCHES=(
@ -71,7 +65,7 @@ src_configure() {
 		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
 		$(use_enable nls) \
 		$(use_enable spell spell-check) \
-		$(use_enable python)
+		--disable-python
 }
 src_install() {
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@ -5,7 +5,6 @@
 	<use>
 	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 	<flag name="python">Enable Python integration for zen-coding plugin</flag>
 	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
 </use>
 </pkgmetadata>
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="emacs-27"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 	SLOT="${PV%%.*}-vcs"
 else
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
@ -18,12 +19,20 @@ else
 	FULL_VERSION="${PV%%_*}"
 	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
 	# PV can be in any of the following formats:
 	# 27.1                 released version (slot 27)
 	# 27.1_rc1             upstream release candidate (27)
 	# 27.0.9999            live ebuild (slot 27-vcs)
 	# 27.0.90              upstream prerelease snapshot (27-vcs)
 	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
 	if [[ ${PV} == *_pre* ]]; then
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27-vcs"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
--- a/app-editors/emacs/emacs-27.1.ebuild
+++ b/app-editors/emacs/emacs-27.1.ebuild
@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="emacs-27"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 	SLOT="${PV%%.*}-vcs"
 else
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
@ -18,12 +19,20 @@ else
 	FULL_VERSION="${PV%%_*}"
 	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
 	# PV can be in any of the following formats:
 	# 27.1                 released version (slot 27)
 	# 27.1_rc1             upstream release candidate (27)
 	# 27.0.9999            live ebuild (slot 27-vcs)
 	# 27.0.90              upstream prerelease snapshot (27-vcs)
 	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
 	if [[ ${PV} == *_pre* ]]; then
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_BRANCH="master"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 	SLOT="${PV%%.*}-vcs"
 else
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
@ -18,12 +19,20 @@ else
 	FULL_VERSION="${PV%%_*}"
 	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
 	# PV can be in any of the following formats:
 	# 27.1                 released version (slot 27)
 	# 27.1_rc1             upstream release candidate (27)
 	# 27.0.9999            live ebuild (slot 27-vcs)
 	# 27.0.90              upstream prerelease snapshot (27-vcs)
 	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
 	if [[ ${PV} == *_pre* ]]; then
 		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/emacs"
 	elif [[ ${PV//[0-9]} != "." ]]; then
 		SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="28-vcs"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 RESTRICT="test"
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@ -1 +1,2 @@
 DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
 DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390
--- a/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.36.0.ebuild
@ -0,0 +1,49 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 inherit gnome2
 DESCRIPTION="Integrated LaTeX environment for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+introspection +latexmk rubber"
 COMMON_DEPEND="
 	>=app-text/gspell-1.8:0=
 	>=dev-libs/glib-2.56:2
 	>=dev-libs/libgee-0.10:0.8=
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.22:3
 	>=x11-libs/gtksourceview-4.0:4
 	>=gui-libs/tepl-4.4:4
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 	gnome-base/dconf
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	x11-themes/hicolor-icon-theme
 	latexmk? ( dev-tex/latexmk )
 	rubber? ( dev-tex/rubber )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50.1
 	dev-util/itstool
 	virtual/pkgconfig
 "
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable introspection) \
 		--enable-dconf_migration \
 		APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0
 }
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@ -1,5 +1,3 @@
 DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
 DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
 DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
 DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
 DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
--- a/app-editors/scite/scite-4.1.3.ebuild
+++ b/app-editors/scite/scite-4.1.3.ebuild
@ -1,119 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit gnome2-utils toolchain-funcs xdg-utils
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
 HOMEPAGE="https://www.scintilla.org/SciTE.html"
 SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 RDEPEND="
 	dev-libs/glib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3=
 	x11-libs/pango
 	lua? ( >=dev-lang/lua-5:= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S="${WORKDIR}/${PN}/gtk"
 pkg_pretend() {
 	if tc-is-clang ; then
 		# need c++17 features
 		[[ "${MERGE_TYPE}" != "binary" &&
 		$(clang-major-version) -lt 5 ]] &&
 		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
 		($(clang-major-version))."
 	elif tc-is-gcc; then
 		# older gcc is not supported
 		[[ "${MERGE_TYPE}" != "binary" &&
 		$(gcc-major-version) -lt 7 ]] &&
 		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
 	else
 		die "Either gcc or clang should be configured for building scite"
 	fi
 }
 src_prepare() {
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 		-e "s#^CC = gcc#CC = ${CC}#" \
 		-e "s#^CC = clang#CC = ${CC}#" \
 		-e "s#^CXX = clang++#CC = ${CXX}#" \
 		-e "s#-Os##" \
 		-e "s#-Wno-misleading-indentation##" \
 		|| die "error patching /scintilla/gtk/makefile"
 	sed -i "${S}/makefile" \
 		-e "s#^CC = clang#CC = ${CC}#" \
 		-e "s#^CXX = clang++#CC = ${CXX}#" \
 		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 		-e "s#-Os##" \
 		|| die "error patching gtk/makefile"
 	# repair and enhance the .desktop file
 	sed -i "${S}/SciTE.desktop" \
 		-e "s#text/plain#text/\*;application/xhtml+xml#" \
 		-e "s#^Categories=\(.*\)#Categories=Development;#" \
 		|| die "error patching /scite/gtk/SciTe.desktop"
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
 		|| die "error patching /scite/src/perl.prperties"
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
 	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
 	eapply_user
 }
 src_compile() {
 	# prepare make options
 	local emake_pars="GTK3=1"
 	if tc-is-clang ; then
 		emake_pars+=" CLANG=1"
 	fi
 	if ! use lua; then
 		emake_pars+=" NO_LUA=1"
 	fi
 	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
 	emake "${emake_pars}"
 }
 src_install() {
 	emake DESTDIR="${ED}" install
 	# we have to keep this because otherwise it'll break upgrading
 	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
 	dosym scite /usr/bin/SciTE
 	doman ../doc/scite.1
 	dodoc ../README
 }
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ b/app-editors/scite/scite-4.2.0.ebuild
@ -1,119 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit gnome2-utils toolchain-funcs xdg-utils
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
 HOMEPAGE="https://www.scintilla.org/SciTE.html"
 SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 RDEPEND="
 	dev-libs/glib:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3=
 	x11-libs/pango
 	lua? ( >=dev-lang/lua-5:= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S="${WORKDIR}/${PN}/gtk"
 pkg_pretend() {
 	if tc-is-clang ; then
 		# need c++17 features
 		[[ "${MERGE_TYPE}" != "binary" &&
 		$(clang-major-version) -lt 5 ]] &&
 		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
 		($(clang-major-version))."
 	elif tc-is-gcc; then
 		# older gcc is not supported
 		[[ "${MERGE_TYPE}" != "binary" &&
 		$(gcc-major-version) -lt 7 ]] &&
 		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
 	else
 		die "Either gcc or clang should be configured for building scite"
 	fi
 }
 src_prepare() {
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 		-e "s#^CC = gcc#CC = ${CC}#" \
 		-e "s#^CC = clang#CC = ${CC}#" \
 		-e "s#^CXX = clang++#CC = ${CXX}#" \
 		-e "s#-Os##" \
 		-e "s#-Wno-misleading-indentation##" \
 		|| die "error patching /scintilla/gtk/makefile"
 	sed -i "${S}/makefile" \
 		-e "s#^CC = clang#CC = ${CC}#" \
 		-e "s#^CXX = clang++#CC = ${CXX}#" \
 		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 		-e "s#-Os##" \
 		|| die "error patching gtk/makefile"
 	# repair and enhance the .desktop file
 	sed -i "${S}/SciTE.desktop" \
 		-e "s#text/plain#text/\*;application/xhtml+xml#" \
 		-e "s#^Categories=\(.*\)#Categories=Development;#" \
 		|| die "error patching /scite/gtk/SciTe.desktop"
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
 		|| die "error patching /scite/src/perl.prperties"
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
 	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
 	eapply_user
 }
 src_compile() {
 	# prepare make options
 	local emake_pars="GTK3=1"
 	if tc-is-clang ; then
 		emake_pars+=" CLANG=1"
 	fi
 	if ! use lua; then
 		emake_pars+=" NO_LUA=1"
 	fi
 	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
 	emake "${emake_pars}"
 }
 src_install() {
 	emake DESTDIR="${ED}" install
 	# we have to keep this because otherwise it'll break upgrading
 	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
 	dosym scite /usr/bin/SciTE
 	doman ../doc/scite.1
 	dodoc ../README
 }
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@ -47,18 +47,20 @@ pkg_pretend() {
 }
 src_prepare() {
 	tc-export AR CC CXX RANLIB
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@ -72,7 +74,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@ -50,18 +50,20 @@ pkg_pretend() {
 }
 src_prepare() {
 	tc-export AR CC CXX RANLIB
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@ -75,7 +77,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
--- a/app-editors/scite/scite-4.4.4.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@ -50,18 +50,20 @@ pkg_pretend() {
 }
 src_prepare() {
 	tc-export AR CC CXX RANLIB
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@ -75,7 +77,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@ -35,9 +35,9 @@ src_prepare() {
 	rm -f skk-lookup.el
 	if use ruby; then
-		mv bayesian/*.el .
+		cp bayesian/*.el . || die
 	fi
-	mv tut-code/*.el .
+	cp tut-code/*.el . || die
 }
 src_compile() {
--- a/app-emacs/ddskk/ddskk-16.3.ebuild
+++ b/app-emacs/ddskk/ddskk-16.3.ebuild
@ -35,9 +35,9 @@ src_prepare() {
 	rm -f skk-lookup.el
 	if use ruby; then
-		mv bayesian/*.el .
+		cp bayesian/*.el . || die
 	fi
-	mv tut-code/*.el .
+	cp tut-code/*.el . || die
 }
 src_compile() {
--- a/app-emacs/ddskk/ddskk-17.1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1.ebuild
@ -35,9 +35,9 @@ src_prepare() {
 	rm -f skk-lookup.el
 	if use ruby; then
-		mv bayesian/*.el .
+		cp bayesian/*.el . || die
 	fi
-	mv tut-code/*.el .
+	cp tut-code/*.el . || die
 }
 src_compile() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@ -1,24 +1 @@
 DIST install-crossover-12.5.0.bin 55089470 BLAKE2B 13c30717c5dcfb802f97df5c5a83a4ba00b769bcc361ba24f9834910392b5ba3ad9eb0c03bea9ac827f1526078e1142aef5d36b76c6576a35edaf1f6f96e092f SHA512 85dbf37b76dd63ba761f6f8efc8c294f38bdb2a443fbed7a7f7f37652b377046f7bd27588600fc456e7fa8040d06a1673475bfc6a7b7a110a16a678efcc5c764
 DIST install-crossover-12.5.1.bin 56658131 BLAKE2B 540678f4905d012c45aee4033d5b056b3415535a05f3d9c0f7aba875ab2fb88fd311fec9b64085b57b07bf06bfd9b0f90e8c3bb0cfafde3f8ccbe114ae51ac82 SHA512 0f71a06f3a028698c4b076b205d807e193282c10c7cfb8e62e4697e9b3bd7549947c02c15f82d959d6963630677e6c72a5f8468d35d66ccb3ff6814ed2173c72
 DIST install-crossover-13.0.0.bin 58807581 BLAKE2B d93a92db09777c3108342428bcd0d4de59921a8e7569b8e501f7b706c462a39b5320d98e69fb3d97c215d290e0c1950f42586fefa37b50c6df29014607f42a6b SHA512 fcf5dde6da1f2fb1eb402bd588baab5e951f8a0ad7959b06a4b7a42f250beb74f9c8d95f26f6fcd4ced9ce0bc4b484ad9a045a485f82028bf8ab7f2abf7ace33
 DIST install-crossover-13.0.1.bin 58567182 BLAKE2B 49e0f7201b2501036883ff9b9ef81f997aaff781b8c01f4992243dc728c2298a3c9cfb2932dd7e4da8e6750e837394184b14e2828f0b763e86fcb5abe6955878 SHA512 e43e3e92d4ac36546fafdf68d61b4fd5af412f83e301b232230589247ed052cb958f0d4eb7667fd616797b8f8c3b4f7acbfa7a9f1206204c5a98e456113a380b
 DIST install-crossover-13.1.0.bin 58678679 BLAKE2B 910f7e7f630aee966d304d46755eb83e642a859b3feab7d08403f277fbd2d5458ec3e1150da8c5489e83b7a20992ebd7d51611a675baaf0944c3a637a8c2692f SHA512 1f2b5625c826bbf16231e1b3ea8694bcda24cf3a7a90347a29b9d97f654ce35df26aff2b8166e8c517e85785d4ea2b5fbdf1bcb82263fa0e8715846fd1668d15
 DIST install-crossover-13.1.2.bin 58730543 BLAKE2B dcd0eec9c0e2a8a4cd96dd8351c43402feac367eca731c5196d11f75ffc88606c199fb856d4df21aebd6d686831070df2cccaf5f3da4699cc8b8da9799218bd0 SHA512 5944db06162a67f68fa4a1ab14f7fbc41f114c63adebecf4c0c50967245f81bb42e58dbe66d33fbfaaeae232aacb2b534fc4367d592eaa6f1cc75e32ec0d23b3
 DIST install-crossover-13.1.3.bin 58768110 BLAKE2B 11406c1f1b53c5f97a566693c6bc588e72be71d9e20665723b44f3cc258416b0a27a4e51a9ea648da90e309656d5764f7d7bcca790f31eb52be8d9dbce8e08d3 SHA512 091a70e777f8311f818d227f26850f256d6acc7f50c93855f72857f2e21298524262d490fcc8a97342faea1a261ab042b0064d112aacb6c30e9ab5301f89eabe
 DIST install-crossover-13.2.0.bin 64625581 BLAKE2B a8f732a2091576d83ca5cf47b239c8bc3737336bbb4c8fb1f48631db63ba00a4dcb23217b8464d412298d546b4b1e03e676fc1805df042bb9297a923c9d60f34 SHA512 1f582eeca8db02c15d98d519b2d24f65b8dcddd90ff270915a4e6dbd24e135b074c5a20dd824c3d8c8f35cef79610c02423b5558db205a6e80630f69191e051b
 DIST install-crossover-14.0.3.bin 68080015 BLAKE2B 8fe46c3e61de02b03598320ba004ed11bde974d06d3cb97e61d63745ade919332acf321ae36e610f5fbfed9e963670a5fbf1912a5383eb08023b04f27a8ad587 SHA512 86855e112f5b5d7621e0d4c644abe570de0270e678dc9666482025c948733de02c66fcf67999079a8ba99537695b36d4fb61aee90a59c319edad5fb477a0f902
 DIST install-crossover-14.1.4.bin 68463678 BLAKE2B e5b718fb90a2812dded7aec0768175d1c78ba82ef84c6e5efc08fd79021c5899901bf2043a8d1643440cd52c3b071ef4059a5a106ec15ad98b158c7746381723 SHA512 2078d9e8fc10c526085aef0bfa0cedbcc1a96ec59ade934ea10e7f10062f1a58f5647e9aed59653d4a1253699a08e9ef6f01548010e960af24d0d3546549fb91
 DIST install-crossover-15.0.0.bin 80995834 BLAKE2B 63809a9f39e48cd51b9b0b97cdc1cebb8e99d992bdc8a9d3a0d5f48bab3c828d60b8aaf8e8829933a0d5fd1370d318395c01c708c3353597b74ce3ed6442a592 SHA512 597262b760c7cfc3c42cdb0b846802c6c47d4fcd5af06b53d0c63c80e4890e14af8ff0eaaac74a08f4f5d55e166a480d199b185efe685f7c42abca3d62fc2a0d
 DIST install-crossover-15.0.1.bin 81027541 BLAKE2B 2cb838aad4363d910897a76cf1d03f031d2a14f494fef3f4db082c303c46f5964fac20096bd1d596285a4bef152af1ba7864b3205a3ee35efc6ff6d5ac7565c7 SHA512 a35188ccebeee8d456e73fdcbb8e8d4f0aff41bb89d92767d2e2e78e7cb25c8e48a150393c1c9abeb9760fbc873314e301c0a364ba27acfe08e0980bb5eedb03
 DIST install-crossover-15.1.0.bin 80623685 BLAKE2B 77125ce567c997ee718f546c3b68077a3d59e6a0f5711968bb5cb72cc0b2c7dd22182d7e8c8864c5eef0b6e833159a4534fc81db7234ea8bf757b5a465df1abc SHA512 177e70baff3d99e808834c8e6f626f09d9c262babd6d5a3b51ea79a5a68a157cdfd4fd60ad6939d110f2300670e4973d9fd43a3a132ff9a2367dedb782e5c05c
 DIST install-crossover-15.2.0.bin 80734561 BLAKE2B e8b4ee0ab2c5a8463c2757a756a008886071a35114e5ee1b5590907ad42be3c6777bc024cb2c3c41f215e6e29b69d08d46c47dbea0629f542c098b957d124106 SHA512 9633e29b26f8fa99d1c34347b8e1f2e89b84370994a1ab3bba7061b75224f3a907d1c364207312dde1995e5a59180f8699558a96a4c99b157257ab9c21013b2e
 DIST install-crossover-15.3.0.bin 80774063 BLAKE2B 2f0aa184f77120c241656d8d9990c5cfe177ab847061e023f0f08b52d804a1f832a18b1f2e82fddf9dde8313e717d3c92104ab46d95dc50c5935c57f878b6716 SHA512 8e5a6fa40a0af0976d794436ac69edf61f73d4f1f128503a6372c4ae804eb977438a98062bc064f25dbb93015fa0776b9e5d572a98e887980214d3ccb93fd4c7
 DIST install-crossover-15.3.1.bin 80774288 BLAKE2B 3d3fd83ee426a66ead3c88f4ca584408117e9a0f9a1af6d2cfe0623db398caaeb2dc1b285f8edbf9a700c3281bd5bdd81542df9ef0457be036727b756121d99d SHA512 3f4da41a7b255263012e70ed833a134425e464847acc69ba79f73989c0bfc5f98869cf5858c1e2d16422a8220296695157b942f275b861b3ee0dcc2d90f7da7d
 DIST install-crossover-16.0.0.bin 197872657 BLAKE2B d500ed4f6a426154b376ead6c2b50eb21a403303561078dc51982a5147af23261dda9892717c16c6e2f3b2a30ffc84e73070cd330bea70ba89c79180c4933297 SHA512 184533679ddf3918ab5fc00b01452d868c694fbc7ccb5484c88822cc52da067fd1a0be0387e4050e40d9b367052158faec27dc06f6a371a044b5a1782950e780
 DIST install-crossover-16.2.5.bin 198336730 BLAKE2B a11252dab552846fe0a1527cd59cd62907142385062b744591cef6707213d03945879fc5da6bcfaaa315967c51ae15159ad14d8519407542b82f0eb53c5fd02e SHA512 17cb711e7257f094e9ccf939edc1ca6be362f18b86078fe307b7e1337850e182d02fde087789f13ea2bf96ca89736f941c1a7bd93ff1b37a78fe8f846a1d5e22
 DIST install-crossover-17.5.0.bin 198287744 BLAKE2B c594192927874e5a80626ad110f0089f2bf8b7385a16ff7755923d63ebb0559b1aa505ec4e8b6f85253ac13736b7f9af178c64ed042a515d31cd4565295db163 SHA512 8592d2c91c437d62d1fd5fecf6230eeabfe56c38f49ea795bf4d3b51d8ae4399f1b01801d60dcccb94caeb4dd662675c2739f730f39ef178db32dd4f72182197
 DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf26144375dd559bcd58af3ef05364cfb7a00b8cd68d879e6ef31e92b165876e4c3f85ebcb823dd6585c3edcb8e4cafb76d8e59 SHA512 d1e41c5290c56bbb23a6317e91800d7c23d2b4389ebf08ef4416718103aa06b05b33c655d3ef413fe76773dd3599d8fe3d4ea64274fcc18518923990f980bf2a
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
 DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support"
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \
 		 || die "Could not patch ${WORKDIR}/bin/locate_gui.sh"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install requisite directories for menus
 	dodir "/usr/share/applications"
 	dodir "/etc/xdg/menus/applications-merged"
 	# Install menus
 	XDG_CONFIG_DIRS="${ED}etc/xdg" \
 		XDG_DATA_DIRS="${ED}usr/share" \
 		"${ED}opt/cxoffice/bin/cxmenu" --crossover --install \
 		|| die "Could not install menus"
 	# Fix menus
 	sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \
 		|| die "Could not fix menus"
 }
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@ -1,136 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
 	sed -i \
 	-e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
 	sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
 	sed -i -e "s:${ED}/::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 }
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@ -1,136 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist fetch test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i -e "s:\$link=\"\$xdgdir:\$link=\"${ED}\/\$xdgdir:" "${S}/lib/perl/CXMenu.pm"
 	sed -i \
 		-e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
 	sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
 	sed -i -e "s:${ED}/::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@ -1,145 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:\"\$xdgdir/icons/hicolor/\$size/apps\":\"${ED}/\$xdgdir/icons/hicolor/\$size/apps\":" \
 		"${S}/lib/perl/CXMenu.pm"
 	sed -i \
 		-e "s:\"\(.*\)/applications:\"${ED}/\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}/\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	cp -r ./* "${ED}opt/cxoffice" \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop"
 	sed -i -e "s:${ED}:/:" "${ED}usr/share/applications/"*.desktop
 	sed -i -e "s:${ED}/::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenu.pm" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@ -1,148 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@ -1,148 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@ -1,151 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_DIRS="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		"${ED}opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/opt/cxoffice/support/desktopdata/cxoffice-0/cxmenu/Launchers/StartMenu/"*.desktop \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@ -1,150 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@ -1,149 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@ -1,160 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	"
 S="${WORKDIR}"
 DEPEND="dev-lang/perl
 	app-arch/unzip
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]"
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Konqueror in its infinite wisdom decides to try opening things for
 	# writing, which are sandbox violations. This breaks the install process if
 	# it is installed, so we ninja edit it to false so it so doesn't run.
 	sed -i -e 's/cxwhich konqueror/false &/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	# Revert ninja edit
 	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@ -1,174 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="
 	opt/cxoffice/lib/.*
 	opt/cxoffice/lib64/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/wineserver32
 	opt/cxoffice/bin/wineserver64
 	opt/cxoffice/bin/wine64-preloader
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxdiag64
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	opt/cxoffice/bin/wineloader64
 "
 S="${WORKDIR}"
 DEPEND=""
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	app-arch/unzip
 "
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]
 "
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	default
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Konqueror in its infinite wisdom decides to try opening things for
 	# writing, which are sandbox violations. This breaks the install process if
 	# it is installed, so we ninja edit it to false so it so doesn't run.
 	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	# Revert ninja edit
 	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@ -1,174 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="
 	opt/cxoffice/lib/.*
 	opt/cxoffice/lib64/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/wineserver32
 	opt/cxoffice/bin/wineserver64
 	opt/cxoffice/bin/wine64-preloader
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxdiag64
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	opt/cxoffice/bin/wineloader64
 "
 S="${WORKDIR}"
 DEPEND=""
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	app-arch/unzip
 "
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]
 "
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	default
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	# Konqueror in its infinite wisdom decides to try opening things for
 	# writing, which are sandbox violations. This breaks the install process if
 	# it is installed, so we ninja edit it to false so it so doesn't run.
 	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	# Revert ninja edit
 	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
@ -1,179 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit python-single-r1 unpacker
 DESCRIPTION="Commercial version of app-emulation/wine with paid support."
 HOMEPAGE="https://www.codeweavers.com/products/"
 SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms ldap +mp3 +nls +openal +opencl +opengl +pcap +png scanner +ssl +v4l +vulkan"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="
 	opt/cxoffice/lib/.*
 	opt/cxoffice/lib64/.*
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
 	opt/cxoffice/bin/wineserver32
 	opt/cxoffice/bin/wineserver64
 	opt/cxoffice/bin/wine64-preloader
 	opt/cxoffice/bin/unrar
 	opt/cxoffice/bin/wine-preloader
 	opt/cxoffice/bin/cxdiag
 	opt/cxoffice/bin/cxdiag64
 	opt/cxoffice/bin/cxgettext
 	opt/cxoffice/bin/wineloader
 	opt/cxoffice/bin/wineloader64
 "
 S="${WORKDIR}"
 DEPEND=""
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
 	app-arch/unzip
 "
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	$(python_gen_cond_dep '
 		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
 	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
 	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
 	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
 	nls? ( sys-devel/gettext[abi_x86_32(-)] )
 	openal? ( media-libs/openal[abi_x86_32(-)] )
 	opencl? ( virtual/opencl[abi_x86_32(-)] )
 	opengl? (
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
 	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
 	ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
 	dev-util/desktop-file-utils
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
 	media-libs/tiff:0[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libSM[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
 	x11-libs/libXdmcp[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXi[abi_x86_32(-)]
 	x11-libs/libXrandr[abi_x86_32(-)]
 	x11-libs/libXxf86vm[abi_x86_32(-)]
 	x11-libs/libxcb[abi_x86_32(-)]
 "
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
 	einfo "and place ${A} into your DISTDIR directory"
 }
 src_unpack() {
 	# self unpacking zip archive; unzip warns about the exe stuff
 	unpack_zip ${A}
 }
 src_prepare() {
 	default
 	python_fix_shebang .
 	sed -i \
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
 		"${S}/lib/perl/CXMenuXDG.pm"
 	# Remove unnecessary files
 	rm -r license.txt guis/ || die "Could not remove files"
 	use doc || rm -r doc/ || die "Could not remove files"
 }
 src_install() {
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
 	# Install documentation
 	dodoc README changelog.txt
 	rm README changelog.txt || die "Could not remove README and changelog.txt"
 	# Install files
 	dodir /opt/cxoffice
 	#cp -r ./* "${ED}/opt/cxoffice" \
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
 	# Konqueror in its infinite wisdom decides to try opening things for
 	# writing, which are sandbox violations. This breaks the install process if
 	# it is installed, so we ninja edit it to false so it so doesn't run.
 	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	# Install menus
 	# XXX: locate_gui.sh automatically detects *-application-merged directories
 	# This means what we install will vary depending on the contents of
 	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
 	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
 		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
 		|| die "Could not install menus"
 	# Revert ninja edit
 	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
 		|| die "Could not apply workaround for konqueror"
 	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
 		|| die "Could not remove uninstall menus"
 	sed -i \
 		-e "s:\"${ED}\".::" \
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
 	sed -i -e "s:${ED}:/:" \
 		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 }
 pkg_postinst() {
 	einfo "${P} is open source software with the exception of the GUI."
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
 }
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1,2 +1,2 @@
 DIST diskimage-builder-3.1.0.tar.gz 434813 BLAKE2B 7a9fa54353f9b7edc2f1f1dab965b8241cb8b046ef56f12ed3562c04a8c6e236a7be41fbe75c385b48c4f2b8b30e961d8b86499e79999c391dde9c2f294f1193 SHA512 0b8a0b6cee9c7fcee08d8e5d706add2e54dfe1b7726b169f357022a48a37e351b159a7426771a001b703ca4360905f318ff91d0e72cb2d92e3486607186d03c4
-DIST diskimage-builder-3.2.0.tar.gz 448407 BLAKE2B 505aec0375b1adab03362025e5f391b771e128bf3fd21fe312bdf0a60be7e5ef5768f61778425f24471d6943788ade98929949623142923548e37a8fef65dd53 SHA512 675f1d733c82a15862db2db1c7362fe50058b89b834bffa46ef936af450e41796c06f32f2677ac787100fc2b285f6f7befdd7344a4463841b0ca581499018849
+DIST diskimage-builder-3.2.1.tar.gz 446827 BLAKE2B bec2f225681f333b9dfded90dd7717119805ea46cc6c48e48d1f63242fa271ca3653fd67be0c5bd3876cd6db9506e2579ad14b4f7e573ea56311c6b85277fdb5 SHA512 acdac97e510a68bd30b81ab7ebce729c4c4bbfdd86e56dfa41b50558ccac942caae76a66dc4442854fbab6fb7440a9ebf74b5872e9d35793b2e4243cb28cd5a7
--- a/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,6 +1,6 @@
 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019 SHA512 860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b SHA512 efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
 DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25 SHA512 b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
 DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a SHA512 e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
 DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
 DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c SHA512 ae952deeee7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062
 DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b SHA512 556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19
--- a/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.4-r1.ebuild
@ -1,68 +0,0 @@
 # Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit bash-completion-r1 distutils-r1
 DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://github.com/docker/compose"
 SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		<dev-python/pytest-4[${PYTHON_USEDEP}]
 		dev-python/ddt[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/compose-${PV}"
 PATCHES=(
 	# Bug #679968 -- https://bugs.gentoo.org/679968
 	# Bug #681002 -- https://bugs.gentoo.org/681002
 	"${FILESDIR}"/${PN}-1.25.2-setup-py.patch
 )
 src_prepare() {
 	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
 	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
 	default
 }
 python_test() {
 	distutils_install_for_testing
 	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
 }
 python_install_all() {
 	newbashcomp contrib/completion/bash/docker-compose ${PN}
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/*
 	distutils-r1_python_install_all
 }
--- a/app-emulation/docker-compose/docker-compose-1.27.0_rc2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.27.0_rc2.ebuild
@ -8,9 +8,10 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit bash-completion-r1 distutils-r1
 MY_PV=${PV/_/-}
 DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
@ -20,9 +21,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
@ -35,17 +38,19 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
 	)"
-S="${WORKDIR}/compose-${PV}"
+S="${WORKDIR}/compose-${MY_PV}"
 PATCHES=(
 	# Bug #679968 -- https://bugs.gentoo.org/679968
 	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.25.2-setup-py.patch
+	"${FILESDIR}"/${PN}-1.27.0_rc1-setup-py.patch
 )
 DOCS=( CHANGELOG.md README.md )
 src_prepare() {
 	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
 	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,2 +1 @@
 DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
 DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02
--- a/app-emulation/docker/docker-19.03.8.ebuild
+++ b/app-emulation/docker/docker-19.03.8.ebuild
@ -1,314 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 EGO_PN="github.com/docker/docker-ce"
 if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
 	DOCKER_GITCOMMIT=afacb8b7f0
 	MY_PV=${PV/_/-}
 	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
 inherit bash-completion-r1 golang-base linux-info systemd udev
 DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
 HOMEPAGE="https://www.docker.com/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 COMMON_DEPEND="
 	acct-group/docker
 	>=dev-db/sqlite-3.7.9:3
 	device-mapper? (
 		>=sys-fs/lvm2-2.02.89[thin]
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
 	apparmor? ( sys-libs/libapparmor )
 "
 DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/go-1.12
 	dev-go/go-md2man
 	btrfs? (
 		>=sys-fs/btrfs-progs-3.16.1
 	)
 "
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
 	${COMMON_DEPEND}
 	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=net-firewall/iptables-1.4
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	dev-libs/libltdl
 	~app-emulation/containerd-1.2.13
 	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?]
 	~app-emulation/docker-proxy-0.8.0_p20191011
 	container-init? ( >=sys-process/tini-0.18.0[static] )
 "
 RESTRICT="installsources strip"
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
 	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
 	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
 	~KEYS
 	~VETH ~BRIDGE ~BRIDGE_NETFILTER
 	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
 	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
 	~IP_NF_NAT ~NF_NAT
 	~POSIX_MQUEUE
 	~USER_NS
 	~SECCOMP
 	~CGROUP_PIDS
 	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 	~BLK_CGROUP ~BLK_DEV_THROTTLING
 	~CGROUP_PERF
 	~CGROUP_HUGETLB
 	~NET_CLS_CGROUP
 	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
 	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
 	~VXLAN
 	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
 	~IPVLAN
 	~MACVLAN ~DUMMY
 "
 ERROR_KEYS="CONFIG_KEYS: is mandatory"
 ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
 ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
 ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
 ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
 ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
 ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
 ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
 ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
 pkg_setup() {
 	if kernel_is lt 3 10; then
 		ewarn ""
 		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
 		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
 	fi
 	if kernel_is le 3 18; then
 		CONFIG_CHECK+="
 			~RESOURCE_COUNTERS
 		"
 	fi
 	if kernel_is le 3 13; then
 		CONFIG_CHECK+="
 			~NETPRIO_CGROUP
 		"
 	else
 		CONFIG_CHECK+="
 			~CGROUP_NET_PRIO
 		"
 	fi
 	if kernel_is lt 4 5; then
 		CONFIG_CHECK+="
 			~MEMCG_KMEM
 		"
 		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
 	fi
 	if kernel_is lt 4 7; then
 		CONFIG_CHECK+="
 			~DEVPTS_MULTIPLE_INSTANCES
 		"
 	fi
 	if kernel_is lt 5 1; then
 		CONFIG_CHECK+="
 			~NF_NAT_IPV4
 			~IOSCHED_CFQ
 			~CFQ_GROUP_IOSCHED
 		"
 	fi
 	if kernel_is lt 5 2; then
 		CONFIG_CHECK+="
 			~NF_NAT_NEEDED
 		"
 	fi
 	if use aufs; then
 		CONFIG_CHECK+="
 			~AUFS_FS
 			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
 		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
 	fi
 	if use btrfs; then
 		CONFIG_CHECK+="
 			~BTRFS_FS
 			~BTRFS_FS_POSIX_ACL
 		"
 	fi
 	if use device-mapper; then
 		CONFIG_CHECK+="
 			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
 	fi
 	if use overlay; then
 		CONFIG_CHECK+="
 			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
 		"
 	fi
 	linux-info_pkg_setup
 }
 src_compile() {
 	export GOPATH="${WORKDIR}/${P}"
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
 	export CGO_CFLAGS="-I${ROOT}/usr/include"
 	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
 	# if we're building from a tarball, we need the GITCOMMIT value
 	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
 	# fake golang layout
 	ln -s docker-ce/components/engine ../docker || die
 	ln -s docker-ce/components/cli ../cli || die
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
 	for gd in aufs btrfs device-mapper overlay; do
 		if ! use $gd; then
 			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
 		fi
 	done
 	for tag in apparmor seccomp; do
 		if use $tag; then
 			DOCKER_BUILDTAGS+=" $tag"
 		fi
 	done
 	pushd components/engine || die
 	if use hardened; then
 		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
 		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
 		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
 			-i hack/make/dynbinary-daemon || die
 		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
 	fi
 	# build daemon
 	VERSION="$(cat ../../VERSION)" \
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 	popd || die # components/engine
 	pushd components/cli || die
 	# build cli
 	emake \
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
 		VERSION="$(cat ../../VERSION)" \
 		GITCOMMIT="${DOCKER_GITCOMMIT}" \
 		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
 		dynbinary
 	# build man pages
 	go build -o gen-manpages github.com/docker/cli/man || die
 	./gen-manpages --root . --target ./man/man1 || die
 	./man/md2man-all.sh -q || die
 	rm gen-manpages || die
 	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
 	popd || die # components/cli
 }
 src_install() {
 	dosym containerd /usr/bin/docker-containerd
 	dosym containerd-shim /usr/bin/docker-containerd-shim
 	dosym runc /usr/bin/docker-runc
 	use container-init && dosym tini /usr/bin/docker-init
 	pushd components/engine || die
 	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 	systemd_dounit contrib/init/systemd/docker.{service,socket}
 	udev_dorules contrib/udev/*.rules
 	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
 	dodoc -r docs/*
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/syntax/vim/ftdetect
 	doins -r contrib/syntax/vim/syntax
 	# note: intentionally not using "doins" so that we preserve +x bits
 	dodir /usr/share/${PN}/contrib
 	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
 	popd || die # components/engine
 	pushd components/cli || die
 	newbin build/docker-* docker
 	doman man/man*/*
 	dobashcomp contrib/completion/bash/*
 	insinto /usr/share/fish/vendor_completions.d/
 	doins contrib/completion/fish/docker.fish
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/_*
 	popd || die # components/cli
 }
 pkg_postinst() {
 	udev_reload
 	elog
 	elog "To use Docker, the Docker daemon must be running as root. To automatically"
 	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
 	elog "  rc-update add docker default"
 	elog "Similarly for systemd:"
 	elog "  systemctl enable docker.service"
 	elog
 	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
 	elog "  usermod -aG docker youruser"
 	elog
 	elog " Devicemapper storage driver has been deprecated"
 	elog " It will be removed in a future release"
 }
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@ -1 +1 @@
-DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
+DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
--- a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
+++ b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
@ -1,28 +0,0 @@
 diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
 --- a/tools/cross-wine32.in	2019-09-25 13:25:24.000000000 +0100
 +++ b/tools/cross-wine32.in	2019-09-30 23:05:00.121344967 +0100
@@ -5,8 +5,8 @@
 pkgconfig = '@PKG_CONFIG@'
 [properties]
 -c_args = ['-m32']
 -c_link_args = ['-m32', '-mwindows']
 +c_args = @CFLAGS@ + ['-m32']
 +c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
 needs_exe_wrapper = true
 [host_machine]
 diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
 --- a/tools/cross-wine64.in	2019-09-25 13:25:24.000000000 +0100
 +++ b/tools/cross-wine64.in	2019-09-30 23:04:57.340283350 +0100
@@ -5,8 +5,8 @@
 pkgconfig = '@PKG_CONFIG@'
 [properties]
 -c_args = ['-m64']
 -c_link_args = ['-m64', '-mwindows']
 +c_args = @CFLAGS@ + ['-m64']
 +c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
 needs_exe_wrapper = true
 [host_machine]
--- a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
+++ b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
@ -0,0 +1,34 @@
 diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
 index bfbe410..0064cf8 100644
 --- a/tools/cross-wine32.in
 +++ b/tools/cross-wine32.in
@@ -5,9 +5,10 @@ strip = 'strip'
 pkgconfig = '@PKG_CONFIG@'
 [properties]
 -c_args = ['-m32']
 -c_link_args = ['-m32', '-mwindows']
 +c_args = @CFLAGS@ + ['-m32']
 +c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
 needs_exe_wrapper = true
 +pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
 [host_machine]
 system = 'linux'
 diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
 index 5e19023..06b1f2a 100644
 --- a/tools/cross-wine64.in
 +++ b/tools/cross-wine64.in
@@ -5,9 +5,10 @@ strip = 'strip'
 pkgconfig = '@PKG_CONFIG@'
 [properties]
 -c_args = ['-m64']
 -c_link_args = ['-m64', '-mwindows']
 +c_args = @CFLAGS@ + ['-m64']
 +c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
 needs_exe_wrapper = true
 +pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
 [host_machine]
 system = 'linux'
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -38,7 +38,7 @@ DEPEND="
 "
 PATCHES=(
-	"${FILESDIR}"/0.5-flags.patch
+	"${FILESDIR}"/0.7-cross-files.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
@ -67,6 +67,7 @@ src_prepare() {
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
 			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
 			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
 			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -38,7 +38,7 @@ DEPEND="
 "
 PATCHES=(
-	"${FILESDIR}"/0.5-flags.patch
+	"${FILESDIR}"/0.7-cross-files.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
@ -67,6 +67,7 @@ src_prepare() {
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
 			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
 			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
 			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}
--- a/app-emulation/pcem/metadata.xml
+++ b/app-emulation/pcem/metadata.xml
@ -18,6 +18,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://pcem-emulator.co.uk/phpBB3/viewforum.php?f=2</bugs-to>
-		<remote-id type="bitbucket">pcem_emulator/pcem</remote-id>
+		<remote-id type="github">sarah-walker-pcem/pcem</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-emulation/pcem/pcem-16.ebuild
+++ b/app-emulation/pcem/pcem-16.ebuild
@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
 HOMEPAGE="
 	https://pcem-emulator.co.uk/
-	https://bitbucket.org/pcem_emulator/pcem/
+	https://github.com/sarah-walker-pcem/pcem/
 "
 SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="canfep"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="unicode"
 RDEPEND="app-i18n/canna
--- a/app-i18n/canfep/canfep-1.0.ebuild
+++ b/app-i18n/canfep/canfep-1.0.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit toolchain-funcs
 DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
 #HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
 LICENSE="canfep"
 SLOT="0"
 KEYWORDS="-alpha ~amd64 ppc ~sparc x86"
 IUSE="unicode"
 RDEPEND="app-i18n/canna
 	sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 src_prepare() {
 	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
 	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
 	default
 }
 src_compile() {
 	emake \
 		CC="$(tc-getCXX)" \
 		CFLAGS="${CXXFLAGS}" \
 		LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 src_install() {
 	dobin ${PN}
 	dodoc 00{changes,readme}
 }
--- a/Show More
+++ b/Show More
`@ -1 +1 @@`
	`DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79`	`DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c`
`@ -1 +1,2 @@`
	`DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0`	`DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0`
		`DIST gnome-latex-3.36.0.tar.xz 1150308 BLAKE2B 7a0782b9be7727f700913b61f3ef3068340f69c2f88f5d8c1727fe7252230e194329a133f7d22a10ca4e3d2e471657705c1e821b0571b26a78a8fb13d6148d76 SHA512 54ba6c7571a0fe9cada9c8f01d57a1dd0bc4da07cc1a501adbc711433e6f16e890e44a588aa91b67f0ebb912dde8822d992763ed3b5a294a55a5bed20b7e1390`
`@ -1,2 +1,2 @@`
	`DIST diskimage-builder-3.1.0.tar.gz 434813 BLAKE2B 7a9fa54353f9b7edc2f1f1dab965b8241cb8b046ef56f12ed3562c04a8c6e236a7be41fbe75c385b48c4f2b8b30e961d8b86499e79999c391dde9c2f294f1193 SHA512 0b8a0b6cee9c7fcee08d8e5d706add2e54dfe1b7726b169f357022a48a37e351b159a7426771a001b703ca4360905f318ff91d0e72cb2d92e3486607186d03c4`	`DIST diskimage-builder-3.1.0.tar.gz 434813 BLAKE2B 7a9fa54353f9b7edc2f1f1dab965b8241cb8b046ef56f12ed3562c04a8c6e236a7be41fbe75c385b48c4f2b8b30e961d8b86499e79999c391dde9c2f294f1193 SHA512 0b8a0b6cee9c7fcee08d8e5d706add2e54dfe1b7726b169f357022a48a37e351b159a7426771a001b703ca4360905f318ff91d0e72cb2d92e3486607186d03c4`
	`DIST diskimage-builder-3.2.0.tar.gz 448407 BLAKE2B 505aec0375b1adab03362025e5f391b771e128bf3fd21fe312bdf0a60be7e5ef5768f61778425f24471d6943788ade98929949623142923548e37a8fef65dd53 SHA512 675f1d733c82a15862db2db1c7362fe50058b89b834bffa46ef936af450e41796c06f32f2677ac787100fc2b285f6f7befdd7344a4463841b0ca581499018849`	`DIST diskimage-builder-3.2.1.tar.gz 446827 BLAKE2B bec2f225681f333b9dfded90dd7717119805ea46cc6c48e48d1f63242fa271ca3653fd67be0c5bd3876cd6db9506e2579ad14b4f7e573ea56311c6b85277fdb5 SHA512 acdac97e510a68bd30b81ab7ebce729c4c4bbfdd86e56dfa41b50558ccac942caae76a66dc4442854fbab6fb7440a9ebf74b5872e9d35793b2e4243cb28cd5a7`
`@ -1,2 +1 @@`
	`DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3`	`DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3`
	`DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02`
`@ -1 +1 @@`
	`DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78`	`DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c`