Large rework/update to EAPI=7

2021-06-23 14:52:35 +02:00 · 2021-06-23 14:52:35 +02:00 · 834bffce4d
commit 834bffce4d
parent cc1a827c4f
191 changed files with 249 additions and 7004 deletions
--- a/app-arch/xdms/Manifest
+++ b/app-arch/xdms/Manifest
@ -1,2 +1,2 @@
-EBUILD xdms-9999.ebuild 773 BLAKE2B b006d21fec5d5eee31a88b6dd6c69a8e06b431080b9abb61d36594588da9fa722cf0b3839c2e1ac69390ee8eba2e4507f22cfb5501eca26d60b9fcfa9c3deed2 SHA512 159b0fbe5280f8778496c35f2e40eb8ad1a03f60a041b7e95d4002cd8e9828b11b16a9df06e5ab75aa2dedb5ff757b92a3f6a0dde5f3cf95332d09a4f6a52892
+EBUILD xdms-9999.ebuild 773 BLAKE2B d55ad19b18d0611f5df5ece9526e8d3e13f25c1a9f101f933a809caefd75cde7844aa59a9a85d3d17de163898904086cf46256a43c2c2479f01a5a53efae39df SHA512 dc4497d98a8be717299d997d46f74df920066cbf5350df3f2ab38df9c5250ac89150ca664d15e61b7ad782fa246647bc4438db596ea96f037b4c853ecf569763
 MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba
--- a/app-arch/xdms/xdms-9999.ebuild
+++ b/app-arch/xdms/xdms-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@ -4,10 +4,6 @@ AUX dsmc.service 184 BLAKE2B a6a14302b32cdfdd9d1460b2d686a9a828d1cdd3c19dc53f8f5
 AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a165b98dec9466323d1ec8ffad894c5d165fd994a99e7a52ca22bb6b81597e93001f22be2af641da6a9 SHA512 b69166e9e004d81a7f43551e5f1189c3a545afc67e5029009e9693fbed20a247f922975fec695542f0a3afd7c0c5a4ee6c026678de4812b00488afc45699699a
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
-DIST 8.1.10.0-TIV-TSMBAC-LinuxX86.tar 582656000 BLAKE2B 04c10c05e58e46a30333c72092fca2d19398bb95274b22ed162ec86c1190feb8037988a7ef37600f698ba0791fa6b5d5db1cb41581df172d9953c0dbd59946d8 SHA512 8947fcb89d777d544db4d32dd7c5522487a7fae628c9c884b85a6b07612139ee9696a9878491c090c9a23fb03936193345315d121733b5509f8be63fc5b16249
+DIST 8.1.12.0-TIV-TSMBAC-LinuxX86.tar 616130560 BLAKE2B 85a01ccf19482730aeac88cea959e4564a22e2a594ade45758786b0fb1c43034183120ebbc210db331ab24508b971f8734479c7a7528b4f38f6e684ef97cb37b SHA512 2ac5f03fc8a87b4ae27d89971fe7999b1010979a47d5b7005c7ea1c40729a4d76074a858fdc104d25ba5b903c5d633c188b8c582d42baef02f9dcbb98970a5d7
-DIST 8.1.11.0-TIV-TSMBAC-LinuxX86.tar 614348800 BLAKE2B 7b92e8e77b652483231f2a024f527df6945e54f61e66d36b217f39518b76777cd1e114091a1fb42ffea4733eda8447b09500aca35389729742f1202f63ef2ce8 SHA512 b6d5cc6dd359143900479859c083b3676201cd8c883f7a472b5c496a7bb9fe5e33ef49b951400002a329c1f7401f85498a4a837cb5c811b18dbb8de65460ea7d
+EBUILD tsm-8.1.12.0.ebuild 7171 BLAKE2B e4e4b901252a4a6669760bf407fb095613107a86caffa754547b282d482f34bed2e9d8cdbb2af707093d7ce6572f26967d7a8df8a7694a4de50097efb91858a3 SHA512 8047f8ffe7b3ea17ca48551956e6b22f09194aebc647a9e7ecbbbfafe24d5dc0e7fc4d8d46cd79cba12d3233c71d52b04cd4e7a3de495248c8c9bd66903a5540
 DIST 8.1.9.0-TIV-TSMBAC-LinuxX86.tar 545669120 BLAKE2B 8f8af95ae15ef5355a816417092dbea264726c7488b78efd8252e416a4674d6f5621af58c588dbd764dfd17937e16db076f515f16af107178ebde670a58cc4bb SHA512 16cca15cea4e14d2277bcf8eb25d47c69301a99785d380429f402eff4e47ca91aca3e6cb1860e83bad1cf2550788723241e5ad8cca240c6a1ebdc0d4060f3a68
 EBUILD tsm-8.1.10.0.ebuild 7410 BLAKE2B 8deb1fba803adb7a66b60d0ee69df109aeacd620349cf329e8dcf9c1c3f2c04fe2c2677971303bbe896491ff7765b92b459b2927450408cc033427bc73f23701 SHA512 786d9804de1194406d8803a33508e1526b225309f6b6bd29f6791ca07296464cd555042af5af331de57d6dc620fc45641baf07625d4f6b5447d015383b965c5a
 EBUILD tsm-8.1.11.0.ebuild 7410 BLAKE2B 8deb1fba803adb7a66b60d0ee69df109aeacd620349cf329e8dcf9c1c3f2c04fe2c2677971303bbe896491ff7765b92b459b2927450408cc033427bc73f23701 SHA512 786d9804de1194406d8803a33508e1526b225309f6b6bd29f6791ca07296464cd555042af5af331de57d6dc620fc45641baf07625d4f6b5447d015383b965c5a
 EBUILD tsm-8.1.9.0.ebuild 7410 BLAKE2B 8deb1fba803adb7a66b60d0ee69df109aeacd620349cf329e8dcf9c1c3f2c04fe2c2677971303bbe896491ff7765b92b459b2927450408cc033427bc73f23701 SHA512 786d9804de1194406d8803a33508e1526b225309f6b6bd29f6791ca07296464cd555042af5af331de57d6dc620fc45641baf07625d4f6b5447d015383b965c5a
 MISC metadata.xml 398 BLAKE2B fb4d250c3bf724349ac31d66b1c43e766d4ba9b001e88b47949c6fe188a629eb1b87321ef3391d2886e9b74daf235cff0139079fd6f72b7342119542438e30e6 SHA512 bd6ec11787dd6f2ff1a59e7e1027a01b80b22256530d35d6a2fb5b3398ee641b9c778f6a8c2555b7098a199bbb1eda1a5204be53509e5eb47399dbad83798547
--- a/app-backup/tsm/tsm-8.1.11.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.11.0.ebuild
@ -1,238 +0,0 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
 MY_PV_MAJOR=$(get_major_version)
 MY_PV_MINOR=$(get_version_component_range 2)
 MY_PV_TINY=$(get_version_component_range 3)
 MY_PV_PATCH=$(get_version_component_range 4)
 MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
 MY_PVR_ALLDOTS=${PV}
 if [[ ${MY_PV_PATCH} == 0 ]]; then
 	MY_RELEASE_PATH=maintenance
 else
 	MY_RELEASE_PATH=patches
 fi
 BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
 BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
 BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
 SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
 LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
 	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
 	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 # not available (yet?)
 #MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
 #	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
 MY_LANG_PV="${MY_PVR_ALLDOTS}-"
 for lang in ${MY_LANGS}; do
 	IUSE="${IUSE} l10n_${lang%:*}"
 	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
 ${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
 ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
 done
 unset lang
 DEPEND=""
 RDEPEND="
 	dev-libs/expat
 	dev-libs/libxml2
 	sys-fs/fuse:0
 	acl? ( sys-apps/acl )
 	java? ( >=virtual/jre-1.7 )
 "
 S="${WORKDIR}/bacli"
 pkg_setup() {
 	enewgroup tsm
 	DOC_CONTENTS="
 		Note that you have to be root to be able to use the Tivoli Storage Manager
 		client. The dsmtca trusted agent binary does not exist anymore.
 		For information on how to give other users access, please see the following
 		URLs:
 		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
 		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
 	"
 }
 src_unpack() {
 	local rpm rpms lang
 	mkdir bacli || die
 	cd bacli || die
 	unpack ${SRC_TAR}
 	cd "${S}"
 	for rpm in *.rpm; do
 		case ${rpm} in
 			TIVsm-APIcit.*|TIVsm-BAcit.*)
 				use tsm_cit && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-BAhdw.*)
 				use tsm_hw && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-JBB.*|*-filepath-*)
 				# "journal based backup" for all filesystems
 				# requires a kernel module.
 				# "Linux Filepath source code" available
 				# by request from vendor
 				;;
 			*)
 				rpms="${rpms} ./${rpm}"
 				;;
 		esac
 	done
 	for rpm in ${A}; do
 		case ${rpm} in
 			*.rpm)
 				rpms="${rpms} ${rpm}"
 				;;
 		esac
 	done
 	rpm_unpack ${rpms}
 	# Avoid strange error messages caused by read-only files
 	chmod -R u+w "${S}" || die
 }
 src_install(){
 	cp -a opt "${D}" || die
 	cp -a usr "${D}" || die
 	# The RPM files contain postinstall scripts which can be extracted
 	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
 	# Below we try to mimic the behaviour of these scripts.
 	# We don't deal with SELinux compliance (yet), though.
 	local RPM_INSTALL_PREFIX CLIENTDIR i
 	RPM_INSTALL_PREFIX=/opt
 	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
 	# Create links for messages; this is spread over several postin scripts.
 	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
 	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
 	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
 	#done
 	# Mimic TIVsm-API64 postinstall script
 	for i in libgpfs.so libdmapi.so; do
 		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
 	done
 	# The TIVsm-BA postinstall script only does messages and ancient upgrades
 	# The gscrypt64 postinstall script only deals with s390[x] SELinux
 	# and the symlink for the iccs library which we handle in the loop below.
 	# Move stuff from /usr/local to /opt, #452332
 	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
 	rmdir "${D}"/usr/local || die
 	# Mimic gskssl64 postinstall script
 	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
 		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
 			/usr/lib64/libgsk8${i}_64.so
 	done
 	for i in capicmd ver; do
 		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
 	done
 	# Done with the postinstall scripts as the RPMs contain them.
 	# Now on to some more Gentoo-specific installation.
 	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
 	# Avoid "QA Notice: Found an absolute symlink in a library directory"
 	local target
 	find "${D}"usr/lib* -lname '/*' | while read i; do
 		target=$(readlink "${i}")
 		rm -v "${i}" || die
 		dosym "../..${target}" "${i#${D}}"
 	done
 	keepdir /var/log/tsm
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/tsm.logrotate" tsm
 	keepdir /etc/tivoli
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
 	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
 	# Added the hostname to be more friendly, the admin will need to edit this file anyway
 	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
 	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
 	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
 	# Setup the env
 	dodir /etc/env.d
 	ENV_FILE="${D}/etc/env.d/80tivoli"
 	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
 	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
 	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
 	insinto "/etc/revdep-rebuild"
 	doins "${T}/80${PN}"
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
 	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
 	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
 	systemd_dounit "${FILESDIR}/dsmc.service"
 	systemd_dounit "${FILESDIR}/dsmcad.service"
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	local i dirs
 	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
 		if [[ ! -e $i ]]; then
 			touch $i || die
 			chown :tsm $i || die
 			chmod 0660 $i || die
 		fi
 	done
 	# Bug #375041: the log directory itself should not be world writable.
 	# Have to do this in postinst due to bug #141619
 	chown root:tsm /var/log/tsm || die
 	chmod 0750 /var/log/tsm || die
 	# Bug 508052: directories used to be too restrictive, have to widen perms.
 	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
 	chown root:root "${dirs[@]}" || die
 	chmod 0755 "${dirs[@]}" || die
 	FORCE_PRINT_ELOG=1
 	DISABLE_AUTOFORMATTING=1
 	readme.gentoo_print_elog
 }
--- a/app-backup/tsm/tsm-8.1.12.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.12.0.ebuild
@ -1,30 +1,24 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
+inherit multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
-MY_PV_MAJOR=$(get_major_version)
+MY_PV_NODOTS="$(ver_rs)"
 MY_PV_MINOR=$(get_version_component_range 2)
 MY_PV_TINY=$(get_version_component_range 3)
 MY_PV_PATCH=$(get_version_component_range 4)
-MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+if [[ "$(ver_cut 4)" == "0" ]]; then
 MY_PVR_ALLDOTS=${PV}
 if [[ ${MY_PV_PATCH} == 0 ]]; then
 	MY_RELEASE_PATH=maintenance
 else
 	MY_RELEASE_PATH=patches
 fi
 BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
-BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v$(ver_cut 1-1)r$(ver_cut 2-2)/"
-BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+BASE_URI+="Linux/LinuxX86/BA/v$(ver_rs 1-3 '' $(ver_cut 1-3))/"
-SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_TAR="${PV}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
@ -41,7 +35,7 @@ QA_PREBUILT="*"
 # not available (yet?)
 #MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
 #	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
-MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+MY_LANG_PV="${PV}-"
 for lang in ${MY_LANGS}; do
 	IUSE="${IUSE} l10n_${lang%:*}"
 	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
--- a/app-backup/tsm/tsm-8.1.9.0.ebuild
+++ b/app-backup/tsm/tsm-8.1.9.0.ebuild
@ -1,238 +0,0 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
 MY_PV_MAJOR=$(get_major_version)
 MY_PV_MINOR=$(get_version_component_range 2)
 MY_PV_TINY=$(get_version_component_range 3)
 MY_PV_PATCH=$(get_version_component_range 4)
 MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
 MY_PVR_ALLDOTS=${PV}
 if [[ ${MY_PV_PATCH} == 0 ]]; then
 	MY_RELEASE_PATH=maintenance
 else
 	MY_RELEASE_PATH=patches
 fi
 BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
 BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
 BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
 SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
 LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
 	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
 	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
 	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="acl java +tsm_cit +tsm_hw"
 QA_PREBUILT="*"
 # not available (yet?)
 #MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT ja:JA_JP
 #	ko:KO_KR pl:PL_PL pt-BR:PT_BR ru:RU_RU zh-CN:ZH_CN zh-TW:ZH_TW"
 MY_LANG_PV="${MY_PVR_ALLDOTS}-"
 for lang in ${MY_LANGS}; do
 	IUSE="${IUSE} l10n_${lang%:*}"
 	SRC_URI="${SRC_URI} l10n_${lang%:*}? ( \
 ${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
 ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
 done
 unset lang
 DEPEND=""
 RDEPEND="
 	dev-libs/expat
 	dev-libs/libxml2
 	sys-fs/fuse:0
 	acl? ( sys-apps/acl )
 	java? ( >=virtual/jre-1.7 )
 "
 S="${WORKDIR}/bacli"
 pkg_setup() {
 	enewgroup tsm
 	DOC_CONTENTS="
 		Note that you have to be root to be able to use the Tivoli Storage Manager
 		client. The dsmtca trusted agent binary does not exist anymore.
 		For information on how to give other users access, please see the following
 		URLs:
 		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_cfg_nonadmin.html#c_macuninst_nonadmin
 		https://www.ibm.com/support/knowledgecenter/SSGSG7_7.1.8/client/c_secure_pwd.html#c_secure_pwd__sec_no_tca
 	"
 }
 src_unpack() {
 	local rpm rpms lang
 	mkdir bacli || die
 	cd bacli || die
 	unpack ${SRC_TAR}
 	cd "${S}"
 	for rpm in *.rpm; do
 		case ${rpm} in
 			TIVsm-APIcit.*|TIVsm-BAcit.*)
 				use tsm_cit && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-BAhdw.*)
 				use tsm_hw && rpms="${rpms} ./${rpm}"
 				;;
 			TIVsm-JBB.*|*-filepath-*)
 				# "journal based backup" for all filesystems
 				# requires a kernel module.
 				# "Linux Filepath source code" available
 				# by request from vendor
 				;;
 			*)
 				rpms="${rpms} ./${rpm}"
 				;;
 		esac
 	done
 	for rpm in ${A}; do
 		case ${rpm} in
 			*.rpm)
 				rpms="${rpms} ${rpm}"
 				;;
 		esac
 	done
 	rpm_unpack ${rpms}
 	# Avoid strange error messages caused by read-only files
 	chmod -R u+w "${S}" || die
 }
 src_install(){
 	cp -a opt "${D}" || die
 	cp -a usr "${D}" || die
 	# The RPM files contain postinstall scripts which can be extracted
 	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
 	# Below we try to mimic the behaviour of these scripts.
 	# We don't deal with SELinux compliance (yet), though.
 	local RPM_INSTALL_PREFIX CLIENTDIR i
 	RPM_INSTALL_PREFIX=/opt
 	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
 	# Create links for messages; this is spread over several postin scripts.
 	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
 	#	dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
 	#	dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
 	#done
 	# Mimic TIVsm-API64 postinstall script
 	for i in libgpfs.so libdmapi.so; do
 		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
 	done
 	# The TIVsm-BA postinstall script only does messages and ancient upgrades
 	# The gscrypt64 postinstall script only deals with s390[x] SELinux
 	# and the symlink for the iccs library which we handle in the loop below.
 	# Move stuff from /usr/local to /opt, #452332
 	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
 	rmdir "${D}"/usr/local || die
 	# Mimic gskssl64 postinstall script
 	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
 		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
 			/usr/lib64/libgsk8${i}_64.so
 	done
 	for i in capicmd ver; do
 		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
 	done
 	# Done with the postinstall scripts as the RPMs contain them.
 	# Now on to some more Gentoo-specific installation.
 	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
 	# Avoid "QA Notice: Found an absolute symlink in a library directory"
 	local target
 	find "${D}"usr/lib* -lname '/*' | while read i; do
 		target=$(readlink "${i}")
 		rm -v "${i}" || die
 		dosym "../..${target}" "${i#${D}}"
 	done
 	keepdir /var/log/tsm
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/tsm.logrotate" tsm
 	keepdir /etc/tivoli
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
 	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
 	# Added the hostname to be more friendly, the admin will need to edit this file anyway
 	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
 	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
 	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
 	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
 	# Setup the env
 	dodir /etc/env.d
 	ENV_FILE="${D}/etc/env.d/80tivoli"
 	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
 	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
 	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
 	insinto "/etc/revdep-rebuild"
 	doins "${T}/80${PN}"
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
 	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
 	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
 	systemd_dounit "${FILESDIR}/dsmc.service"
 	systemd_dounit "${FILESDIR}/dsmcad.service"
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	local i dirs
 	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
 		if [[ ! -e $i ]]; then
 			touch $i || die
 			chown :tsm $i || die
 			chmod 0660 $i || die
 		fi
 	done
 	# Bug #375041: the log directory itself should not be world writable.
 	# Have to do this in postinst due to bug #141619
 	chown root:tsm /var/log/tsm || die
 	chmod 0750 /var/log/tsm || die
 	# Bug 508052: directories used to be too restrictive, have to widen perms.
 	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
 	chown root:root "${dirs[@]}" || die
 	chmod 0755 "${dirs[@]}" || die
 	FORCE_PRINT_ELOG=1
 	DISABLE_AUTOFORMATTING=1
 	readme.gentoo_print_elog
 }
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,2 +0,0 @@
 DIST kicad-doc-5.0.2.tar.gz 68999325 BLAKE2B 000fdc4293b5cfa0f09290cbfdd7e1f2b881e79dc61acef1418773be669aad0c214df155bb0edf07dbc1157e6619c627d4455ad6da00108838af4d7610d632e6 SHA512 e9f34c478c0eb4d79c13236a5b105882a8411047c73ed822df2fad1b1eaabc45d8fd61a055069000ebfc724e6e3e828dbab16855cfe51bb70623a56e1e50f0d8
 EBUILD kicad-doc-5.0.2.ebuild 1282 BLAKE2B 077099fadccb3eb08b50efebf6e0a9400f4cf9dad5b2430d2c9338b479b2c0b49bb4c4b8ba3d3854178387df8b9c2eb6ff6e47fb61e41554d4c15137588315a7 SHA512 f399261b647092f7ebea60233825f2e8994664ebef4945c7a9e93a2eb63d2d131cee4d8b8f16a6619a66f612aaae43b0a17d711cb97b50785d305f9e442c8373
--- a/app-doc/kicad-doc/kicad-doc-5.0.2.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.0.2.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
 HOMEPAGE="http://www.kicad-pcb.org/"
 SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="html +pdf"
 LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl"
 IUSE+=${LANG_USE}
 REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
 unset LANG_USE
 DEPEND="
 	>=app-text/asciidoc-8.6.9
 	>=app-text/dblatex-0.3.10
 	>=app-text/po4a-0.45
 	>=sys-devel/gettext-0.18
 	dev-perl/Unicode-LineBreak
 	dev-util/source-highlight
 	l10n_ca? ( dev-texlive/texlive-langspanish )
 	l10n_de? ( dev-texlive/texlive-langgerman )
 	l10n_en? ( dev-texlive/texlive-langenglish )
 	l10n_es? ( dev-texlive/texlive-langspanish )
 	l10n_fr? ( dev-texlive/texlive-langfrench )
 	l10n_it? ( dev-texlive/texlive-langitalian )
 	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
 	l10n_pl? ( dev-texlive/texlive-langpolish )"
 RDEPEND=""
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
 		-DSINGLE_LANGUAGE="${L10N}"
 	)
 	cmake-utils_src_configure
 }
--- a/app-misc/concordance/ChangeLog
+++ b/app-misc/concordance/ChangeLog
@ -1,9 +0,0 @@
 # ChangeLog for app-misc/concordance
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 *concordance-0.24 (30 Oct 2012)
  30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de>
  +concordance-0.24.ebuild, +metadata.xml:
  initial ebuild
--- a/app-misc/concordance/Manifest
+++ b/app-misc/concordance/Manifest
@ -1,4 +0,0 @@
 DIST concordance-0.24.tar.bz2 1082955 SHA256 e2bea0430e936fd9e3e6a853b6533edbfd9211cf328c5334789b432035f03656 SHA512 d49af8fed94199dd183085dc013ad35801dd98283ee7e6c46e07a1fbea50d078201f51ab32cb92c3a8bf3d9099b3b6ae3d9aba05211570e76227c995e724323a WHIRLPOOL 282770806c300ed9510dea01c0baad1829492cc4ddf672de6dd34cf0b99c6ea69fc0e278ea63f5762687a0146bc9d384956e4607286edb96c18613630fdb54e6
 EBUILD concordance-0.24.ebuild 1102 SHA256 0ee730cb39684a7f2d508b8787266363b3020dd71febc64e298900bcef18aa50 SHA512 f3ed2b6d0bc0318bfb9729d69d992420effefe0a80ccd405a0b3ab838c70c4f833b42ab6a74c2d1c35666c7eee68877a03362b6203955759e7162552a6f821c3 WHIRLPOOL 5770824f9d653f7993b1c716424b6e7e877a3a438fa7612f5167186ddfebd1bb1c6f3fc56d3ea4ea581ebeb13fce1886b9f030cf84fd5e85feed5f21361742ad
 MISC ChangeLog 266 SHA256 061b2baa14d49fba652a49e717e60e9ac1eecbcfd53c577e3a18a189ac92c5ca SHA512 700e42664df8c71a25979be6bc9acca29222da24aebf22d717c56f46ecca7af473156123e2dd2c277022914f8a340219c5c62e04266d6eceab0854bdec8e424a WHIRLPOOL bd36e5ed77f9e7b3af0d656ac2b24e276a854e480f55072df61c5530e3c3b6b6c81f0b82ec518c6eec0c90a31eca0ca1bb8c0021ab63da15e006383c8e602de5
 MISC metadata.xml 229 SHA256 1dc92f5b2030f244164224424f100de3bd51b83de33eca93b2df2e30a23db61c SHA512 20398591940a347d6f2fd6b202833c9ff6482f05c760ee8001bc82127901b5800f00d11ccb3902a92b4c1bdd2c47f6e0c118654d0146312443369ec84f676907 WHIRLPOOL 35415755173534553f652b588970e2c0e8a8e9b0f90a94b72a8a67ab17c87138036bf0132b651d4c261dc69819029700163f5e549dd166c4ae60726f1088d685
--- a/app-misc/congruity/ChangeLog
+++ b/app-misc/congruity/ChangeLog
@ -1,9 +0,0 @@
 # ChangeLog for app-misc/congruity
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 *congruity-15 (30 Oct 2012)
  30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de> +congruity-15.ebuild,
  +metadata.xml:
  initial ebuild
--- a/app-misc/congruity/Manifest
+++ b/app-misc/congruity/Manifest
@ -1,4 +0,0 @@
 DIST congruity-15.tar.bz2 156839 SHA256 87db67d9c6f2d578104936bb17e2d330aee96ec3a94a5c20972bfa4cb463a74f SHA512 53fd75fda2c009bf6517f1541c5c3c41cf413af449f613d4d1aa71347eb4d4c28012ef4727fee1b12cc51b0902509afabafa1219a57bd5322bc03df3f4ab13a2 WHIRLPOOL 0d7ebd13089201e7d4de784618c23d9ef2b872c5bd66cf728b7a8e4ef5e672babf2c37936f51f8bc4799b67d2f091e28b08a8c3da2d89e51ff6ecef91db55823
 EBUILD congruity-15.ebuild 659 SHA256 69c72b352ce369d624faed9d9b49ae6e9e80d17837b072e0237bae2cd33b8b6c SHA512 78594cbf4db0a9dcc8333587785eadb82807d125990aa4da435faa7a3e5e845b1804fddd6a9dddae73251bada1c96f967352b34a02dcba0a57b09cee8594753a WHIRLPOOL b07609d7c53791f6836a2255ad74a9c04ca4ce20f8bbd75da81f0fba464a43d4812c7b78bb5d3a1c0255689e472011cf6db6634df71536bd24a79783b4db167b
 MISC ChangeLog 256 SHA256 5ac6b52a2f3e348da1e4b596cfc11f4d787aae24a350e1793eb3e502176fd96e SHA512 a64032cafcdae20448bb4cdb8b513a0cbf08c1b73f507da7961b1eab984cae9fa1182b831959874912f53eedcf4051b37e75961b7080f24bce7dcbfc7524700c WHIRLPOOL 7bf068f0d82547104eea18c61e892ae2bcd7e45e8818fc1d6957ad7bb77671e8d26009e2232244e462b9b9da60082e18157c8d25fe7140f145e0fe2ef6bcb4fa
 MISC metadata.xml 229 SHA256 1dc92f5b2030f244164224424f100de3bd51b83de33eca93b2df2e30a23db61c SHA512 20398591940a347d6f2fd6b202833c9ff6482f05c760ee8001bc82127901b5800f00d11ccb3902a92b4c1bdd2c47f6e0c118654d0146312443369ec84f676907 WHIRLPOOL 35415755173534553f652b588970e2c0e8a8e9b0f90a94b72a8a67ab17c87138036bf0132b651d4c261dc69819029700163f5e549dd166c4ae60726f1088d685
--- a/app-misc/congruity/congruity-15.ebuild
+++ b/app-misc/congruity/congruity-15.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=4
 DESCRIPTION="Linux GUI client for programming the Logitech Harmony universal remote"
 HOMEPAGE="http://sourceforge.net/projects/congruity/"
 SRC_URI="mirror://sourceforge/congruity/${P}.tar.bz2"
 LICENSE="GPL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND="dev-libs/libconcord
 	dev-lang/python
 	dev-python/wxpython"
 RDEPEND="${DEPEND}"
 src_compile() {
 	sed -i "s/\/usr\/local/\/usr/g" ${S}/Makefile
 	emake DESTDIR="${D}" all || die
 }
 src_install() {
 	 emake DESTDIR="${D}" UPDATE_DESKTOP_DB="" install || die "install failed"
 }
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@ -1,9 +0,0 @@
 AUX 0.5.1-LCDd.initd 533 BLAKE2B 65263278bb7bd6cbba7d4c599cefd3735dd5d16ad0d56c130cf035286c7fe6d19c546d43662a513e73eeeaae154f6f24aecd534531e960cf67c6cade635bc8b0 SHA512 66e6ac519ca9919dc1321cdfbac3c8a54be681f534dcdfd06b5ec90c859a14694c6a6925983c3be58f2aa8d6391028fd8d978d7641710a23394ae87dca892900
 AUX 0.5.2-r2-lcdproc.initd 382 BLAKE2B 9e050b785119e23a749f52a893d2672cab608e7a5881319e1dc230e77ad9ce647f7258d86a8a710aebaf3de94fb691c1e974c21b2445453cd6bd5ca3c0ae3bec SHA512 9dc7667af52a2e95a28ee07c7646a124b46019643df19becc8f129da553a70b40c534b6c73057c73238efd232e98f02372d55a92135fccd9c297d776c53d3767
 AUX LCDd.service 167 BLAKE2B bcc7aa31303eaf98b463ef5424d34d0c227ce3f1022718f29ff3b2b92c7abc90ec043850d965a8d7205e82dd5a67b8e84ebd0cf2fb69c1596c7d614b685b44c7 SHA512 ddb78352932e19311febc4d5721e1e0904e7b17b03d63a67d17a57a0ecb85dc17c3445edd374dfc33a666b281e6d5a72609df01537afe8ab43080aaa951d5cdd
 AUX lcdproc.service 203 BLAKE2B 76ad4d54a1008009399cceab510a06440daa7754f5cf0eb4213c3dda637d4e15fb6dab7a42358d8268d3032417a7624c00490497273e915eb91221ac562e90a6 SHA512 4ddd09a10c0a95c8606f891e655db7ce99cde1dbdc0e63a0ac4a5b37daf2f950fc90b7749b0feba186477aeaae2b818438dc62cbb13b1aeb2bb5ff4a662b3b6d
 DIST lcdproc-0.5.7.tar.gz 1047394 BLAKE2B 499d46585633ee6968adc1b5eb916f9737610606b0a8497f72f09cfa75fbd41c880d81ea2be44c50b1d124adf2c70ed49a9ae9a1c70a89899ad932cef7f10b89 SHA512 bd8d176347d8e5e5a4679757b582f766c72b28bac6a73b8bdf1b5f2da9b9f4b6117f1091817eb75cf5b347bf288405744dffb87601a0a858944311cb1ee8660d
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 EBUILD lcdproc-0.5.7.ebuild 6226 BLAKE2B 6a1970b9230b42a404142b5a4d662fee533d2433ed99fdeaf8ba84f4251544688384df13fa9703ff7bdefdf9bc6c518056d725256546fc3d076b307c79044e51 SHA512 866636b3c0579a3b12155322817e139e1d63d4e94621b9c0a2d5f28097d3f63f6e93536428d827321dd716f18949ea9860b10706972d58dcd37198bea9ede26a
 EBUILD lcdproc-0.5.9.ebuild 6099 BLAKE2B 6c75452bd4587eed5f869fafbe400e8432e22924022de84d337899d8a669266c7c4006ee1e4e15cbd5629e390d99d52b46aae3a2e8c26e646f4e74350335ba67 SHA512 917754992c5d53939d108c95b37836803eb2124e4b972dad784392cabbee2edbe9b460ecdae4b4b53a7c2d1b409bd6a3d67d6465e85dab1f96fd49ec5e93299b
 MISC metadata.xml 1423 BLAKE2B b5f4d4202cc8178d0ddb4ace19592e15c5bdd68cd0239a219b866d3b6f7e404110858eadb81a7bbd456bc1db237754edfcf7bd9966a76755a81e4b5742712d7c SHA512 b62797738fd47a23fd83c31a027b1636374183488075e9c2073419ca6c08960c60d0bc6108c7148a144852dd45cad5ddd457879249331426f9594fac43cef306
--- a/app-misc/lcdproc/files/0.5.1-LCDd.initd
+++ b/app-misc/lcdproc/files/0.5.1-LCDd.initd
@ -1,21 +0,0 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 depend() {
 	use net
 	use g15daemon
 }
 start() {
 	ebegin "Starting LCDd"
 	start-stop-daemon --start --quiet -m --pidfile /var/run/LCDd.pid \
 		--background --exec /usr/sbin/LCDd -- -s 1 -f
 	eend $? "Failed to start LCDd. Did you remember to set a driver in /etc/LCDd.conf? See syslog for details."
 }
 stop() {
 	ebegin "Stopping LCDd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/LCDd.pid
 	eend $?
 }
--- a/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
+++ b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
@ -1,21 +0,0 @@
 #!/sbin/openrc-run
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 depend(){
 	use LCDd
 	after ntp-client
 }
 start() {
 	ebegin "Starting lcdproc"
 	start-stop-daemon --start --background \
 		--exec /usr/bin/lcdproc
 	eend $?
 }
 stop() {
 	ebegin "Stopping lcdproc"
 	start-stop-daemon --stop --exec /usr/bin/lcdproc
 	eend $?
 }
--- a/app-misc/lcdproc/files/LCDd.service
+++ b/app-misc/lcdproc/files/LCDd.service
@ -1,12 +0,0 @@
 [Unit]
 Description = LCD Display daemon
 [Service]
 Type = forking
 ExecStart = /usr/sbin/LCDd
 Restart = always
 RestartSec = 60
 [Install]
 WantedBy = multi-user.target
--- a/app-misc/lcdproc/files/lcdproc.service
+++ b/app-misc/lcdproc/files/lcdproc.service
@ -1,13 +0,0 @@
 [Unit]
 Description = Display system info on LCD
 After = LCDd.service
 [Service]
 ExecStart = /usr/bin/lcdproc
 Restart = always
 RestartSec = 60
 [Install]
 WantedBy = multi-user.target
 Also = LCDd.service
--- a/app-misc/lcdproc/lcdproc-0.5.7.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.7.ebuild
@ -1,201 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit multilib versionator systemd
 MY_PV=$(replace_version_separator 3 '-')
 MY_P=${PN}-${MY_PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc ftdi hid irman joystick lirc nfs png samba seamless-hbars systemd truetype usb"
 # The following array holds the USE_EXPANDed keywords
 IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontzpacket
 	cwlinux eyeboxone g15 graphlcd glk
 	hd44780 icpa106 imon imonlcd iowarrior
 	lb216 lcdm001 lcterm
 	md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
 	pyramid sdeclcd sed1330 sed1520 serialvfd sli
 	stv5730 SureElec svga t6963 text tyan
 	ula200 vlsys_m428 xosd ea65 picolcd serialpos
 	i2500vfd irtrans lis shuttlevfd )
 # Iterate through the array and add the lcd_devices_* that we support
 NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
 index=0
 while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
 	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
 	let "index = ${index} + 1"
 done
 REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
 RDEPEND="
 	ftdi?     ( dev-embedded/libftdi:0 )
 	hid?	  ( >=dev-libs/libhid-0.2.16 )
 	irman?    ( media-libs/libirman )
 	lirc?     ( app-misc/lirc )
 	png?      ( media-libs/libpng:0 )
 	truetype? ( media-libs/freetype:2 )
 	usb?      ( virtual/libusb:0 )
 	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver dev-libs/serdisplib )
 	lcd_devices_g15?       ( dev-libs/libg15  dev-libs/libg15render )
 	lcd_devices_ncurses?   ( sys-libs/ncurses:= )
 	lcd_devices_svga?      ( media-libs/svgalib )
 	lcd_devices_ula200?    ( dev-embedded/libftdi:0 )
 	lcd_devices_xosd?      ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
 	lcd_devices_cfontzpacket? ( virtual/libusb:0 )
 	lcd_devices_cwlinux?    ( virtual/libusb:0 )
 	lcd_devices_pyramid?    ( virtual/libusb:0 )
 	lcd_devices_picolcd?    ( virtual/libusb:0 )
 	lcd_devices_i2500vfd?   ( dev-embedded/libftdi:0 )
 	lcd_devices_lis?        ( dev-embedded/libftdi:0 virtual/libusb:0 )
 	lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
 DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto
 	       app-text/docbook-xml-dtd:4.5 )"
 RDEPEND="${RDEPEND}
 	lcd_devices_g15?      ( app-misc/g15daemon )"
 pkg_setup() {
 	if [ -n "${LCDPROC_DRIVERS}" ] ; then
 		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
 		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
 	fi
 }
 src_prepare() {
 	sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
 	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
 	default
 }
 src_configure() {
 	# This array contains the driver names required by configure --with-drivers=
 	# The positions must be the same as the corresponding use_expand flags
 	local DEVICE_DRIVERS=(curses bayrad CFontz CFontzPacket
 		CwLnx EyeboxOne g15 glcd,glcdlib glk
 		hd44780 icp_a106 imon imonlcd IOWarrior
 		lb216 lcdm001 lcterm
 		MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
 		pyramid sdeclcd sed1330 sed1520 serialVFD sli
 		stv5730 SureElec svga t6963 text tyan
 		ula200 vlsys_m428 xosd ea65 picolcd serialPOS
 		i2500vfd irtrans lis shuttleVFD )
 	# Generate comma separated list of drivers
 	COMMA_DRIVERS=""
 	FIRST_DRIVER=""
 	local index=0
 	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
 		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
 			append-driver "${DEVICE_DRIVERS[${index}]}"
 		fi
 		let "index = ${index} + 1"
 	done
 	# Append the not-lcd-drivers (input)
 	use lirc && append-driver "lirc"
 	use irman && append-driver "irman"
 	use joystick && append-driver "joy"
 	if [ -z "${COMMA_DRIVERS}" ] ; then
 		ewarn "You are compiling LCDd without support for any LCD drivers at all."
 	else
 		# Patch the config to contain a driver that is actually installed instead of the default
 		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
 		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
 		sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
 	fi
 	local EXTRA_CONF
 	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
 		use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
 		EXTRA_CONF="--enable-libusb"
 	else
 		EXTRA_CONF="$(use_enable usb libusb)"
 	fi
 	if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
 		EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
 	else
 		EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
 	fi
 	econf --enable-extra-charmaps \
 		$(use_enable debug) \
 		$(use_enable nfs stat-nfs) \
 		$(use_enable png libpng) \
 		$(use_enable samba stat-smbfs ) \
 		$(use_enable seamless-hbars) \
 		$(use_enable truetype freetype) \
 		${EXTRA_CONF} \
 		"--enable-drivers=${COMMA_DRIVERS}"
 }
 src_compile() {
 	default
 	if use doc; then
 		ebegin "Creating user documentation"
 		cd "${S}"/docs/lcdproc-user
 		xmlto html --skip-validation lcdproc-user.docbook
 		eend $?
 		ebegin "Creating dev documentation"
 		cd "${S}"/docs/lcdproc-dev
 		xmlto html --skip-validation lcdproc-dev.docbook
 		eend $?
 	fi
 }
 append-driver() {
 	[[ -z $* ]] && return 0
 	if [ -z "${COMMA_DRIVERS}" ] ; then
 		# First in the list
 		COMMA_DRIVERS="$*"
 		FIRST_DRIVER="$*"
 	else
 		# Second, third, ... include a comma at the front
 		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
 	fi
 	return 0
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	# move example clients installed to /usr/bin
 	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
 	insinto /usr/share/lcdproc/clients
 	doins clients/examples/*.pl
 	doins clients/metar/*.pl
 	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
 	newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
 	if use systemd; then
 		systemd_dounit "${FILESDIR}"/LCDd.service
 		systemd_dounit "${FILESDIR}"/lcdproc.service
 	fi
 	dodoc README CREDITS ChangeLog INSTALL TODO
 	if use doc; then
 		insinto /usr/share/doc/${PF}/lcdproc-user
 		doins docs/lcdproc-user/*.html
 		insinto /usr/share/doc/${PF}/lcdproc-dev
 		doins docs/lcdproc-dev/*.html
 	fi
 }
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
@ -1,196 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit multilib versionator systemd
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc ftdi hid irman joystick lirc nfs png samba systemd truetype usb"
 # The following array holds the USE_EXPANDed keywords
 IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontzpacket
 	cwlinux eyeboxone g15 graphlcd glk
 	hd44780 icpa106 imon imonlcd iowarrior
 	lb216 lcdm001 lcterm
 	md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
 	pyramid sdeclcd sed1330 sed1520 serialvfd sli
 	stv5730 SureElec svga t6963 text tyan
 	ula200 vlsys_m428 xosd ea65 picolcd serialpos
 	i2500vfd irtrans lis shuttlevfd )
 # Iterate through the array and add the lcd_devices_* that we support
 NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
 index=0
 while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
 	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[${index}]}"
 	let "index = ${index} + 1"
 done
 REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
 RDEPEND="
 	ftdi?     ( dev-embedded/libftdi:0 )
 	hid?	  ( >=dev-libs/libhid-0.2.16 )
 	irman?    ( media-libs/libirman )
 	lirc?     ( app-misc/lirc )
 	png?      ( media-libs/libpng:0 )
 	truetype? ( media-libs/freetype:2 )
 	usb?      ( virtual/libusb:0 )
 	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver dev-libs/serdisplib )
 	lcd_devices_g15?       ( dev-libs/libg15  dev-libs/libg15render )
 	lcd_devices_ncurses?   ( sys-libs/ncurses:= )
 	lcd_devices_svga?      ( media-libs/svgalib )
 	lcd_devices_ula200?    ( dev-embedded/libftdi:0 )
 	lcd_devices_xosd?      ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
 	lcd_devices_cfontzpacket? ( virtual/libusb:0 )
 	lcd_devices_cwlinux?    ( virtual/libusb:0 )
 	lcd_devices_pyramid?    ( virtual/libusb:0 )
 	lcd_devices_picolcd?    ( virtual/libusb:0 )
 	lcd_devices_i2500vfd?   ( dev-embedded/libftdi:0 )
 	lcd_devices_lis?        ( dev-embedded/libftdi:0 virtual/libusb:0 )
 	lcd_devices_shuttlevfd? ( virtual/libusb:0 )"
 DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto
 	       app-text/docbook-xml-dtd:4.5 )"
 RDEPEND="${RDEPEND}
 	lcd_devices_g15?      ( app-misc/g15daemon )"
 pkg_setup() {
 	if [ -n "${LCDPROC_DRIVERS}" ] ; then
 		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
 		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
 	fi
 }
 src_prepare() {
 	sed -i "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf || die
 	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
 	default
 }
 src_configure() {
 	# This array contains the driver names required by configure --with-drivers=
 	# The positions must be the same as the corresponding use_expand flags
 	local DEVICE_DRIVERS=(curses bayrad CFontz CFontzPacket
 		CwLnx EyeboxOne g15 glcd,glcdlib glk
 		hd44780 icp_a106 imon imonlcd IOWarrior
 		lb216 lcdm001 lcterm
 		MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
 		pyramid sdeclcd sed1330 sed1520 serialVFD sli
 		stv5730 SureElec svga t6963 text tyan
 		ula200 vlsys_m428 xosd ea65 picolcd serialPOS
 		i2500vfd irtrans lis shuttleVFD )
 	# Generate comma separated list of drivers
 	COMMA_DRIVERS=""
 	FIRST_DRIVER=""
 	local index=0
 	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
 		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
 			append-driver "${DEVICE_DRIVERS[${index}]}"
 		fi
 		let "index = ${index} + 1"
 	done
 	# Append the not-lcd-drivers (input)
 	use lirc && append-driver "lirc"
 	use irman && append-driver "irman"
 	use joystick && append-driver "joy"
 	if [ -z "${COMMA_DRIVERS}" ] ; then
 		ewarn "You are compiling LCDd without support for any LCD drivers at all."
 	else
 		# Patch the config to contain a driver that is actually installed instead of the default
 		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
 		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
 		sed -i "53s:curses:${FIRST_DRIVER}:" LCDd.conf || die
 	fi
 	local EXTRA_CONF
 	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid || \
 		use lcd_devices_picolcd || use lcd_devices_lis || use lcd_devices_shuttlevfd ; then
 		EXTRA_CONF="--enable-libusb"
 	else
 		EXTRA_CONF="$(use_enable usb libusb)"
 	fi
 	if use lcd_devices_ula200 || use lcd_devices_i2500vfd || use lcd_devices_lis ; then
 		EXTRA_CONF="${EXTRA_CONF} --enable-libftdi"
 	else
 		EXTRA_CONF="${EXTRA_CONF} $(use_enable ftdi libftdi)"
 	fi
 	econf --enable-extra-charmaps \
 		$(use_enable debug) \
 		$(use_enable nfs stat-nfs) \
 		$(use_enable png libpng) \
 		$(use_enable samba stat-smbfs ) \
 		$(use_enable truetype freetype) \
 		${EXTRA_CONF} \
 		"--enable-drivers=${COMMA_DRIVERS}"
 }
 src_compile() {
 	default
 	if use doc; then
 		ebegin "Creating user documentation"
 		cd "${S}"/docs/lcdproc-user
 		xmlto html --skip-validation lcdproc-user.docbook
 		eend $?
 		ebegin "Creating dev documentation"
 		cd "${S}"/docs/lcdproc-dev
 		xmlto html --skip-validation lcdproc-dev.docbook
 		eend $?
 	fi
 }
 append-driver() {
 	[[ -z $* ]] && return 0
 	if [ -z "${COMMA_DRIVERS}" ] ; then
 		# First in the list
 		COMMA_DRIVERS="$*"
 		FIRST_DRIVER="$*"
 	else
 		# Second, third, ... include a comma at the front
 		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
 	fi
 	return 0
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	# move example clients installed to /usr/bin
 	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
 	insinto /usr/share/lcdproc/clients
 	doins clients/examples/*.pl
 	doins clients/metar/*.pl
 	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
 	newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
 	if use systemd; then
 		systemd_dounit "${FILESDIR}"/LCDd.service
 		systemd_dounit "${FILESDIR}"/lcdproc.service
 	fi
 	dodoc CREDITS.md TODO
 	if use doc; then
 		insinto /usr/share/doc/${PF}/lcdproc-user
 		doins docs/lcdproc-user/*.html
 		insinto /usr/share/doc/${PF}/lcdproc-dev
 		doins docs/lcdproc-dev/*.html
 	fi
 }
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@ -1,29 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
 	<longdescription lang="en">
 		LCDproc is a piece of software that displays real-time system information
 		from your Linux/*BSD box on a LCD. The server supports several serial
 		devices: Matrix Orbital, CrystalFontz, Bayrad, LB216, LCDM001
 		(kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some
 		devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and
 		SED1330. Various clients are available that display things like CPU load,
 		system load, memory usage, uptime, and a lot more.
 	</longdescription>
 	<use>
 		<flag name="hid">Enable HID support using libhid</flag>
 		<flag name="irman">Enable support for IRMan (<pkg>media-libs/libirman</pkg>)</flag>
 		<flag name="nfs">Adds support for NFS file system</flag>
 		<flag name="seamless-hbars">Try to avoid gaps in horizontal bars</flag>
 		<flag name="ftdi">Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)</flag>
 		<flag name="lcd_devices_sdeclcd">Enable support for VLSYS M428 display</flag>
 		<flag name="lcd_devices_vlsys_m428">Enable support for VLSYS M428 display</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">lcdproc</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-embedded/arduino-ide/Manifest
+++ b/dev-embedded/arduino-ide/Manifest
@ -1,5 +0,0 @@
 AUX arduino-ide-1.6.8-script.patch 660 SHA256 f80ffc3cf2f2a333862b5a1826c747aa92efbf8e90c92cb339d31cd5b27b07b2 SHA512 bbdae2bd2adcb461962308ef9ed6c86005fb2ae214bb9fb755554b440a87063562a79da9492308c6e614b771c4d9c3721e369dbb1df63534d5238a2b151ddb00 WHIRLPOOL 31b5319dc111e50f925e9dc3bd2819317e2f7d2b02cd451f9b41fddb855655d4589c106bffbb832c9ce7fc5f0dbebd2f62aa06ba37131135fcdc2c2767e072de
 AUX arduino-ide-1.6.9-script.patch 660 SHA256 f80ffc3cf2f2a333862b5a1826c747aa92efbf8e90c92cb339d31cd5b27b07b2 SHA512 bbdae2bd2adcb461962308ef9ed6c86005fb2ae214bb9fb755554b440a87063562a79da9492308c6e614b771c4d9c3721e369dbb1df63534d5238a2b151ddb00 WHIRLPOOL 31b5319dc111e50f925e9dc3bd2819317e2f7d2b02cd451f9b41fddb855655d4589c106bffbb832c9ce7fc5f0dbebd2f62aa06ba37131135fcdc2c2767e072de
 DIST arduino-1.8.1.tar.gz 86826305 SHA256 cc82bbb2979fbf53dc4775668de7e5eefcb61ab65f46507aa933107ad458d268 SHA512 1ca8c306d2bdee52fbc69ba7b933ac9a3a1154cfa2e5861e75b5eb2ca1cdfa7843b36b36eae68d8d932194be5ea938fbe3c2492b87d81d88d88edd9d0aeb1541 WHIRLPOOL 0ca152bbf1600e0f15ceb11130252fb353f2b7b74c461f8d8725ca9175295bc29a1609c847a1544df4053673b8e01207267c9e9a493fd08dc75cf05614c697b7
 DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
 EBUILD arduino-ide-1.8.1.ebuild 2550 SHA256 b2122760355987ff7d4892ee612efc8533f72704c3fc968bc42d40cc732ee14b SHA512 7fd4f8aa37674693429e6b4e42a4f075f1b75488d42a7ab5594e6f18f6283cb4064551df056bccbaa268c1e34b4b8eefec5ff4e3740c275d6e0a41530f030f23 WHIRLPOOL 642da1683a2c39acbf49ecb48abeb9862831a5fefa0df76d0dbf193ac24f4b942d7dde44f90745252dee6bb8ea62a8a939c11ebcccd1ee9750887be6023594aa
--- a/dev-embedded/arduino-ide/arduino-ide-1.8.1.ebuild
+++ b/dev-embedded/arduino-ide/arduino-ide-1.8.1.ebuild
@ -1,96 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 JAVA_PKG_IUSE="doc examples"
 inherit eutils java-pkg-2 java-ant-2
 MY_P="Arduino"
 PNS="arduino"
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://arduino.googlecode.com/"
 SRC_URI="https://github.com/arduino/${MY_P}/archive/${PV}.tar.gz -> arduino-${PV}.tar.gz
 	 mirror://gentoo/arduino-icons.tar.bz2"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip binchecks"
 IUSE=""
 COMMONDEP="
 	dev-java/jna:0
 	>dev-java/rxtx-2.1:2"
 RDEPEND="${COMMONDEP}
 	dev-embedded/arduino-libs
 	dev-embedded/avrdude
 	sys-devel/crossdev
 	>=virtual/jre-1.8"
 DEPEND="${COMMONDEP}
 	>=virtual/jdk-1.8"
 S="${WORKDIR}/${MY_P}-${PV}"
 EANT_GENTOO_CLASSPATH="jna,rxtx-2"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_BUILD_TARGET="build"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 java_prepare() {
 	# Patch launcher script to include rxtx class/ld paths
 	epatch "${FILESDIR}/${P}-script.patch"
 }
 src_compile() {
 	eant -f arduino-core/build.xml
 	EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
 	eant -f app/build.xml
 	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
 }
 src_install() {
 	cd build/linux/work || die
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PNS} --pwd /usr/share/${PNS} --main processing.app.Base
 	if use examples; then
 		java-pkg_doexamples examples
 		docompress -x /usr/share/doc/${P}/examples/
 	fi
 	if use doc; then
 		dodoc revisions.txt "${S}"/README.md
 		dohtml -r reference
 	fi
 	insinto "/usr/share/${PNS}/"
 	doins -r tools tools-builder
 	insinto "/usr/share/${PNS}/hardware"
 	doins -r hardware/platform.*
 	insinto "/usr/share/${PNS}/lib"
 	doins -r lib/*.txt lib/theme lib/*.png lib/*.bmp lib/*.key lib/*.so lib/*.ico lib/*.conf
 	# install menu and icons
 	sed -e 's/Exec=FULL_PATH\/arduino/Exec=arduino/g' -i arduino.desktop
 	sed -e 's/Icon=FULL_PATH\/lib\/arduino.png/Icon=arduino/g' -i arduino.desktop
 	sed -e 's/x-arduino/x-arduino;/g' -i arduino.desktop
 	domenu "${PNS}.desktop"
 	for sz in 16 24 32 48 128 256; do
 		newicon -s $sz \
 			"${WORKDIR}/${PNS}-icons/debian_icons_${sz}x${sz}_apps_${PNS}.png" \
 			"${PNS}.png"
 	done
 }
 pkg_postinst() {
 	[ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
 	elog "I have *NOT* tested if this ebuild even works, because I don't use it myself."
 	elog "If you encounter issues with the installation, please report them to me, and"
 	elog "I will try my best to fix them."
 }
--- a/dev-embedded/arduino-ide/files/arduino-ide-1.6.8-script.patch
+++ b/dev-embedded/arduino-ide/files/arduino-ide-1.6.8-script.patch
@ -1,19 +0,0 @@
 diff -Naurp a/build/linux/dist/arduino b/build/linux/dist/arduino
 --- a/build/linux/dist/arduino	2015-12-10 02:45:00.010340806 +0100
 +++ b/build/linux/dist/arduino	2015-12-10 02:48:13.155420642 +0100
@@ -8,11 +8,12 @@ for LIB in \
     "$APPDIR"/lib/*.jar \
     ;
 do
 -    CLASSPATH="${CLASSPATH}:${LIB}"
 +    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
 done
 +CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
 export CLASSPATH
 -LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 +LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
--- a/dev-embedded/arduino-ide/files/arduino-ide-1.6.9-script.patch
+++ b/dev-embedded/arduino-ide/files/arduino-ide-1.6.9-script.patch
@ -1,19 +0,0 @@
 diff -Naurp a/build/linux/dist/arduino b/build/linux/dist/arduino
 --- a/build/linux/dist/arduino	2015-12-10 02:45:00.010340806 +0100
 +++ b/build/linux/dist/arduino	2015-12-10 02:48:13.155420642 +0100
@@ -8,11 +8,12 @@ for LIB in \
     "$APPDIR"/lib/*.jar \
     ;
 do
 -    CLASSPATH="${CLASSPATH}:${LIB}"
 +    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
 done
 +CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
 export CLASSPATH
 -LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 +LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
--- a/dev-embedded/arduino-libs/Manifest
+++ b/dev-embedded/arduino-libs/Manifest
@ -1,2 +0,0 @@
 DIST arduino-1.8.1.tar.gz 86826305 SHA256 cc82bbb2979fbf53dc4775668de7e5eefcb61ab65f46507aa933107ad458d268 SHA512 1ca8c306d2bdee52fbc69ba7b933ac9a3a1154cfa2e5861e75b5eb2ca1cdfa7843b36b36eae68d8d932194be5ea938fbe3c2492b87d81d88d88edd9d0aeb1541 WHIRLPOOL 0ca152bbf1600e0f15ceb11130252fb353f2b7b74c461f8d8725ca9175295bc29a1609c847a1544df4053673b8e01207267c9e9a493fd08dc75cf05614c697b7
 EBUILD arduino-libs-1.8.1.ebuild 923 SHA256 7697ee6305c17edf18cf214d305293485db795bb48ca05786d09f7475a73e04e SHA512 b8691ef253f8f3e4fd1c555c92c12f3fe4ff99979015b36ff2be24a42cc4eda6921e25ad3af7ddd0f1618caa00dc32974f18c7e66cd6eeb517c4c7bb2b86e75e WHIRLPOOL 9f435b9b5775a2fd47776c8887d6302d7a6fee07ba9018a1d22f2f9bf6cdbdee09cae57e69cc41e333309d767cd397d91ddc4bd5a7ebc1fa8a814dcc1b094092
--- a/dev-embedded/arduino-libs/arduino-libs-1.8.1.ebuild
+++ b/dev-embedded/arduino-libs/arduino-libs-1.8.1.ebuild
@ -1,33 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit eutils
 MY_P="Arduino"
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://arduino.googlecode.com/"
 SRC_URI="https://github.com/arduino/${MY_P}/archive/${PV}.tar.gz -> arduino-${PV}.tar.gz"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
 DEPEND=""
 S="${WORKDIR}/${MY_P}-${PV}"
 src_install() {
 	insinto "/usr/share/arduino/"
 	doins -r hardware libraries
 	fowners -R root:uucp "/usr/share/arduino/hardware"
 	dosym /usr/bin/avrdude "/usr/share/arduino/hardware/tools/avrdude"
 	dosym /etc/avrdude.conf "/usr/share/arduino/hardware/tools/avrdude.conf"
 	mkdir -p "${D}/usr/share/arduino/hardware/tools/avr/etc/"
 	dosym /etc/avrdude.conf "/usr/share/arduino/hardware/tools/avr/etc/avrdude.conf"
 }
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@ -1,20 +0,0 @@
 AUX arduino-1.6.7-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
 AUX arduino-1.6.7-build.xml.patch 27270 SHA256 143a1a1698280378166d00a69e21ca2d8d31b294ce15ed3f4ce9593c20db0227 SHA512 7bca2efb434a41d0f6f4594bb11f940584896dcd647eff5f621358a679402ff07673c7b7c8fb38dfdc53c724bc3add674af934680a814aff1053c296ab1e4182 WHIRLPOOL abcad8468201020cb6c2244fdacd2f11c8d77849974970b41b99bf404151fc588fa4ecdc2f4e5a084e238860b6905d40250197c250f81e8f02e72dc16cb79f23
 AUX arduino-1.6.7-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
 AUX arduino-1.6.9-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
 AUX arduino-1.6.9-build.xml.patch 29384 SHA256 9417ebed1e3f122eefbc8992b700f3865bfda53974ac04a284f1ac7a8f76099e SHA512 0a7b6bfaa252b56f3685e0b5acccd92db8b794523bed3e7750206fe303ba2004b3aa6e1086601a0adbb81277c4adc4ef6b9f0a35fe4b06fad2d9406e33b5359e WHIRLPOOL 3e705f9df74208bc16105f775d92216cbbd41156f0799481d6870b91be6e034d810e7d3a863875a523877855d9fc979f01c72c083649ddc88607cbc9e25adcc1
 AUX arduino-1.6.9-platform.patch 1102 SHA256 4026317625b48b4f845b31655a3553417e62cfd96072ac3b9dc2166806e95838 SHA512 91300f146fac62c16e542536e780ade8e4a10f95dc0e254fd7de1504eedec3fccffe6ef137ab05b457c9c675007b4067d53736e409c7dab7711e590ede22e4e4 WHIRLPOOL 787bfa52278cc2cc443c346bac7e7f1f9a52be409e64fc04c9a77461d3770118bf0ae583316918190fdd12c975d59869a5dc19157739bc37b396ce92a0adb07c
 AUX arduino-1.6.9-script.patch 580 SHA256 553335d62134c9ca66e7b9f0b9496f187c76a3223438f2659e29d51cdd55776d SHA512 65b2868a18201f738a64377d965601dda77cee9713720e1d91de4378038083669370e3353b82f48f41c27d0ff65a859a8acc9b15bb20ba55bb7685daa98db173 WHIRLPOOL 2b9de5c030c05f48a52fd67f54d2ae1a25b1f95b1e02a69a172fe286d9b1c6912a652954b3e6d35b1c0cf252ba2ccaffa86e844e9f8075323ef1e413a0a988af
 AUX arduino-1.8.1-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
 AUX arduino-1.8.4-Do-Not-ThinkDifferent.patch 832 SHA256 f3be70a62f24a91ba5de4350772fe365983b23c1ff12dc4add555954d499b997 SHA512 cfcb1a7fb9ea89fb48b0795a64c80e22962a8db3417ab51aaef140e76d7d2d27f311ab9463d530e190e06b0ad4412460af71a263dd93115cb2cb89c21ba8107c WHIRLPOOL da06bde9ef309fb0a55ef0c94a1427410ce0aea875ee577fc00f9171905dffe6748bd1777639408f4e10e6d1f1fbc8beaf753379e8ad6ae64f4eb7d099585531
 AUX arduino.desktop 228 SHA256 3b89b4fe43d2a0d40e757be94859b6809bd49f85d2c47a92e78b286d7de0ae39 SHA512 8c8b8b3306eeaa8640716abba14c44e2886b6d23c3cf2b5503595cb89a59845bdd5a57800fd07cea777be20e27621427bbb6bad2a8fe9513f7dfac5a41f8bde4 WHIRLPOOL c2d2db0cf2c10448801a718adc4ab4b58b0e70e2c9cfd31115d5a0c79fc1f69de3ffb67e2560636239b6fd6b24f9bddbf6ece2f72a69d2e4e0c042a36a6b08f8
 AUX platform-1.6.9/platform.txt 1447 SHA256 1a971137ac7575b4a6cb5869f79158db8ab61c1e899a275900ae9cce9fd140ed SHA512 269be33d4a2f22f59f149037614eca87b062c4f41f71dd3576db395d67018954f855d79b370a0b88b823985b287e163bbd0bdc430546a5ed3f5316fd7a0f41cb WHIRLPOOL 0daa35b52af6f8a1e6a3a58d4db7bb63798ac656400bf4227e94c166a1e8c159ef01012f1a8ea0a3c9a2aa836e5e00e1e5c6e65c0d34f72f7465419caa2ddeb0
 DIST arduino-1.6.7.tar.gz 77578555 SHA256 ae524c19c3b6fcd00cbf709e693321a13e694316fea5642a54b02d4170213586 SHA512 2f76aedad6f8bb9c3e17c4b02ecf816f5fe628b4856a6bd9a3d7c0fe3d9999a39df60a4794d99b1e62c3ae41695350f27d148a0925f7f59b8071359d33be2b00 WHIRLPOOL c5bdf2a67ff37fc8bc4a002ea24f003d97f6ae04632d906fc4d37d2af64c113f698e26720c73b40afc39925f03206a41a4ec0faba0d80756427714102ad47f90
 DIST arduino-1.6.9.tar.gz 81103494 SHA256 0927e4d6bb24fd297765aaf529fe7b16a7da3223848e7b40cdc9843d4246f98d SHA512 92b3508068e3aae6a88c3a395d0906fb63d2fd8ee20d003173b96f3f0ff6851eddcdb77c6349dfec3ad0ee36976f53432c643f56724490e9187d4af049fd4bf8 WHIRLPOOL 841ebd6e4c23b610f87a5254b888a31bd9b36ea162f52f9301b8cc0af2288cb7cff83f130f7f3a03ca71fdaf471818f2faea99ab3f1c64b233d7d504b7ac0049
 DIST arduino-1.8.1.tar.gz 86826305 SHA256 cc82bbb2979fbf53dc4775668de7e5eefcb61ab65f46507aa933107ad458d268 SHA512 1ca8c306d2bdee52fbc69ba7b933ac9a3a1154cfa2e5861e75b5eb2ca1cdfa7843b36b36eae68d8d932194be5ea938fbe3c2492b87d81d88d88edd9d0aeb1541 WHIRLPOOL 0ca152bbf1600e0f15ceb11130252fb353f2b7b74c461f8d8725ca9175295bc29a1609c847a1544df4053673b8e01207267c9e9a493fd08dc75cf05614c697b7
 DIST arduino-1.8.4.tar.gz 48215723 SHA256 aa17ae247091c0bf52e08be2bdf37a151bcda00de1017e097f7ee57274b3636b SHA512 e3bbc404eb842a65cba7e3905183daa83e3712b2926e6beeb443b2b61586852781b92ee3acd52e713cc4c3373cbf4be3849fac4c55513b0cc6936d4553f8935c WHIRLPOOL 455bba5b22b0685441477d09f3d04bff64414d432d0553194a2f9d8518a1509b7c6f9b39225e06b598740d2575d7202d5c7ca96ceaf77b9561496919500fa46f
 DIST arduino-icons.tar.bz2 58775 SHA256 9086ae27a13cc19e428ed7e6434366752b33a7d066b5620bfdd371709277390e SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9 WHIRLPOOL b53ab3ff2981ca9f6d45311b9f885ca831700a7a49fef4a376cdc489f7cc3a6c39fbb93994b962b6854b0833d7342b951b5c6327422aafce762f92952b7a5876
 EBUILD arduino-1.6.7.ebuild 3617 SHA256 c078fd90e9d0eed48b0757dc1df7a1d078feef5abfcde907bd42317d1f146d9e SHA512 6f193f84325863969546350d6c10378aeaade1eb6f5207e824c9546ae500da3e93b003d52ef752a8c8e25371ba8838cc32659df0c9ef879a8956762dc24fa9eb WHIRLPOOL d67cc32dea2c31f3ed1dc130ea8a3e1c6d006d40e069c4efa00fdea46c40a00d92ab6c0b5205a03a5386ab6452cf040e03bc2e23dec0dfae302b2aeefd34b0ad
 EBUILD arduino-1.6.9.ebuild 4424 SHA256 415aeee47ac97eeab8a63450c88edaf18c24e40fcd24b00bb8b636eafb846346 SHA512 b7e8ffe93351b851415bde8d1c6c14df4b1a44944fd44837a09bc9c7acd969141286c0aaac0ab79c726e2ac85cdf4f84ef75db1d9b62bb366bbf4d6ca4190dfd WHIRLPOOL 1a4166c5400062930fe54ee725d17f5173d03bd053b750643ec8750143caf37624e35b041a15605a1d0b38487abb187bea19b29b7fbce64c714eacbf5a0ec219
 EBUILD arduino-1.8.1.ebuild 4336 SHA256 495a8f4bc548029c8dc9b85be15860d96db3588cd0a0d5b9784efad409e9e5e8 SHA512 9381e6cd272fb9fe4e1db91fd351d7420dc980b27b0451f415614f546d9ce8d4b267cd074bd2930383ef442cf75988671062010b58da90efd5f01f4b4f6c130e WHIRLPOOL 1fc492137bb3fb5ed834827d48e6229ef09967081bd33ee19da3e2cd4d951b1c69384e525f2bae8df4338424b6d20dcf65ff094796464f4c8fcd45a14f2efc25
 EBUILD arduino-1.8.4.ebuild 6285 SHA256 1b1f51a501f12d2b709cff9d2827556cfccc063f81afd24b79eca9d9372eb64e SHA512 8ab79bb0de2a2898d3bbd2b6ea2e1e65a22e03bc122eb101bf7dc26567806a29eea81ede793fecd779a65a071d50628fb9c674e52d122203c31325bb12bb31c8 WHIRLPOOL 643bb2aa829d236fd8576021215e885b079f760367f24e72088f0b0aab04afb2310e6985289c9b5f7a1ba356bdc4a76d13fd7730c8f2ac8d3d046b4bc016d7da
--- a/dev-embedded/arduino/arduino-1.6.7.ebuild
+++ b/dev-embedded/arduino/arduino-1.6.7.ebuild
@ -1,127 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc examples"
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://github.com/arduino/Arduino"
 SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 mirror://gentoo/arduino-icons.tar.bz2"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 RESTRICT="strip binchecks"
 IUSE=""
 COMMONDEP="
 dev-java/jna:0
 >dev-java/rxtx-2.1:2
 dev-util/astyle"
 RDEPEND="${COMMONDEP}
 dev-embedded/avrdude
 dev-embedded/uisp
 sys-devel/crossdev
 >=virtual/jre-1.8"
 DEPEND="${COMMONDEP}
 >=virtual/jdk-1.8"
 EANT_GENTOO_CLASSPATH="jna,rxtx-2"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_BUILD_TARGET="build"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 src_unpack() {
 	unpack ${A}
 	# cd ../"${S}"
 	mv Arduino-${PV} arduino-${PV}
 }
 java_prepare() {
 	# Remove the libraries to ensure the system
 	# libraries are used
 	# rm app/lib/* || die
 	rm -rf app/src/processing/app/macosx || die
 	# Patch build/build.xml - remove local jar files
 	# for rxtx and ecj (use system wide versions)
 	epatch "${FILESDIR}"/${P}-build.xml.patch
 	# Patch launcher script to include rxtx class/ld paths
 	epatch "${FILESDIR}"/${P}-script.patch
 	# Some OS X ThinkDifferent stuff from processing library
 	epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
 }
 src_compile() {
 	eant -f arduino-core/build.xml
 	EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-core.jar"
 	eant -f app/build.xml
 	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
 }
 src_install() {
 	cd "${S}"/build/linux/work || die
 	# java-pkg_dojar lib/arduino-core.jar lib/pde.jar
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
 	# This doesn't seem to be optional, it just hangs when starting without
 	# examples in correct place
 	#if use examples; then
 		#java-pkg_doexamples examples
 		#docompress -x /usr/share/doc/${P}/examples/
 	#fi
 	if use doc; then
 		dodoc revisions.txt "${S}"/readme.txt
 		dohtml -r reference
 		java-pkg_dojavadoc "${S}"/build/javadoc/everything
 	fi
 	insinto "/usr/share/${PN}/"
 	doins -r dist examples hardware libraries
 	fowners -R root:uucp "/usr/share/${PN}/hardware"
 	exeinto "/usr/share/${PN}/"
 	doexe arduino-builder
 	insinto "/usr/share/${PN}/lib"
 	doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
 	# For TeensyDuino
 	dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
 	# use system avrdude
 	# patching class files is too hard
 	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
 	dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
 	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
 	dosym /usr/lib64/libastyle.so "/usr/share/${PN}/lib/libastylej.so"
 	dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
 	dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
 	dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
 	dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
 	dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
 	# install menu and icons
 	domenu "${FILESDIR}/${PN}.desktop"
 	for sz in 16 24 32 48 128 256; do
 		newicon -s $sz \
 			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
 			"${PN}.png"
 	done
 }
 pkg_postinst() {
 	[ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
 }
--- a/dev-embedded/arduino/arduino-1.6.9.ebuild
+++ b/dev-embedded/arduino/arduino-1.6.9.ebuild
@ -1,147 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc +examples"
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://github.com/arduino/Arduino"
 SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 mirror://gentoo/arduino-icons.tar.bz2"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 RESTRICT="strip binchecks"
 IUSE=""
 COMMONDEP="
 dev-embedded/listserialportsc
 dev-java/jna:0
 >dev-java/rxtx-2.1:2
 dev-util/astyle"
 RDEPEND="${COMMONDEP}
 dev-embedded/avrdude
 dev-embedded/uisp
 sys-devel/crossdev
 >=virtual/jre-1.8"
 DEPEND="${COMMONDEP}
 >=virtual/jdk-1.8"
 EANT_GENTOO_CLASSPATH="jna,rxtx-2"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_BUILD_TARGET="build"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 src_unpack() {
 	unpack ${A}
 	# cd ../"${S}"
 	mv Arduino-${PV} arduino-${PV}
 }
 java_prepare() {
 	# Remove the libraries to ensure the system
 	# libraries are used
 	# rm app/lib/* || die
 	rm -rf app/src/processing/app/macosx || die
 	# Patch build/build.xml - remove local jar files
 	# for rxtx and ecj (use system wide versions)
 	epatch "${FILESDIR}"/${P}-build.xml.patch
 	# Patch launcher script to include rxtx class/ld paths
 	epatch "${FILESDIR}"/${P}-script.patch
 	# Some OS X ThinkDifferent stuff from processing library
 	epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
 	# Patch platform.txt for compiler paths
 	epatch "${FILESDIR}"/${P}-platform.patch
 }
 src_compile() {
 	eant -f arduino-core/build.xml
 	EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-core.jar"
 	eant -f app/build.xml
 	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
 }
 src_install() {
 	cd "${S}"/build/linux/work || die
 	# java-pkg_dojar lib/arduino-core.jar lib/pde.jar
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
 	# This doesn't seem to be optional, it just hangs when starting without
 	# examples in correct place
 	#if use examples; then
 		#java-pkg_doexamples examples
 		#docompress -x /usr/share/doc/${P}/examples/
 	#fi
 	if use doc; then
 		dodoc revisions.txt "${S}"/readme.txt
 		dohtml -r reference
 		java-pkg_dojavadoc "${S}"/build/javadoc/everything
 	fi
 	insinto "/usr/share/${PN}/"
 	doins -r dist examples hardware libraries
 	insinto "/usr/share/${PN}/hardware"
 	doins "${FILESDIR}/platform-${PV}/platform.txt"
 	fowners -R root:uucp "/usr/share/${PN}/hardware"
 	exeinto "/usr/share/${PN}/"
 	doexe arduino-builder
 	insinto "/usr/share/${PN}/lib"
 	doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
 	# For TeensyDuino
 	dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
 	# use system avrdude
 	# patching class files is too hard
 	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
 	dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
 	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
 	dosym /usr/$(get_libdir)/libastyle.so "/usr/share/${PN}/lib/libastylej.so"
 	dosym /usr/$(get_libdir)/liblistSerialsj.so "/usr/share/${PN}/lib/liblistSerialsj.so"
 	dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
 	dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
 	dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
 	dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
 	dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
 	if [ -x /usr/bin/avr-ld ]; then
 		BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' )
 		dosym /usr/lib/binutils/avr/${BU_VER}/ldscripts "/usr/avr/lib/ldscripts"
 	fi
 	# install menu and icons
 	domenu "${FILESDIR}/${PN}.desktop"
 	for sz in 16 24 32 48 128 256; do
 		newicon -s $sz \
 			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
 			"${PN}.png"
 	done
 }
 pkg_postinst() {
 	if [ ! -x /usr/bin/avr-g++ ]; then
 		ewarn "Install avr crosscompiler using:"
 		ewarn "  USE=\"-openmp -hardened -sanitize -vtv\" \\"
 		ewarn "    crossdev -s4 --ex-gdb -v -S --target avr"
 		echo
 		ewarn "Afterwards, create a symlink for ldscripts:"
 		ewarn "  BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' ) \\"
 		ewarn "    ln -s /usr/lib/binutils/avr/\$BU_VER/ldscripts /usr/avr/lib/ldscripts"
 	fi
 }
--- a/dev-embedded/arduino/arduino-1.8.1.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.1.ebuild
@ -1,145 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc +examples"
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://github.com/arduino/Arduino"
 SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 mirror://gentoo/arduino-icons.tar.bz2"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 RESTRICT="strip binchecks"
 IUSE=""
 COMMONDEP="
 dev-embedded/listserialportsc
 dev-java/jna:0
 >dev-java/rxtx-2.1:2
 dev-util/astyle"
 RDEPEND="${COMMONDEP}
 dev-embedded/avrdude
 dev-embedded/uisp
 sys-devel/crossdev
 >=virtual/jre-1.8"
 DEPEND="${COMMONDEP}
 >=virtual/jdk-1.8"
 EANT_GENTOO_CLASSPATH="jna,rxtx-2"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_BUILD_TARGET="build"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 src_unpack() {
 	unpack ${A}
 	# cd ../"${S}"
 	mv Arduino-${PV} arduino-${PV}
 }
 java_prepare() {
 	# Remove the libraries to ensure the system
 	# libraries are used
 	# rm app/lib/* || die
 	rm -rf app/src/processing/app/macosx || die
 	# Patch build/build.xml - remove local jar files
 	# for rxtx and ecj (use system wide versions)
 #	epatch "${FILESDIR}"/${P}-build.xml.patch
 	# Patch launcher script to include rxtx class/ld paths
 #	epatch "${FILESDIR}"/${P}-script.patch
 	# Some OS X ThinkDifferent stuff from processing library
 	epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
 	# Patch platform.txt for compiler paths
 #	epatch "${FILESDIR}"/${P}-platform.patch
 }
 src_compile() {
 	eant -f arduino-core/build.xml
 	EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-core.jar"
 	eant -f app/build.xml
 	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
 }
 src_install() {
 	cd "${S}"/build/linux/work || die
 	# java-pkg_dojar lib/arduino-core.jar lib/pde.jar
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
 	# This doesn't seem to be optional, it just hangs when starting without
 	# examples in correct place
 	#if use examples; then
 		#java-pkg_doexamples examples
 		#docompress -x /usr/share/doc/${P}/examples/
 	#fi
 	if use doc; then
 		dodoc revisions.txt "${S}"/readme.txt
 		dohtml -r reference
 		java-pkg_dojavadoc "${S}"/build/javadoc/everything
 	fi
 	insinto "/usr/share/${PN}/"
 	doins -r examples hardware libraries
 	fowners -R root:uucp "/usr/share/${PN}/hardware"
 	exeinto "/usr/share/${PN}/"
 	doexe arduino-builder
 	insinto "/usr/share/${PN}/lib"
 	doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
 	# For TeensyDuino
 	dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
 	# use system avrdude
 	# patching class files is too hard
 	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
 	dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
 	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
 	dosym /usr/$(get_libdir)/libastyle.so "/usr/share/${PN}/lib/libastylej.so"
 	dosym /usr/$(get_libdir)/liblistSerialsj.so "/usr/share/${PN}/lib/liblistSerialsj.so"
 	dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
 	dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
 	dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
 	dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
 	dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
 	if [ -x /usr/bin/avr-ld ]; then
 		BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' )
 		dosym /usr/lib/binutils/avr/${BU_VER}/ldscripts "/usr/avr/lib/ldscripts"
 	fi
 	# install menu and icons
 	domenu "${FILESDIR}/${PN}.desktop"
 	for sz in 16 24 32 48 128 256; do
 		newicon -s $sz \
 			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
 			"${PN}.png"
 	done
 }
 pkg_postinst() {
 	if [ ! -x /usr/bin/avr-g++ ]; then
 		ewarn "Install avr crosscompiler using:"
 		ewarn "  USE=\"-openmp -hardened -sanitize -vtv\" \\"
 		ewarn "    crossdev -s4 --ex-gdb -v -S --target avr"
 		echo
 		ewarn "Afterwards, create a symlink for ldscripts:"
 		ewarn "  BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' ) \\"
 		ewarn "    ln -s /usr/lib/binutils/avr/\$BU_VER/ldscripts /usr/avr/lib/ldscripts"
 	fi
 }
--- a/dev-embedded/arduino/arduino-1.8.4.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.4.ebuild
@ -1,170 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 JAVA_PKG_IUSE="doc +examples"
 inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="An open-source AVR electronics prototyping platform"
 HOMEPAGE="http://arduino.cc/ https://github.com/arduino/Arduino"
 SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 mirror://gentoo/arduino-icons.tar.bz2"
 LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 RESTRICT="strip binchecks"
 IUSE=""
 COMMONDEP="
 dev-embedded/listserialportsc
 dev-java/jna:0
 >dev-java/rxtx-2.1:2
 dev-util/astyle"
 RDEPEND="${COMMONDEP}
 dev-embedded/avrdude
 dev-embedded/uisp
 sys-devel/crossdev
 >=virtual/jre-1.8"
 DEPEND="${COMMONDEP}
 >=virtual/jdk-1.8"
 EANT_GENTOO_CLASSPATH="jna,rxtx-2"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_BUILD_TARGET="build"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 src_unpack() {
 	unpack ${A}
 	# cd ../"${S}"
 	mv Arduino-${PV} arduino-${PV}
 }
 java_prepare() {
 	# Remove the libraries to ensure the system
 	# libraries are used
 	# rm app/lib/* || die
 	rm -rf app/src/processing/app/macosx || die
 	# Patch build/build.xml - remove local jar files
 	# for rxtx and ecj (use system wide versions)
 #	epatch "${FILESDIR}"/${P}-build.xml.patch
 	# Patch launcher script to include rxtx class/ld paths
 #	epatch "${FILESDIR}"/${P}-script.patch
 	# Some OS X ThinkDifferent stuff from processing library
 	epatch "${FILESDIR}"/${P}-Do-Not-ThinkDifferent.patch
 	# Patch platform.txt for compiler paths
 #	epatch "${FILESDIR}"/${P}-platform.patch
 }
 src_compile() {
 	eant -f arduino-core/build.xml
 	EANT_GENTOO_CLASSPATH_EXTRA="../arduino-core/arduino-core.jar"
 	eant -f app/build.xml
 	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
 }
 src_install() {
 	cd "${S}"/build/linux/work || die
 	# java-pkg_dojar lib/arduino-core.jar lib/pde.jar
 	java-pkg_dojar lib/*.jar
 	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
 	# This doesn't seem to be optional, it just hangs when starting without
 	# examples in correct place
 	#if use examples; then
 		#java-pkg_doexamples examples
 		#docompress -x /usr/share/doc/${P}/examples/
 	#fi
 	if use doc; then
 		dodoc revisions.txt "${S}"/readme.txt
 		dohtml -r reference
 		java-pkg_dojavadoc "${S}"/build/javadoc/everything
 	fi
 	insinto "/usr/share/${PN}/"
 	doins -r examples hardware libraries
 	fowners -R root:uucp "/usr/share/${PN}/hardware"
 	exeinto "/usr/share/${PN}/"
 	doexe arduino-builder
 	insinto "/usr/share/${PN}/lib"
 	doins -r lib/*.txt lib/theme lib/*.png lib/*.conf lib/*.key
 	# For TeensyDuino
 	dosym /usr/bin/arduino "/usr/share/${PN}/arduino"
 	# use system avrdude
 	# patching class files is too hard
 	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
 	dodir "/usr/share/${PN}/hardware/tools/avr/etc/"
 	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avr/etc/avrdude.conf"
 	dosym /usr/$(get_libdir)/libastylej.so.3 "/usr/share/${PN}/lib/libastylej.so"
 	dosym /usr/$(get_libdir)/liblistSerialsj.so "/usr/share/${PN}/lib/liblistSerialsj.so"
 	dodir "/usr/share/${PN}/hardware/tools/avr/bin/"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-addr2line"
 	dosym /usr/bin/avr-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-ar"
 	dosym /usr/bin/avr-as "/usr/share/${PN}/hardware/tools/avr/bin/avr-as"
 	dosym /usr/bin/avr-c++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-c++"
 	dosym /usr/bin/avr-c++filt "/usr/share/${PN}/hardware/tools/avr/bin/avr-c++filt"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-cpp"
 	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avr/bin/avrdude"
 	dosym /usr/bin/avr-elfedit "/usr/share/${PN}/hardware/tools/avr/bin/avr-elfedit"
 	dosym /usr/bin/avr-g++ "/usr/share/${PN}/hardware/tools/avr/bin/avr-g++"
 	dosym /usr/bin/avr-gcc "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc"
 	dosym /usr/bin/avr-gcc-ar "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc-ar"
 	dosym /usr/bin/avr-gcc-nm "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc-nm"
 	dosym /usr/bin/avr-gcc-ranlib "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcc-ranlib"
 	dosym /usr/bin/avr-gcov "/usr/share/${PN}/hardware/tools/avr/bin/avr-gcov"
 	dosym /usr/bin/avr-gdb "/usr/share/${PN}/hardware/tools/avr/bin/avr-gdb"
 	dosym /usr/bin/avr-gprof "/usr/share/${PN}/hardware/tools/avr/bin/avr-gprof"
 	dosym /usr/bin/avr-ld "/usr/share/${PN}/hardware/tools/avr/bin/avr-ld"
 	dosym /usr/bin/avr-ld.bfd "/usr/share/${PN}/hardware/tools/avr/bin/avr-ld.bfd"
 	dosym /usr/bin/avr-man "/usr/share/${PN}/hardware/tools/avr/bin/avr-man"
 	dosym /usr/bin/avr-nm "/usr/share/${PN}/hardware/tools/avr/bin/avr-nm"
 	dosym /usr/bin/avr-objcopy "/usr/share/${PN}/hardware/tools/avr/bin/avr-objcopy"
 	dosym /usr/bin/avr-objdump "/usr/share/${PN}/hardware/tools/avr/bin/avr-objdump"
 	dosym /usr/bin/avr-ranlib "/usr/share/${PN}/hardware/tools/avr/bin/avr-ranlib"
 	dosym /usr/bin/avr-readelf "/usr/share/${PN}/hardware/tools/avr/bin/avr-readelf"
 	dosym /usr/bin/avr-run "/usr/share/${PN}/hardware/tools/avr/bin/avr-run"
 	dosym /usr/bin/avr-size "/usr/share/${PN}/hardware/tools/avr/bin/avr-size"
 	dosym /usr/bin/avr-strings "/usr/share/${PN}/hardware/tools/avr/bin/avr-strings"
 	dosym /usr/bin/avr-strip "/usr/share/${PN}/hardware/tools/avr/bin/avr-strip"
 	dosym /usr/bin/ctags "/usr/share/${PN}/hardware/tools/avr/bin/ctags"
 	dosym /usr/bin/libusb-config "/usr/share/${PN}/hardware/tools/avr/bin/libusb-config"
 	if [ -x /usr/bin/avr-ld ]; then
 		BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' )
 		dosym /usr/lib/binutils/avr/${BU_VER}/ldscripts "/usr/avr/lib/ldscripts"
 	fi
 	# install menu and icons
 	domenu "${FILESDIR}/${PN}.desktop"
 	for sz in 16 24 32 48 128 256; do
 		newicon -s $sz \
 			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
 			"${PN}.png"
 	done
 }
 pkg_postinst() {
 	if [ ! -x /usr/bin/avr-g++ ]; then
 		ewarn "Install avr crosscompiler using:"
 		ewarn "  USE=\"-openmp -hardened -sanitize -vtv\" \\"
 		ewarn "    crossdev -s4 --ex-gdb -v -S --target avr"
 		echo
 		ewarn "Afterwards, create a symlink for ldscripts:"
 		ewarn "  BU_VER=$( avr-ld --version | head -1 | sed -e 's/^.*(.*) //' ) \\"
 		ewarn "    ln -s /usr/lib/binutils/avr/\$BU_VER/ldscripts /usr/avr/lib/ldscripts"
 	fi
 }
--- a/dev-embedded/arduino/files/arduino-1.6.7-Do-Not-ThinkDifferent.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.7-Do-Not-ThinkDifferent.patch
@ -1,22 +0,0 @@
 diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
 --- a/app/src/processing/app/Base.java	2015-11-07 16:00:54.614383789 +0100
 +++ b/app/src/processing/app/Base.java	2015-11-07 16:01:09.486384112 +0100
@@ -49,7 +49,6 @@
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.legacy.PApplet;
 -import processing.app.macosx.ThinkDifferent;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 import processing.app.syntax.PdeKeywords;
@@ -129,10 +128,6 @@
     splashScreenHelper.splashText(_("Loading configuration..."));
 -    if (OSUtils.isMacOS()) {
 -      ThinkDifferent.init();
 -    }
 -
     try {
       guardedMain(args);
     } catch (Throwable e) {
--- a/dev-embedded/arduino/files/arduino-1.6.7-build.xml.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.7-build.xml.patch
@ -1,590 +0,0 @@
 diff -urN arduino-1.6.7.orig/build/build.xml arduino-1.6.7/build/build.xml
 --- arduino-1.6.7.orig/build/build.xml	2015-12-17 15:36:35.000000000 +0100
 +++ arduino-1.6.7/build/build.xml	2016-01-15 14:26:19.661246847 +0100
@@ -8,35 +8,18 @@
     <format property="BUILD_DATE" pattern="yyyy/MM/dd hh:mm"/>
   </tstamp>
 -  <!-- Sets properties for macosx/windows/linux depending on current system -->
 -  <condition property="platform" value="macosx-old">
 -    <and>
 -      <os family="mac" />
 -      <matches string="${os.version}" pattern="^10.[56]." />
 -    </and>
 -  </condition>
 -  <condition property="macosx-old"><equals arg1="${platform}" arg2="macosx-old" /></condition>
 -  <fail if="macosx-old" message="MacOSX older than 10.7 are not supported"/>
 -
 -  <condition property="platform" value="macosx"><os family="mac" /></condition>
 -  <condition property="platform" value="windows"><os family="windows" /></condition>
 +  <!-- Sets properties for linux depending on current system -->
   <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
   <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
 -  <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
 -  <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
 -  <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
@@ -47,7 +30,6 @@
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
 -  <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
   <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
   <property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
@@ -268,249 +250,6 @@
   </target>
   <!-- - - - - - - - -->
 -  <!-- Mac OS X      -->
 -  <!-- - - - - - - - -->
 -  <target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
 -    <delete dir="macosx/work" />
 -    <delete dir="macosx/working_dir" />
 -    <delete dir="macosx/working.dmg" />
 -    <delete file="macosx/arduino-*.dmg" />
 -    <delete>
 -      <fileset dir="macosx" includes="arduino-*macosx*.zip"/>
 -    </delete>
 -  </target>
 -
 -  <target name="macosx-checkos" unless="macosx">
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X can only be built on Mac OS X.
 -
 -      Bye.
 -      =======================================================
 -    </echo>
 -    <fail message="wrong platform (${os.name})" />
 -  </target>
 -
 -  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
 -    <fail unless="MACOSX_BUNDLED_JVM" message="MacOSX requires MACOSX_BUNDLED_JVM property set"/>
 -    <mkdir dir="${staging_folder}/work" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
 -      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
 -      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
 -    </antcall>
 -
 -    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>
 -
 -    <bundleapp
 -            jvmRequired="1.8"
 -            jrepreferred="true"
 -            outputdirectory="${staging_folder}/work"
 -            name="Arduino"
 -            displayname="Arduino"
 -            executablename="Arduino"
 -            identifier="cc.arduino.Arduino"
 -            shortversion="${version}"
 -            version="${revision}"
 -            signature="Pde1"
 -            icon="macosx/processing.icns"
 -            mainclassname="processing.app.Base"
 -            copyright="Arduino LLC"
 -            applicationCategory="public.app-category.education"
 -            minimumsystemversion="10.7"
 -            highresolutioncapable="true">
 -
 -      <runtime dir="${MACOSX_BUNDLED_JVM}"/>
 -
 -      <arch name="x86_64"/>
 -      <arch name="i386"/>
 -
 -      <classpath refid="runtime.jars"/>
 -
 -      <option value="-Dapple.awt.application.name=Arduino"/>
 -      <option value="-Dapple.laf.useScreenMenuBar=true"/>
 -      <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
 -      <option value="-Dcom.apple.smallTabs=true"/>
 -      <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
 -      <option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
 -      <option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
 -
 -      <!--
 -      <option value="-Dapple.awt.showGrowBox=false"/>
 -      <option value="-Dapple.awt.Antialiasing=false"/>
 -      <option value="-Dapple.awt.TextAntialiasing=true"/>
 -      <option value="-Dcom.apple.hwaccel=true"/>
 -      <option value="-Dapple.awt.graphics.UseQuartz=true"/>
 -      -->
 -
 -      <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
 -
 -      <!-- Workaround since the icon parameter for bundleapp doesn't work -->
 -      <option value="-Xdock:name=Arduino"/>
 -      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
 -      <option value="-Dfile.encoding=UTF-8"/>
 -
 -      <option value="-Xms128M"/>
 -      <option value="-Xmx512M"/>
 -      <option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
 -
 -      <bundledocument extensions="ino,c,cpp,h"
 -                      icon="macosx/pde.icns"
 -                      name="Arduino Source File"
 -                      role="Editor" ispackage="false">
 -      </bundledocument>
 -
 -    </bundleapp>
 -
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 -
 -    <copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
 -      <fileset dir="shared" includes="lib/**" />
 -      <fileset file="shared/revisions.txt" />
 -    </copy>
 -
 -    <mkdir dir="${staging_folder}/work" />
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 -
 -    <antcall target="macosx-build-avr-toolchain" />
 -
 -    <antcall target="package-library-index-json-bundle"/>
 -
 -    <antcall target="assemble">
 -      <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
 -    </antcall>
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./libastylej-2.05.1.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
 -    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 -
 -    <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
 -    <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
 -    <antcall target="untar">
 -      <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
 -      <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
 -      <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
 -    </antcall>
 -    <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
 -    <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
 -    <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
 -      <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
 -    </copy>
 -    <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
 -
 -    <antcall target="portable-${portable}">
 -      <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
 -    </antcall>
 -  </target>
 -
 -  <!-- Unzip AVR tools -->
 -  <target name="macosx-build-avr-toolchain" unless="light_bundle">
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
 -    <chmod perm="+x">
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
 -    </chmod>
 -
 -    <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
 -    <chmod perm="-x">
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
 -    </chmod>
 -  </target>
 -
 -  <target name="macosx-run" depends="build,start"/>
 -
 -  <target name="macosx-start">
 -    <exec executable="macosx/work/Arduino.app/Contents/MacOS/Arduino" spawn="false" failonerror="true"/>
 -  </target>
 -
 -  <!-- - - - - - - - - - - - - - - - -->
 -  <!-- Sign application for MacOSX.  -->
 -  <!-- - - - - - - - - - - - - - - - -->
 -  <target name="macosx-signed-dist" if="macosx" depends="macosx-singed-dist-check, dist"
 -    description="Create a downloadable and signed .zip for the Mac OS X version">
 -    <fail unless="version" message="Please set the property 'version' to correctly sign distribution file" />
 -
 -    <!-- Remove everything from working folder -->
 -    <delete dir="macosx/work/Arduino.app" />
 -
 -    <!-- Unzip unsigned app into working dir -->
 -    <exec executable="unzip" dir="macosx/work" failonerror="true">
 -      <arg line="../arduino-${version}-${platform}.zip" />
 -    </exec>
 -
 -    <!-- Unlock keychain file -->
 -    <exec executable="security" dir="macosx/work" failonerror="true">
 -      <arg line="unlock-keychain -p &quot;${macosx-sign-keychain-pass}&quot; &quot;${macosx-sign-keychain}&quot;" />
 -    </exec>
 -
 -    <!-- Sign app -->
 -    <exec executable="codesign" dir="macosx/work" failonerror="true">
 -      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; --deep -v Arduino.app/" />
 -    </exec>
 -
 -    <!-- Check for successful signing -->
 -    <exec executable="codesign" dir="macosx/work" failonerror="true">
 -      <arg line="-vvvv Arduino.app/" />
 -    </exec>
 -
 -    <delete file="macosx/arduino-${version}-${platform}.zip" />
 -
 -    <!-- Create signed zip file -->
 -    <exec executable="zip" dir="macosx/work" failonerror="true">
 -      <arg line="-q -r ../arduino-${full-version}-signed.zip ." />
 -    </exec>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X built and signed.
 -
 -      macosx/arduino-${full-version}-signed.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
 -  <target name="macosx-singed-dist-check">
 -    <fail unless="macosx-sign-keychain" message="Please set the property 'macosx-sign-keychain' to the correct keychain file" />
 -    <fail unless="macosx-sign-keychain-pass" message="Please set the property 'macosx-sign-keychain-pass' with the password to unlock the keychain" />
 -    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to the correct cert identifier" />
 -  </target>
 -
 -  <!-- - - - - - - - - - - - - - - - - - - -->
 -  <!-- Build distribution file for MacOSX. -->
 -  <!-- - - - - - - - - - - - - - - - - - - -->
 -  <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
 -    <exec executable="zip" dir="macosx/work" failonerror="true">
 -      <arg line="-q -r ../arduino-${full-version}.zip ." />
 -    </exec>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X was built. Grab the image from
 -
 -      macosx/arduino-${full-version}.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
 -  <!-- - - - - - - - -->
   <!-- Linux         -->
   <!-- - - - - - - - -->
@@ -608,14 +347,6 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -640,14 +371,6 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -760,197 +483,6 @@
 	  description="Build .tar.xz of linux version" />
   <!-- - - - - - - - -->
 -  <!-- Windows       -->
 -  <!-- - - - - - - - -->
 -
 -  <target name="windows-clean" depends="subprojects-clean"
 -	  description="Clean windows version">
 -    <delete dir="windows/work" />
 -    <delete>
 -      <fileset dir="windows" includes="arduino-*windows*.zip"/>
 -    </delete>
 -  </target>
 -
 -  <target name="windows-checkos" unless="windows">
 -    <echo>
 -      =======================================================
 -      Arduino for Windows can only be built on windows.
 -
 -      Bye.
 -      =======================================================
 -    </echo>
 -
 -    <fail message="wrong platform (${os.name})" />
 -  </target>
 -
 -  <target name="download-launch4j-windows">
 -    <antcall target="unzip-with-ant-task">
 -      <param name="archive_file" value="windows/launch4j-3.8-win32.zip"/>
 -      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/>
 -      <param name="final_folder" value="windows/launcher/launch4j"/>
 -      <param name="dest_folder" value="windows/launcher/"/>
 -    </antcall>
 -  </target>
 -
 -  <target name="download-launch4j-linux">
 -    <antcall target="untar">
 -      <param name="archive_file" value="windows/launch4j-3.8-linux.tgz"/>
 -      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/>
 -      <param name="final_folder" value="windows/launcher/launch4j"/>
 -      <param name="dest_folder" value="windows/launcher/"/>
 -    </antcall>
 -  </target>
 -
 -  <target name="windows-build"
 -	  depends="revision-check, windows-checkos, subprojects-build"
 -	  description="Build windows version">
 -    <mkdir dir="windows/work" />
 -    <mkdir dir="windows/work/${staging_hardware_folder}" />
 -
 -    <copy todir="windows/work/lib">
 -      <fileset dir="shared" includes="icons/**/*.png"/>
 -    </copy>
 -
 -    <!-- assemble the pde -->
 -    <mkdir dir="windows/work/lib" />
 -    <copy todir="windows/work/lib" flatten="true">
 -      <fileset refid="runtime.jars" />
 -    </copy>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="shared" includes="lib/**" />
 -      <fileset file="shared/revisions.txt" />
 -    </copy>
 -
 -    <fixcrlf file="windows/work/revisions.txt" eol="dos"/>
 -    <fixcrlf file="windows/work/lib/formatter.conf" eol="dos"/>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/dist" includes="*.dll" />
 -    </copy>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/dist" includes="drivers/**" />
 -    </copy>
 -
 -    <antcall target="windows-build-avr-toolchain" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./libastylej-2.05.1.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
 -    <copy file="windows/msvcp100.dll" todir="windows/work" />
 -    <copy file="windows/msvcr100.dll" todir="windows/work" />
 -
 -    <!-- Copy listComPort.exe tool -->
 -    <copy todir="windows/work/hardware/tools">
 -      <fileset file="windows/listComPorts.exe" />
 -    </copy>
 -    <chmod perm="755">
 -      <fileset file="windows/work/hardware/tools/listComPorts.exe" />
 -    </chmod>
 -
 -    <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 -    <mkdir dir="${staging_folder}/arduino-builder-windows"/>
 -    <antcall target="unzip-with-ant-task">
 -      <param name="archive_file" value="./arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
 -      <param name="final_folder" value="${staging_folder}/arduino-builder-windows/arduino-builder.exe" />
 -      <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" />
 -    </antcall>
 -    <copy file="${staging_folder}/arduino-builder-windows/arduino-builder.exe" tofile="windows/work/arduino-builder.exe" />
 -    <chmod perm="755" file="windows/work/arduino-builder.exe" />
 -    <move file="${staging_folder}/arduino-builder-windows/tools" tofile="windows/work/tools-builder"/>
 -    <chmod perm="755" file="windows/work/tools-builder/ctags/5.8-arduino5/ctags.exe" />
 -    <copy todir="windows/work/hardware" overwrite="true">
 -      <fileset dir="${staging_folder}/arduino-builder-windows/hardware" includes="*.txt"/>
 -    </copy>
 -    <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 -
 -    <antcall target="assemble">
 -      <param name="target.path" value="windows/work" />
 -    </antcall>
 -
 -    <delete dir="windows/launcher/launch4j"/>
 -    <antcall target="download-${launch4j-download-unpack-target-name}" />
 -
 -    <property name="launch4j.dir" value="windows/launcher/launch4j/" />
 -    <taskdef name="launch4j"
 -	     classname="net.sf.launch4j.ant.Launch4jTask"
 -	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/launcher"
 -	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
 -    </copy>
 -    <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
 -    <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
 -    <delete dir="windows/work" includes="application.ico, config.xml, config_debug.xml" />
 -    <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
 -
 -    <!-- cygwin requires html, dll, and exe to have the +x flag -->
 -    <chmod perm="755">
 -      <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
 -    </chmod>
 -
 -    <!-- For JVM within JDK, release file is in parent directory -->
 -    <property file="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
 -    <property file="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
 -
 -    <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
 -      <condition>
 -        <not>
 -          <equals arg1="${windows.OS_NAME}" arg2="&quot;Windows&quot;"/>
 -        </not>
 -      </condition>
 -    </fail>
 -
 -    <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
 -      <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
 -    </copy>
 -
 -    <antcall target="portable-${portable}">
 -      <param name="parentdir" value="${staging_folder}/work" />
 -    </antcall>
 -  </target>
 -
 -  <target name="windows-build-avr-toolchain">
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="unzip"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
 -    <antcall target="package-library-index-json-bundle"/>
 -  </target>
 -
 -  <target name="windows-run" depends="build,start"/>
 -
 -  <target name="windows-start">
 -    <exec executable="windows/work/arduino.exe" dir="windows/work" spawn="false" failonerror="true"/>
 -  </target>
 -
 -  <target name="windows-dist" depends="build" description="Create .zip files of windows version">
 -    <zip destfile="windows/arduino-${full-version}.zip" level="9">
 -      <zipfileset dir="windows/work" prefix="arduino-${version}"/>
 -    </zip>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Windows was built. Grab the archive from
 -
 -      windows/arduino-${full-version}.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
 -
 -  <!-- - - - - - - - -->
   <!-- Source        -->
   <!-- - - - - - - - -->
@@ -965,8 +497,6 @@
 		  prefix="arduino-${version}"
 		  excludes="**/*.tgz,
 			     **/*.bz2,
 -			     **/build/macosx/,
 -			     **/build/windows/,
 			     **/work/,
 			     **/.git/,
 			     **/*.class"
@@ -988,35 +518,7 @@
   <!-- - - - - - - - -->
   <target name="clean" description="Perform a spring cleaning"
 -	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
 -  </target>
 -
 -  <target name="avr-toolchain-bundle" unless="light_bundle">
 -    <!-- Unzip AVR tools -->
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
 -
 -    <antcall target="${unpack_target}">
 -      <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/>
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/>
 -      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/>
 -      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/>
 -    </antcall>
 -
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude"/>
 -
 -    <antcall target="${unpack_target}">
 -      <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/>
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
 -      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/>
 -      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
 -    </antcall>
 -
 -    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 -    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 -    <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
 -
 -    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
 -    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
 +	  depends="linux-clean, subprojects-clean">
   </target>
   <target name="package-library-index-json-bundle">
@@ -1035,17 +537,6 @@
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>
 -  <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
 -    <exec executable="mv" failonerror="true">
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
 -    </exec>
 -    <exec executable="mv" failonerror="true">
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
 -    </exec>
 -  </target>
 -
   <target name="generate-hourly-build-txt" if="hourly">
     <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
   </target>
--- a/dev-embedded/arduino/files/arduino-1.6.7-script.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.7-script.patch
@ -1,17 +0,0 @@
 diff -uNr a/build/linux/dist/arduino b/build/linux/dist/arduino
 --- a/build/linux/dist/arduino	2015-11-07 16:21:27.391410539 +0100
 +++ b/build/linux/dist/arduino	2015-11-07 16:22:19.534411671 +0100
@@ -8,11 +8,11 @@
     "$APPDIR"/lib/*.jar \
     ;
 do
 -    CLASSPATH="${CLASSPATH}:${LIB}"
 +    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
 done
 export CLASSPATH
 -LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 +LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
--- a/dev-embedded/arduino/files/arduino-1.6.9-Do-Not-ThinkDifferent.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.9-Do-Not-ThinkDifferent.patch
@ -1,22 +0,0 @@
 diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
 --- a/app/src/processing/app/Base.java	2015-11-07 16:00:54.614383789 +0100
 +++ b/app/src/processing/app/Base.java	2015-11-07 16:01:09.486384112 +0100
@@ -49,7 +49,6 @@
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.legacy.PApplet;
 -import processing.app.macosx.ThinkDifferent;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 import processing.app.syntax.PdeKeywords;
@@ -129,10 +128,6 @@
     splashScreenHelper.splashText(_("Loading configuration..."));
 -    if (OSUtils.isMacOS()) {
 -      ThinkDifferent.init();
 -    }
 -
     try {
       guardedMain(args);
     } catch (Throwable e) {
--- a/dev-embedded/arduino/files/arduino-1.6.9-build.xml.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.9-build.xml.patch
@ -1,615 +0,0 @@
 diff -ur arduino-1.6.9.orig/build/build.xml arduino-1.6.9/build/build.xml
 --- arduino-1.6.9.orig/build/build.xml	2016-05-10 10:36:07.000000000 +0200
 +++ arduino-1.6.9/build/build.xml	2016-07-06 09:06:45.863114224 +0200
@@ -13,37 +13,20 @@
   <property name="package_index_url" value="http://downloads.arduino.cc/packages/package_index.json" />
   <!-- Sets properties for macosx/windows/linux depending on current system -->
 -  <condition property="platform" value="macosx-old">
 -    <and>
 -      <os family="mac" />
 -      <matches string="${os.version}" pattern="^10.[56]." />
 -    </and>
 -  </condition>
 -  <condition property="macosx-old"><equals arg1="${platform}" arg2="macosx-old" /></condition>
 -  <fail if="macosx-old" message="MacOSX older than 10.7 are not supported"/>
 -
 -  <condition property="platform" value="macosx"><os family="mac" /></condition>
 -  <condition property="platform" value="windows"><os family="windows" /></condition>
   <condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
   <condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
   <condition property="platform" value="linuxarm"><os family="unix" arch="arm" /></condition>
 -  <condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
 -  <condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linuxarm" /></condition>
 -  <condition property="staging_hardware_folder" value="Arduino.app/Contents/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
 -  <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
   <condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linuxarm" /></condition>
@@ -58,7 +41,6 @@
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
 -  <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
   <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
   <property name="MACOSX_BUNDLED_JVM" value="${java.home}/../"/>
@@ -323,258 +305,6 @@
   </target>
   <!-- - - - - - - - -->
 -  <!-- Mac OS X      -->
 -  <!-- - - - - - - - -->
 -  <target name="macosx-clean" depends="subprojects-clean" description="Clean Mac OS X build">
 -    <delete dir="macosx/work" />
 -    <delete dir="macosx/working_dir" />
 -    <delete dir="macosx/working.dmg" />
 -    <delete file="macosx/arduino-*.dmg" />
 -    <delete>
 -      <fileset dir="macosx" includes="arduino-*macosx*.zip"/>
 -    </delete>
 -  </target>
 -
 -  <target name="macosx-checkos" unless="macosx">
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X can only be built on Mac OS X.
 -
 -      Bye.
 -      =======================================================
 -    </echo>
 -    <fail message="wrong platform (${os.name})" />
 -  </target>
 -
 -  <target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
 -    <fail unless="MACOSX_BUNDLED_JVM" message="MacOSX requires MACOSX_BUNDLED_JVM property set"/>
 -    <mkdir dir="${staging_folder}/work" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino4.jar.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip" />
 -      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
 -      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino4" />
 -    </antcall>
 -
 -    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino4/appbundler-1.0ea-arduino4.jar"/>
 -
 -    <bundleapp
 -            jvmRequired="1.8"
 -            jrepreferred="true"
 -            outputdirectory="${staging_folder}/work"
 -            name="Arduino"
 -            displayname="Arduino"
 -            executablename="Arduino"
 -            identifier="cc.arduino.Arduino"
 -            shortversion="${version}"
 -            version="${revision}"
 -            signature="Pde1"
 -            icon="macosx/processing.icns"
 -            mainclassname="processing.app.Base"
 -            copyright="Arduino LLC"
 -            applicationCategory="public.app-category.education"
 -            minimumsystemversion="10.7"
 -            highresolutioncapable="true">
 -
 -      <runtime dir="${MACOSX_BUNDLED_JVM}"/>
 -
 -      <arch name="x86_64"/>
 -      <arch name="i386"/>
 -
 -      <classpath refid="runtime.jars"/>
 -
 -      <option value="-Dapple.awt.application.name=Arduino"/>
 -      <option value="-Dapple.laf.useScreenMenuBar=true"/>
 -      <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
 -      <option value="-Dcom.apple.smallTabs=true"/>
 -      <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
 -      <option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
 -      <option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
 -
 -      <!--
 -      <option value="-Dapple.awt.showGrowBox=false"/>
 -      <option value="-Dapple.awt.Antialiasing=false"/>
 -      <option value="-Dapple.awt.TextAntialiasing=true"/>
 -      <option value="-Dcom.apple.hwaccel=true"/>
 -      <option value="-Dapple.awt.graphics.UseQuartz=true"/>
 -      -->
 -
 -      <!--<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>-->
 -
 -      <!-- Workaround since the icon parameter for bundleapp doesn't work -->
 -      <option value="-Xdock:name=Arduino"/>
 -      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Arduino"/>
 -      <option value="-Dfile.encoding=UTF-8"/>
 -
 -      <option value="-Xms128M"/>
 -      <option value="-Xmx512M"/>
 -      <option value="-splash:$APP_ROOT/Contents/Java/lib/splash.png"/>
 -
 -      <bundledocument extensions="ino,c,cpp,h"
 -                      icon="macosx/pde.icns"
 -                      name="Arduino Source File"
 -                      role="Editor" ispackage="false">
 -      </bundledocument>
 -
 -    </bundleapp>
 -
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 -
 -    <copy todir="${staging_folder}/work/${staging_hardware_folder}/../">
 -      <fileset dir="shared" includes="lib/**" />
 -      <fileset file="shared/revisions.txt" />
 -    </copy>
 -
 -    <mkdir dir="${staging_folder}/work" />
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
 -
 -    <antcall target="macosx-build-avr-toolchain" />
 -
 -    <antcall target="package-library-index-json-bundle"/>
 -
 -    <antcall target="assemble">
 -      <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
 -    </antcall>
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
 -    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
 -      <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
 -
 -    <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
 -    <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
 -    <antcall target="untar">
 -      <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
 -      <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
 -      <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
 -    </antcall>
 -    <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
 -    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
 -    <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
 -    <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
 -      <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
 -    </copy>
 -    <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
 -
 -    <antcall target="portable-${portable}">
 -      <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
 -    </antcall>
 -  </target>
 -
 -  <!-- Unzip AVR tools -->
 -  <target name="macosx-build-avr-toolchain" unless="light_bundle">
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
 -    <chmod perm="+x">
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
 -    </chmod>
 -
 -    <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
 -    <chmod perm="-x">
 -      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
 -    </chmod>
 -  </target>
 -
 -  <target name="macosx-run" depends="build,start"/>
 -
 -  <target name="macosx-start">
 -    <exec executable="macosx/work/Arduino.app/Contents/MacOS/Arduino" spawn="false" failonerror="true"/>
 -  </target>
 -
 -  <!-- - - - - - - - - - - - - - - - -->
 -  <!-- Sign application for MacOSX.  -->
 -  <!-- - - - - - - - - - - - - - - - -->
 -  <target name="macosx-signed-dist" if="macosx" depends="macosx-singed-dist-check, dist"
 -    description="Create a downloadable and signed .zip for the Mac OS X version">
 -    <fail unless="version" message="Please set the property 'version' to correctly sign distribution file" />
 -
 -    <!-- Remove everything from working folder -->
 -    <delete dir="macosx/work/Arduino.app" />
 -
 -    <!-- Unzip unsigned app into working dir -->
 -    <exec executable="unzip" dir="macosx/work" failonerror="true">
 -      <arg line="../arduino-${version}-${platform}.zip" />
 -    </exec>
 -
 -    <!-- Unlock keychain file -->
 -    <exec executable="security" dir="macosx/work" failonerror="true">
 -      <arg line="unlock-keychain -p &quot;${macosx-sign-keychain-pass}&quot; &quot;${macosx-sign-keychain}&quot;" />
 -    </exec>
 -
 -    <!-- Sign app -->
 -    <exec executable="codesign" dir="macosx/work" failonerror="true">
 -      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; --deep -v Arduino.app/" />
 -    </exec>
 -
 -    <!-- Check for successful signing -->
 -    <exec executable="codesign" dir="macosx/work" failonerror="true">
 -      <arg line="-vvvv Arduino.app/" />
 -    </exec>
 -
 -    <delete file="macosx/arduino-${version}-${platform}.zip" />
 -
 -    <!-- Create signed zip file -->
 -    <exec executable="zip" dir="macosx/work" failonerror="true">
 -      <arg line="-q -r ../arduino-${full-version}-signed.zip ." />
 -    </exec>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X built and signed.
 -
 -      macosx/arduino-${full-version}-signed.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
 -  <target name="macosx-singed-dist-check">
 -    <fail unless="macosx-sign-keychain" message="Please set the property 'macosx-sign-keychain' to the correct keychain file" />
 -    <fail unless="macosx-sign-keychain-pass" message="Please set the property 'macosx-sign-keychain-pass' with the password to unlock the keychain" />
 -    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to the correct cert identifier" />
 -  </target>
 -
 -  <!-- - - - - - - - - - - - - - - - - - - -->
 -  <!-- Build distribution file for MacOSX. -->
 -  <!-- - - - - - - - - - - - - - - - - - - -->
 -  <target name="macosx-dist" if="macosx" depends="build" description="Create a downloadable .zip for the Mac OS X version">
 -    <exec executable="zip" dir="macosx/work" failonerror="true">
 -      <arg line="-q -r ../arduino-${full-version}.zip ." />
 -    </exec>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Mac OS X was built. Grab the image from
 -
 -      macosx/arduino-${full-version}.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
 -  <!-- - - - - - - - -->
   <!-- Linux         -->
   <!-- - - - - - - - -->
@@ -710,14 +440,6 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -742,14 +464,6 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -774,14 +488,6 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="untar"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -902,197 +608,6 @@
   <target name="linuxarm-dist" depends="linux-dist"
 	  description="Build .tar.xz of linux armhf version" />
 -  <!-- - - - - - - - -->
 -  <!-- Windows       -->
 -  <!-- - - - - - - - -->
 -
 -  <target name="windows-clean" depends="subprojects-clean"
 -	  description="Clean windows version">
 -    <delete dir="windows/work" />
 -    <delete>
 -      <fileset dir="windows" includes="arduino-*windows*.zip"/>
 -    </delete>
 -  </target>
 -
 -  <target name="windows-checkos" unless="windows">
 -    <echo>
 -      =======================================================
 -      Arduino for Windows can only be built on windows.
 -
 -      Bye.
 -      =======================================================
 -    </echo>
 -
 -    <fail message="wrong platform (${os.name})" />
 -  </target>
 -
 -  <target name="download-launch4j-windows">
 -    <antcall target="unzip-with-ant-task">
 -      <param name="archive_file" value="windows/launch4j-3.8-win32.zip"/>
 -      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-win32.zip"/>
 -      <param name="final_folder" value="windows/launcher/launch4j"/>
 -      <param name="dest_folder" value="windows/launcher/"/>
 -    </antcall>
 -  </target>
 -
 -  <target name="download-launch4j-linux">
 -    <antcall target="untar">
 -      <param name="archive_file" value="windows/launch4j-3.8-linux.tgz"/>
 -      <param name="archive_url" value="http://downloads.sourceforge.net/project/launch4j/launch4j-3/3.8/launch4j-3.8-linux.tgz"/>
 -      <param name="final_folder" value="windows/launcher/launch4j"/>
 -      <param name="dest_folder" value="windows/launcher/"/>
 -    </antcall>
 -  </target>
 -
 -  <target name="windows-build"
 -	  depends="revision-check, windows-checkos, subprojects-build"
 -	  description="Build windows version">
 -    <mkdir dir="windows/work" />
 -    <mkdir dir="windows/work/${staging_hardware_folder}" />
 -
 -    <copy todir="windows/work/lib">
 -      <fileset dir="shared" includes="icons/**/*.png"/>
 -    </copy>
 -
 -    <!-- assemble the pde -->
 -    <mkdir dir="windows/work/lib" />
 -    <copy todir="windows/work/lib" flatten="true">
 -      <fileset refid="runtime.jars" />
 -    </copy>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="shared" includes="lib/**" />
 -      <fileset file="shared/revisions.txt" />
 -    </copy>
 -
 -    <fixcrlf file="windows/work/revisions.txt" eol="dos"/>
 -    <fixcrlf file="windows/work/lib/formatter.conf" eol="dos"/>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/dist" includes="*.dll" />
 -    </copy>
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/dist" includes="drivers/**" />
 -    </copy>
 -
 -    <antcall target="windows-build-avr-toolchain" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
 -    <copy file="windows/msvcp100.dll" todir="windows/work" />
 -    <copy file="windows/msvcr100.dll" todir="windows/work" />
 -
 -    <antcall target="unzip">
 -      <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
 -      <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
 -    <copy file="windows/liblistSerials-${LIBLISTSERIAL-VERSION}/windows/listSerialsj.dll" todir="windows/work/lib/" />
 -    <chmod perm="755" file="windows/work/lib/listSerialsj.dll" />
 -
 -    <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 -    <mkdir dir="${staging_folder}/arduino-builder-windows"/>
 -    <antcall target="unzip-with-ant-task">
 -      <param name="archive_file" value="./arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-windows-${ARDUINO-BUILDER-VERSION}.zip" />
 -      <param name="final_folder" value="${staging_folder}/arduino-builder-windows/arduino-builder.exe" />
 -      <param name="dest_folder" value="${staging_folder}/arduino-builder-windows" />
 -    </antcall>
 -    <copy file="${staging_folder}/arduino-builder-windows/arduino-builder.exe" tofile="windows/work/arduino-builder.exe" />
 -    <chmod perm="755" file="windows/work/arduino-builder.exe" />
 -    <move file="${staging_folder}/arduino-builder-windows/tools" tofile="windows/work/tools-builder"/>
 -    <chmod perm="755" file="windows/work/tools-builder/ctags/5.8-arduino10/ctags.exe" />
 -    <copy todir="windows/work/hardware" overwrite="true">
 -      <fileset dir="${staging_folder}/arduino-builder-windows/hardware" includes="*.txt"/>
 -    </copy>
 -    <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
 -
 -    <antcall target="assemble">
 -      <param name="target.path" value="windows/work" />
 -    </antcall>
 -
 -    <delete dir="windows/launcher/launch4j"/>
 -    <antcall target="download-${launch4j-download-unpack-target-name}" />
 -
 -    <property name="launch4j.dir" value="windows/launcher/launch4j/" />
 -    <taskdef name="launch4j"
 -	     classname="net.sf.launch4j.ant.Launch4jTask"
 -	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
 -
 -    <copy todir="windows/work">
 -      <fileset dir="windows/launcher"
 -	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
 -    </copy>
 -    <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
 -    <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
 -    <delete dir="windows/work" includes="application.ico, config.xml, config_debug.xml" />
 -    <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
 -
 -    <!-- cygwin requires html, dll, and exe to have the +x flag -->
 -    <chmod perm="755">
 -      <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
 -    </chmod>
 -
 -    <!-- For JVM within JDK, release file is in parent directory -->
 -    <property file="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
 -    <property file="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
 -
 -    <fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
 -      <condition>
 -        <not>
 -          <equals arg1="${windows.OS_NAME}" arg2="&quot;Windows&quot;"/>
 -        </not>
 -      </condition>
 -    </fail>
 -
 -    <copy todir="${staging_folder}/work/java" includeemptydirs="true" preservelastmodified="true" overwrite="true" failonerror="true">
 -      <fileset dir="${WINDOWS_BUNDLED_JVM}" includes="*/**"/>
 -    </copy>
 -
 -    <antcall target="portable-${portable}">
 -      <param name="parentdir" value="${staging_folder}/work" />
 -    </antcall>
 -  </target>
 -
 -  <target name="windows-build-avr-toolchain">
 -    <antcall target="avr-toolchain-bundle">
 -      <param name="unpack_target" value="unzip"/>
 -      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
 -      <param name="gcc_version" value="4.8.1-arduino5"/>
 -      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
 -      <param name="avrdude_version" value="6.0.1-arduino5"/>
 -    </antcall>
 -
 -    <antcall target="package-library-index-json-bundle"/>
 -  </target>
 -
 -  <target name="windows-run" depends="build,start"/>
 -
 -  <target name="windows-start">
 -    <exec executable="windows/work/arduino.exe" dir="windows/work" spawn="false" failonerror="true"/>
 -  </target>
 -
 -  <target name="windows-dist" depends="build" description="Create .zip files of windows version">
 -    <zip destfile="windows/arduino-${full-version}.zip" level="9">
 -      <zipfileset dir="windows/work" prefix="arduino-${version}"/>
 -    </zip>
 -
 -    <echo>
 -      =======================================================
 -      Arduino for Windows was built. Grab the archive from
 -
 -      windows/arduino-${full-version}.zip
 -      =======================================================
 -    </echo>
 -  </target>
 -
   <!-- - - - - - - - -->
   <!-- Source        -->
@@ -1109,8 +624,6 @@
 		  prefix="arduino-${version}"
 		  excludes="**/*.tgz,
 			     **/*.bz2,
 -			     **/build/macosx/,
 -			     **/build/windows/,
 			     **/work/,
 			     **/.git/,
 			     **/*.class"
@@ -1132,35 +645,7 @@
   <!-- - - - - - - - -->
   <target name="clean" description="Perform a spring cleaning"
 -	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
 -  </target>
 -
 -  <target name="avr-toolchain-bundle" unless="light_bundle">
 -    <!-- Unzip AVR tools -->
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
 -
 -    <antcall target="${unpack_target}">
 -      <param name="archive_file" value="${staging_folder}/${gcc_archive_file}"/>
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/${gcc_archive_file}"/>
 -      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/${gcc_version}/"/>
 -      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/"/>
 -    </antcall>
 -
 -    <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude"/>
 -
 -    <antcall target="${unpack_target}">
 -      <param name="archive_file" value="${staging_folder}/${avrdude_archive_file}"/>
 -      <param name="archive_url" value="http://downloads.arduino.cc/tools/${avrdude_archive_file}"/>
 -      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/${avrdude_version}"/>
 -      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/"/>
 -    </antcall>
 -
 -    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 -    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 -    <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
 -
 -    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
 -    <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
 +	  depends="linux-clean, subprojects-clean">
   </target>
   <target name="package-library-index-json-bundle">
@@ -1187,17 +672,6 @@
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>
 -  <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
 -    <exec executable="mv" failonerror="true">
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
 -    </exec>
 -    <exec executable="mv" failonerror="true">
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
 -      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
 -    </exec>
 -  </target>
 -
   <target name="generate-hourly-build-txt" if="hourly">
     <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
   </target>
--- a/dev-embedded/arduino/files/arduino-1.6.9-platform.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.9-platform.patch
@ -1,24 +0,0 @@
 diff -ur arduino-1.6.9.orig/hardware/arduino/avr/platform.txt arduino-1.6.9/hardware/arduino/avr/platform.txt
 --- arduino-1.6.9.orig/hardware/arduino/avr/platform.txt	2016-05-10 10:36:07.000000000 +0200
 +++ arduino-1.6.9/hardware/arduino/avr/platform.txt	2016-07-06 17:11:45.587888237 +0200
@@ -18,7 +18,7 @@
 compiler.warning_flags.all=-Wall -Wextra
 # Default "compiler.path" is correct, change only if you want to override the initial value
 -compiler.path={runtime.tools.avr-gcc.path}/bin/
 +compiler.path=/usr/bin/
 compiler.c.cmd=avr-gcc
 compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD
 compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections
@@ -91,9 +91,9 @@
 # AVR Uploader/Programmers tools
 # ------------------------------
 -tools.avrdude.path={runtime.tools.avrdude.path}
 +tools.avrdude.path=/usr
 tools.avrdude.cmd.path={path}/bin/avrdude
 -tools.avrdude.config.path={path}/etc/avrdude.conf
 +tools.avrdude.config.path=/etc/avrdude.conf
 tools.avrdude.upload.params.verbose=-v
 tools.avrdude.upload.params.quiet=-q -q
--- a/dev-embedded/arduino/files/arduino-1.6.9-script.patch
+++ b/dev-embedded/arduino/files/arduino-1.6.9-script.patch
@ -1,17 +0,0 @@
 diff -uNr a/build/linux/dist/arduino b/build/linux/dist/arduino
 --- a/build/linux/dist/arduino	2015-11-07 16:21:27.391410539 +0100
 +++ b/build/linux/dist/arduino	2015-11-07 16:22:19.534411671 +0100
@@ -8,11 +8,11 @@
     "$APPDIR"/lib/*.jar \
     ;
 do
 -    CLASSPATH="${CLASSPATH}:${LIB}"
 +    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
 done
 export CLASSPATH
 -LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 +LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
--- a/dev-embedded/arduino/files/arduino-1.8.1-Do-Not-ThinkDifferent.patch
+++ b/dev-embedded/arduino/files/arduino-1.8.1-Do-Not-ThinkDifferent.patch
@ -1,22 +0,0 @@
 diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
 --- a/app/src/processing/app/Base.java	2015-11-07 16:00:54.614383789 +0100
 +++ b/app/src/processing/app/Base.java	2015-11-07 16:01:09.486384112 +0100
@@ -49,7 +49,6 @@
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.legacy.PApplet;
 -import processing.app.macosx.ThinkDifferent;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 import processing.app.syntax.PdeKeywords;
@@ -129,10 +128,6 @@
     splashScreenHelper.splashText(_("Loading configuration..."));
 -    if (OSUtils.isMacOS()) {
 -      ThinkDifferent.init();
 -    }
 -
     try {
       guardedMain(args);
     } catch (Throwable e) {
--- a/dev-embedded/arduino/files/arduino-1.8.4-Do-Not-ThinkDifferent.patch
+++ b/dev-embedded/arduino/files/arduino-1.8.4-Do-Not-ThinkDifferent.patch
@ -1,22 +0,0 @@
 diff -uNr a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
 --- a/app/src/processing/app/Base.java	2015-11-07 16:00:54.614383789 +0100
 +++ b/app/src/processing/app/Base.java	2015-11-07 16:01:09.486384112 +0100
@@ -49,7 +49,6 @@
 import processing.app.helpers.filefilters.OnlyFilesWithExtension;
 import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
 import processing.app.legacy.PApplet;
 -import processing.app.macosx.ThinkDifferent;
 import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 import processing.app.syntax.PdeKeywords;
@@ -129,10 +128,6 @@
     splashScreenHelper.splashText(_("Loading configuration..."));
 -    if (OSUtils.isMacOS()) {
 -      ThinkDifferent.init();
 -    }
 -
     try {
       guardedMain(args);
     } catch (Throwable e) {
--- a/dev-embedded/arduino/files/arduino.desktop
+++ b/dev-embedded/arduino/files/arduino.desktop
@ -1,11 +0,0 @@
 [Desktop Entry]
 Version=1.0
 Name=Arduino
 GenericName=Arduino IDE
 Comment=Open-source electronics prototyping platform
 Exec=arduino
 Icon=arduino
 Terminal=false
 Type=Application
 Categories=Development;IDE;Java
 StartupNotify=false
--- a/dev-embedded/arduino/files/platform-1.6.9/platform.txt
+++ b/dev-embedded/arduino/files/platform-1.6.9/platform.txt
@ -1,16 +0,0 @@
 # ctags
 # ------------------------------
 tools.ctags.path=/usr/bin
 tools.ctags.cmd.path={path}/ctags
 tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
 # additional entries
 tools.avrdude.path=/usr/bin
 preproc.includes.flags=-w -x c++ -M -MG -MP
 #preproc.includes.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
 #recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {preproc.includes.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.includes.compatibility_flags} {includes} "{source_file}"
 preproc.macros.flags=-w -x c++ -E -CC
 #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
 #recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@ -1,3 +1,3 @@
 DIST gpsim-0.31.0.tar.gz 3454179 BLAKE2B 449f891c7a765ce06da87c8de1a8adc0d7e15c9af175fc2988d604660108c14cc816247358a71bbb55813c5144f6973c01d3c9c27c44f2a45820b85cedc97d2c SHA512 a6af7e9170cee11c35f0e4731d39876e563edd8ca9cbd0f4b3017f224e5317b4c8bcc8aa4468102fa5c11157f487b6c7354e3aba8778842ed0b5be9bbb9ef45f
-EBUILD gpsim-0.31.0.ebuild 955 BLAKE2B 7ae00791751b242603a8ef1ad765c546c0bbd77c7b8abc1a4b49df856095a7aac7b24aecb574482a226ce3905cda27ef2d2c7e20caa2c778d8f16ff3775eb58f SHA512 ca2483aa7c51f84bb7fb0bc1a5ec717eee4dfaba7dd3b9c12b35bedd1415210cb87a2b9d15bfa0327b50ca9b3cb8180f1848c8b01a7b32dbabae20fb9c932c0b
+EBUILD gpsim-0.31.0.ebuild 959 BLAKE2B e0d45355c6da332fcd1104aabad620fca0fdabded0798289ab38998847d6a248c5550e0b8e4c6fa074adfde19c931ea1c0dbf3b9352e52bc8dfc1cd248b6357c SHA512 ba35b163e0eebbca2114cb66fc984fb14226d37435c54e24652f110cd4b59ae0d539d02107a234ca3ba037b053d67420aec0e69097700c8ed9ddf2853e7d8de6
 EBUILD gpsim-9999.ebuild 1549 BLAKE2B 79f20565a2ec36e43d3d8580882fec5d7d87a5d8a6f65d9e80334cf9d83baf12e38996f73204826305e56c281dea827d877d28bb455c7591cce14ab1163f842c SHA512 268dc1964ac8cf2ba122b8bae0716a8778185f50be64957fa505b3a776f631f6b1a082ef93bf978a2e803322a4b480c1da026f1425213afce2b3c90e2b215974
--- a/dev-embedded/gpsim/gpsim-0.31.0.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.31.0.ebuild
@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit ltprune
 if [[ ${PV} == "9999" ]] ; then
        inherit subversion
@ -41,5 +40,5 @@ src_configure() {
 src_install() {
 	default
 	use doc && dodoc doc/gpsim.pdf
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-embedded/listserialportsc/Manifest
+++ b/dev-embedded/listserialportsc/Manifest
@ -1,3 +0,0 @@
 DIST 1.0.7.tar.gz 2577 SHA256 8b1ce11c21e42f0d6db5dee31fa23d5180b77cc8fd9aea359657a17cccf91eab SHA512 8a398ec1ea9ae41181415198d13a546e00fe157c49a04f32547df1bed67de1df0d6abc966b8ff88d9b60a0ba65b0dce483e2dbcdc81e08b05318de9fe7059f95 WHIRLPOOL 88b41ed32b6f56b5c183798dfa04b613ba27ce459df6567734112b73223417019415c4cce6e6e045c671b2e2e07d9186b808a99efbf95ba7a8e24707bc509362
 EBUILD listserialportsc-1.0.7.ebuild 1139 SHA256 f8f5f7a40d0e19f7e2a554631b86f897b15aca64b59abdb44bc703bb43b2b5eb SHA512 3352dae38db5b9447c66fbaf17734b127df269c0894cfd22873b39869bc225538efeb6233c2d655b06e5d1644ca9c108350e3652827c695b7a68bab398dc3571 WHIRLPOOL 4e4e50a7b6578824845eac864634d1ccd87e82e682b44c8b60c7fdfa8c0798931d8b7b8a9d9fc369bab12d3a923eb5bf96f0cd0a57aa02a7a63763809589f0c0
 MISC metadata.xml 208 SHA256 91ad1c1aa6da2120f2a36c6b31826659af1eb7ebc30b62bb537795296c80ad68 SHA512 b53b2af56213a10dea345cecbacd72494d9a84e794274b2739837893a2fdec5ff71d66d8000375c440762734fff7f83a415ff6c44aa759b5bda7be21e983b79e WHIRLPOOL 32934c3a294d9bbbcadec4b77a0968f9f9cad6df554a58cd85d916d05d5a80311d1bbe3945b81662982fb9a7dccf64b8f0170c35bc716e1bb4d0219b8b0d16ed
--- a/dev-embedded/listserialportsc/listserialportsc-1.0.7.ebuild
+++ b/dev-embedded/listserialportsc/listserialportsc-1.0.7.ebuild
@ -1,48 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=4
 inherit eutils java-pkg-2 toolchain-funcs
 DESCRIPTION="List serial ports with vid/pid/iserial fields"
 HOMEPAGE="https://github.com/arduino/listSerialPortsC"
 SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND=""
 DEPEND=">=dev-libs/libserialport-0.1.1"
 S="${WORKDIR}/listSerialPortsC-${PV}"
 src_prepare() {
 	# Unbundle
 	rm -rf libserialport win32_jni
 }
 src_compile() {
 	CC=$(tc-getCC)
 	${CC} -Wall -O2 ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c
 	${CC} ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC
 	${CC} \
 		-Wall -O2 ${CPPFLAGS} ${CFLAGS} -fPIC \
 		-I$(java-config-2 -o)/include \
 		-I$(java-config-2 -o)/include/linux \
 		-o jnilib.o -c jnilib.c
 	${CC} \
 		${CFLAGS} ${LDFLAGS} \
 		-shared -Wl,-soname,liblistSerialsj.so \
 		jnilib.o -lserialport -o liblistSerialsj.so.${PV}
 }
 src_install() {
 	dobin listSerialC
 	dolib liblistSerialsj.so.${PV}
 	dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so
 }
--- a/dev-embedded/listserialportsc/metadata.xml
+++ b/dev-embedded/listserialportsc/metadata.xml
@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>junk4me46806@yahoo.com</email>
 	</maintainer>
 </pkgmetadata>
--- a/dev-embedded/pk2cmd/Manifest
+++ b/dev-embedded/pk2cmd/Manifest
@ -1,6 +0,0 @@
 AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 SHA256 c59040ad6b5d840f3e55990fa58230610aac9164196ea0b3255fc1f4616c882d SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638 WHIRLPOOL a22205d9a8b1c95f9fc341e5f3db41df47ec0787ea44267c19c58f7ad47f3beda411d1fcdf003380b41960a34a0c83cd03fb6bd62cb4bca05669484d6e48257b
 AUX pk2cmd-add-share-dir-for-dev-file.patch 1268 SHA256 58ee54b394a19c20e075e357b9d00b0e3609e758a2fed8488664bf189ae1be2b SHA512 d05ee8ca723ab02b156c7b544f54480fe9ff18611442a5a41d7ac755f651e6550d8f3fd8f38d348b89dd77112ede403b5ad4372cb75bd0e09315d74347bd1565 WHIRLPOOL b2f854934d9c36241f1a92e6e56b56ac01fc77faeec0b2fd9b33475ebfb5289d967ee587811ceb8bb73f13d501ffacb4a995180174ab87578bc8fdd40693429b
 DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 SHA256 903027de5036eda3a648decece4acfcefe91e754ef0d4eacba0e5ba8b18857fa SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24 WHIRLPOOL f4f36412d4e653a20866bcbe9ec25b94e8ff4e75c1ae2e4944a42682832c9b64b683248bc559e73b976902906d2959492867f055291588cf66d9b83838174c75
 EBUILD pk2cmd-1.20.ebuild 1212 SHA256 1d033af2b7093c2973c329e2fb0e1e4ce090385cc78348fc8b6f0dfb6444fe9f SHA512 16960cfdb7887768008d8dc61d04b66cdf402852bee35542c93dab6d7b43c41dae4d4c8b80549d26b9801bb8df430bf982106219072efda4c20fb08919386358 WHIRLPOOL 6a7b16f1d3bbdc475b13f35a9c3816477f07c97ce4ad931154605019e1cfc19af4b8bf4ade978cadf6e82a9dec46a149ce889fed9bcc050d4a6cef6e677e481b
 EBUILD pk2cmd-9999.ebuild 1423 SHA256 d1589444ec2029265abf73dbacb751c73f44a567d94788d0622363f313fdb743 SHA512 6207ae1b9792cce8950e6ae4be85991f22c8728b98b526b6c408096b8327ecff644f0cb2fd59cc02f2e15a54dbe441dc6394756cfb91d6f713adaa8322d52dda WHIRLPOOL 1e7d32194b0e1570780f015ddae8d143bca3b2b8b12fa76379fbc41661ca8c9d9f0d12d40fafaae400102e7302feb15ea65a11fe1b2a50abc9ead143b15dd5b0
 MISC metadata.xml 367 SHA256 b7b67f2fc54adf03857f1024784295bcedebc293481d25a7bfeaa073d2419cfb SHA512 09c3d20eb53c9927bb7489b3522f4daa0809a379760d950a33eed0b9ddfccfe1eae4324e5c674c4731779ccb45a95627575941f2d22387efcda406947256cb22 WHIRLPOOL 6620a00bfdc65555675fd5a7099d57c6ee2d9e1115e5b852865de97befd1759305373964af2afdabb0142a540d1472143a9e3aa287c016994e643775b20898a6
--- a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
+++ b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
@ -1,16 +0,0 @@
 --- cmd_app.cpp.old	2009-01-31 21:23:30.000000000 +0100
 +++ cmd_app.cpp	2009-01-31 21:25:48.000000000 +0100
@@ -88,7 +88,12 @@
 		_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);
 		if (_tcslen(tempString) < 17)
 		{
 -			_tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
 +               // Try /usr/share/pk2 first
 +               _tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32);
 +
 +               if(access(tempString, 0))
 +                       // Well, that didn't work, default to the current directory
 +                       _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
 		}
 	}
 	if (!PicFuncs.ReadDeviceFile(tempString))
--- a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file.patch
+++ b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file.patch
@ -1,25 +0,0 @@
 --- pk2cmd-9999/pk2cmd/cmd_app.cpp.orig	2017-05-17 15:46:14.454813532 +0200
 +++ pk2cmd-9999/pk2cmd/cmd_app.cpp	2017-05-17 15:46:59.444690407 +0200
@@ -8,7 +8,7 @@
 // Software must have this entire copyright and disclaimer notice prominently
 // posted in a location where end users will see it (e.g., installation program,
 // program headers, About Box, etc.).  To the maximum extent permitted by law,
 -// this Software is distributed “AS IS” and WITHOUT ANY WARRANTY INCLUDING BUT
 +// this Software is distributed ?AS IS? and WITHOUT ANY WARRANTY INCLUDING BUT
 // NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR
 // PARTICULAR PURPOSE, or NON-INFRINGEMENT. IN NO EVENT WILL MICROCHIP OR ITS
 // LICENSORS BE LIABLE FOR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL
@@ -88,7 +88,12 @@
 		_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);
 		if (_tcslen(tempString) < 17)
 		{
 -			_tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
 +			// Try /usr/share/pk2 first
 +			_tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32);
 +
 +			if(access(tempString, 0)) 
 +				// Well, that didn't work, default to the current directory
 +				_tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
 		}
 	}
 	if (!PicFuncs.ReadDeviceFile(tempString))
--- a/dev-embedded/pk2cmd/metadata.xml
+++ b/dev-embedded/pk2cmd/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
  <email>embedded@gentoo.org</email>
  <name>Embedded Gentoo</name>
 </maintainer>
 <longdescription lang="en">
 This application allows the use of the PICKit2 PIC programming device.
 </longdescription>
 </pkgmetadata>
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit eutils toolchain-funcs
 DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
 HOMEPAGE="http://www.microchip.com/pickit2"
 SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz"
 LICENSE="MicroChip-PK2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}v${PV}LinuxMacSource
 src_prepare() {
 	# Patch adds /usr/share/pk2 to the default search for the device file
 	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"
 	# Fix up the Makefile
 	sed \
 		-e 's:#TARGET=linux:TARGET=linux:' \
 		-e 's:DBG=-O2:DBG=:' \
 		-e 's:^CFLAGS=:CFLAGS+=:' \
 		-e 's:^LDFLAGS=:LDFLAGS+=:' \
 		-e 's:^LIBUSB=/usr/local:LIBUSB=/usr:' \
 		-e "s:^CC=g++::" \
 		-i Makefile || die
 }
 src_compile() {
 	emake CC="$(tc-getCXX)"
 }
 src_install() {
 	# Copy the device files and PicKit2 OS
 	insinto "/usr/share/pk2"
 	doins PK2DeviceFile.dat PK2V023200.hex
 	# Install the program
 	dobin pk2cmd
 	# Install the documentation
 	dodoc ReadmeForPK2CMDLinux2-6.txt usbhotplug.txt
 }
--- a/dev-embedded/pk2cmd/pk2cmd-9999.ebuild
+++ b/dev-embedded/pk2cmd/pk2cmd-9999.ebuild
@ -1,58 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit eutils toolchain-funcs
 DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
 HOMEPAGE="http://www.microchip.com/pickit2"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="
                git://github.com/psmay/${PN}.git
                https://github.com/psmay/${PN}.git
        "
        inherit git-r3
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz"
 	KEYWORDS="~amd64 ppc ppc64 ~x86"
 	S=${WORKDIR}/${PN}v${PV}LinuxMacSource
 fi
 LICENSE="MicroChip-PK2"
 SLOT="0"
 IUSE=""
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	# Patch adds /usr/share/pk2 to the default search for the device file
 	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file.patch"
 	# Fix up the Makefile
 	sed \
 		-e 's:#TARGET=linux:TARGET=linux:' \
 		-e 's:DBG=-O2:DBG=:' \
 		-e 's:^CFLAGS=:CFLAGS+=:' \
 		-e 's:^LDFLAGS=:LDFLAGS+=:' \
 		-e 's:^LIBUSB=/usr/local:LIBUSB=/usr:' \
 		-e "s:^CC=g++::" \
 		-i Makefile || die
 }
 src_compile() {
 	emake CC="$(tc-getCXX)"
 }
 src_install() {
 	# Copy the device files and PicKit2 OS
 	insinto "/usr/share/pk2"
 	doins PK2DeviceFile.dat PK2V023200.hex
 	# Install the program
 	dobin pk2cmd
 	# Install the documentation
 	dodoc ReadmeForPK2CMDLinux2-6.txt usbhotplug.txt
 }
--- a/dev-embedded/platformio/platformio-3.4.1.ebuild
+++ b/dev-embedded/platformio/platformio-3.4.1.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 DESCRIPTION="An open source ecosystem for IoT development. Cross-platform build system and library manager. Continuous and IDE integration. Arduino, ESP8266 and ARM mbed compatible"
 HOMEPAGE="http://platformio.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
 	<dev-python/pyserial-4[${PYTHON_USEDEP}]
 	>=dev-python/lockfile-0.9.1[${PYTHON_USEDEP}]
 	<dev-python/lockfile-0.13[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	>=dev-python/click-5[${PYTHON_USEDEP}]
 	<dev-python/click-6[${PYTHON_USEDEP}]
 	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
 	<dev-python/arrow-1[${PYTHON_USEDEP}]"
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@ -1,4 +0,0 @@
 AUX micropython-1.11-prevent-stripping.patch 787 BLAKE2B 6e92c4fdfd44b89d1fad69c056dbab1493d9dc45c4223cfd2f011254db72400c6ac9a62afe84f54c301a86abd92deb56866dc25e2f1bf8af74edf308b15eb29f SHA512 8f994394f42d7fed5fa35b62c01c37ebea3b487c029d659134a263ef8d65e1ec17bec755fdf57cde2f234969bc4f7f4ab30858562d7f8cdb2bc6cb819ba2ae0d
 DIST micropython-1.11.tar.gz 23010708 BLAKE2B 8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1 SHA512 255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
 EBUILD micropython-1.11.ebuild 1161 BLAKE2B 9bc660c6e4e93cf30ec20a9ca1758a13024ec2c16cfcf442f406912e59a3bf3009dfda29dbc0947d0dc966538fd802d551728019abd9212fa851153224a56713 SHA512 d22375deb3c95e317b8a8cde81f0366b1d83a90ffddd3f52b253b78313e96cc93b5e8e07c4efb4f997ac3f204cfbbca159d698136c4cbfe0151433246335e9d6
 MISC metadata.xml 1347 BLAKE2B c121e2eafde4ab3c49a352ab96ffbcc042ecddb5a765f3192589a41f5b3bc5f92e6a6f1a58df21ef2812424aac94e6cd579cfe1d29b4dd16983048768f1694ed SHA512 e8dd8f7cc3d0c570da6b9982596e39891e78e302581dbc0601d622831f976f16b9e9f78d7e0b55ae58ed3c81c3e7113a4217ca1671cdd8929f0b34b4647efc3a
--- a/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
+++ b/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
@ -1,22 +0,0 @@
 --- a/py/mkenv.mk	2017-11-25 09:52:30.921836372 +0000
 +++ a/py/mkenv.mk	2017-11-25 09:52:35.257861233 +0000
@@ -50,7 +50,6 @@
 LD = $(CROSS_COMPILE)ld
 OBJCOPY = $(CROSS_COMPILE)objcopy
 SIZE = $(CROSS_COMPILE)size
 -STRIP = $(CROSS_COMPILE)strip
 AR = $(CROSS_COMPILE)ar
 ifeq ($(MICROPY_FORCE_32BIT),1)
 CC += -m32
 --- a/py/mkrules.mk	2017-11-25 09:53:13.107078063 +0000
 +++ a/py/mkrules.mk	2017-11-25 09:53:31.898185592 +0000
@@ -129,9 +129,6 @@
 # Do not pass COPT here - it's *C* compiler optimizations. For example,
 # we may want to compile using Thumb, but link with non-Thumb libc.
 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
 -ifndef DEBUG
 -	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
 -endif
 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
 clean: clean-prog
--- a/dev-lang/micropython/metadata.xml
+++ b/dev-lang/micropython/metadata.xml
@ -1,30 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">micropython/micropython</remote-id>
 	</upstream>
 	<longdescription lang="en">
 The MicroPython project aims to put an implementation of Python 3.x on
 microcontrollers and small embedded systems.
 MicroPython implements the entire Python 3.4 syntax (including exceptions,
 with, yield from, etc., and additionally async/await keywords from Python 3.5).
 The following core datatypes are provided: str (including basic Unicode
 support), bytes, bytearray, tuple, list, dict, set, frozenset, array.array,
 collections.namedtuple, classes and instances. Builtin modules include sys,
 time, and struct, etc. Select ports have support for _thread module
 (multithreading). Note that only a subset of Python 3 functionality is
 implemented for the data types and modules.
 MicroPython can execute scripts in textual source form or from precompiled
 bytecode, in both cases either from an on-device filesystem or "frozen" into
 the MicroPython executable.
 	</longdescription>
 </pkgmetadata>
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit toolchain-funcs
 DESCRIPTION="Python implementation for microcontrollers"
 HOMEPAGE="https://github.com/micropython/micropython"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 DEPEND="
 	virtual/libffi
 	virtual/pkgconfig"
 PATCHES=( "${FILESDIR}/${P}-prevent-stripping.patch" )
 src_compile() {
 	cd ports/unix || die
 	# 1) don't die on compiler warnings
 	# 2) remove /usr/local prefix references in favour of /usr
 	sed -i \
 		-e 's#-Werror##g;' \
 		-e 's#\/usr\/local#\/usr#g;' \
 		Makefile || die
 	emake CC="$(tc-getCC)" axtls
 	emake CC="$(tc-getCC)"
 }
 src_test() {
 	# TODO: find out why these tests fail
 	rm -v tests/stress/recursive_iternext* || die
 	cd ports/unix || die
 	emake test
 }
 src_install() {
 	pushd ports/unix > /dev/null || die
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
 	popd > /dev/null || die
 	# remove .git files
 	find tools -type f -name '.git*' -exec rm {} \; || die
 	dodoc -r tools
 	einstalldocs
 }
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@ -1,5 +0,0 @@
 AUX libcdio-1.0.0-cddb.patch 948 SHA256 6c067a244d1bd6b0f8de4dada570a535b18e5d66f9e0fedc8da33a42893937fb SHA512 248f02bc2c30c5b8752f2bb6341bd42b9f13b7f112a3b157ce05bbc2ac9562e5dcfe9d98f4531687efbfbdfdcf68c31de21a06605515119e5a631b7fb1de40cb WHIRLPOOL 850b9efc91c6acdd1cb476de3b3c1a8d06375c5c0a9bc72d959af0a4854b4c61f4b85bf16a16ee0370e4aedc4ceb96469901a6754651d897ed70f511892fb15e
 AUX libcdio-1.0.0-version.patch 613 SHA256 b62106be928dcced85d346bd8bcb80afce4f562dfd4110ce77d6460382eb6d34 SHA512 6dc238f442fad3f0b35350fd11aa75bcdbc364cbc3616b4d61e9d53ff9b36b0293ce7e9e2118e07045399cd4a06fa5474870794326f11df98f3e218b74cef822 WHIRLPOOL b7339c0ffaee9347dbe3e77036c791769f2b3c8f706cebd877d894a3204e409f8907d89e569a5a2a37fce608ca0c1990ac76245278634ed934bc5e1de640cd78
 DIST libcdio-1.0.0.tar.gz 2343992 SHA256 fe080bc3cb7a57becdecf2b392bf39c24df0211f5fdfddfe99748fa052a7e231 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc WHIRLPOOL 4a769a1202b9fbded34ba1de42a9409dad2d34f6f84d0884d6b5b3a091cc4405fca3e1989bf68ef3aefcad405bbb01c98a9101ee14e0ba1cd5cf9b74c8bc8aa1
 EBUILD libcdio-1.0.0-r1.ebuild 1994 SHA256 2326d8aaf5078013d11a0fdfd1d55b34c7c47118be286cc95197ee2f4265e801 SHA512 95efc6c26d694d3afca4ae0a15fe6e04501c1bd87b8a0cdfbbbf27f41bf934cf9017551e3bd0ec708647cd66e5bc15b8de18ad596c363456c86f4df092c7f93b WHIRLPOOL 39793da5f2f9e594124eaaad1a4046f432dda6f5d81c3f2700c89e280ab2980840a382126010aea27aa4f0c23bd9d4a25990a77a7d16d69916eb679a731cd8b8
 MISC metadata.xml 528 SHA256 7d1df8dc8c56ebe30a0c1d2f986baed96fb7d6319bf73e84deb438b87473133b SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9 WHIRLPOOL 5a07db691fa332ddc6baf55908aac29455e54fd2694523d12a53c7961e91cbd652d7a66f556235f26d8a7673bbe5ce8da2b180db3cd0cef5b2f3506bb783df16
--- a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
@ -1,23 +0,0 @@
 diff -Naur libcdio-1.0.0.orig/src/cdda-player.c libcdio-1.0.0/src/cdda-player.c
 --- libcdio-1.0.0.orig/src/cdda-player.c	2017-11-22 02:39:49.000000000 +0100
 +++ libcdio-1.0.0/src/cdda-player.c	2017-11-24 16:16:39.652704315 +0100
@@ -531,8 +531,8 @@
 get_cddb_disc_info(CdIo_t *p_cdio)
 {
 #ifdef HAVE_CDDB
 -  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
 -                   i_tracks, &i_cddb_matches);
 +  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
 +                   i_tracks_global, &i_cddb_matches);
   if (b_db) {
     int i_year;
     i_year = atoi(year);
@@ -831,7 +831,7 @@
 {
 #ifdef HAVE_CDDB
   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
 -                                        i_track - i_first_track);
 +                                        i_track - i_first_track_global);
   if (t) {
     cddb_track_set_title(t, title);
     cddb_track_set_artist(t, artist);
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@ -1,16 +0,0 @@
 --- libcdio-1.0.0/configure.ac
 +++ libcdio-1.0.0/configure.ac
@@ -32,7 +32,12 @@
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
          [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 -LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
 +# Broken by design. See also
 +# https://savannah.gnu.org/bugs/?52491
 +# and
 +# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
 +#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
 +LIBCDIO_VERSION_NUM=10000
 AC_SUBST(LIBCDIO_VERSION_NUM)
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@ -1,75 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools libtool ltprune multilib-minimal
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/17" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RDEPEND="
 	!minimal? (
 		>=sys-libs/ncurses-5.7-r7:0=
 		cddb? ( >=media-libs/libcddb-1.3.2 )
 	)
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cdio/cdio_config.h
 	/usr/include/cdio/version.h
 )
 PATCHES=( "${FILESDIR}/${P}-version.patch"
 	  "${FILESDIR}/${P}-cddb.patch"
 	)
 src_prepare() {
 	default
 	eautoreconf
 	sed \
 		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
 		-i configure || die
 	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
 }
 multilib_src_configure() {
 	local util_switch
 	if ! multilib_is_native_abi || use minimal ; then
 		util_switch="--without"
 	else
 		util_switch="--with"
 	fi
 	# Tests fail if ECONF_SOURCE is not relative
 	ECONF_SOURCE="../${P}" econf \
 		--disable-maintainer-mode \
 		$(use_enable cxx) \
 		--disable-cpp-progs \
 		--disable-example-progs \
 		$(use_enable static-libs static) \
 		$(use_enable cddb) \
 		--disable-vcd-info \
 		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
 }
 multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files
 }
--- a/dev-libs/libcdio/metadata.xml
+++ b/dev-libs/libcdio/metadata.xml
@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>sound@gentoo.org</email>
    <name>Gentoo Sound project</name>
  </maintainer>
  <use>
    <flag name="minimal">
    Only build the libcdio library and little more, just to be used to
    link against from multimedia players. With this USE flag enabled,
    none of the command-line utilities are built, nor is the CDDA library.
  </flag>
  </use>
 </pkgmetadata>
--- a/dev-libs/libconcord/ChangeLog
+++ b/dev-libs/libconcord/ChangeLog
@ -1,9 +0,0 @@
 # ChangeLog for dev-libs/libconcord
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 *libconcord-0.24 (30 Oct 2012)
  30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de> +libconcord-0.24.ebuild,
  +metadata.xml:
  initial ebuild
--- a/dev-libs/libconcord/Manifest
+++ b/dev-libs/libconcord/Manifest
@ -1,4 +1,3 @@
-DIST concordance-0.24.tar.bz2 1082955 SHA256 e2bea0430e936fd9e3e6a853b6533edbfd9211cf328c5334789b432035f03656 SHA512 d49af8fed94199dd183085dc013ad35801dd98283ee7e6c46e07a1fbea50d078201f51ab32cb92c3a8bf3d9099b3b6ae3d9aba05211570e76227c995e724323a WHIRLPOOL 282770806c300ed9510dea01c0baad1829492cc4ddf672de6dd34cf0b99c6ea69fc0e278ea63f5762687a0146bc9d384956e4607286edb96c18613630fdb54e6
+DIST libconcord-1.4.tar.gz 122724 BLAKE2B c4fb2ef81956a252509a3acfe41d3d48416a2fb09384c1481d67ed3f63b140731222cdd71c7ce15681e8f82ab253efabf0b465fb440d45a74ad0e153665ac8f6 SHA512 bf4645791f35e9328a72b56c2cf20be30980e9f70379be0e24494b0f86e14869ff86d789f0e90341f5ab0abc6e747f91d3bc0ec20f730c33473fc54c39cf543b
-EBUILD libconcord-0.24.ebuild 769 SHA256 af46fcac93251f00b8c7cf93c1bade8354254221ee1a7462a72d1a835b3a733e SHA512 38f4e79a199650adf276c2cac9b0802457dba7d335ee17bcd861344baf8b4b6c7fc191b3cc6826c2e01e115c75b60ca6f92ccfc28d673d8a829b4420273360b4 WHIRLPOOL 0391110aabe0886553bd628516f98420e60aff21f630aa74c1e0ac0af8e3c10737e30dd4c9fc93a446238097120d9ea19c43206e294faacaa5a61700e14c50b2
+EBUILD libconcord-1.4.ebuild 1946 BLAKE2B c5e246392b0b04f04b043f4ad55be2465a73d6995e583f89cbe6aec9e93c32d48100f878f8d069e99ca8835bd5ab7512429aba4d948a9bc583dbc23f402f19df SHA512 a53fabce5a9c5d2386ae46b9fe0fb11fb4b0de11c8a397c11e51d8a13ce6cf65f1e5b391b1394d316ae6032848334e3b0a11f0704a2a459a249c2cf103ec23cc
-MISC ChangeLog 263 SHA256 e47c95b786d22c8108d84576723f2c061f2e037333efc77e412a900f51e8539a SHA512 0f256c69985a8e417000aa5bfa8f1ab204d629cd0448142f76249ee1af7420b90f503fad52d8d2e3a099193901bc749007c69c21192f78d39cbcfb9d621276d4 WHIRLPOOL 4dfa81af9fecca1cad51fcdf9f5b7c815524e623bb6aa5991d9022b982a4e594fdd96c579070c97ed9ea8f82b0f5166ce2f222036f487015d81ad510b774f975
+MISC metadata.xml 270 BLAKE2B a2fd019fbbbf3a66f2811f37c069b931997535afe955daf6c9040195fb9ee0af3250fd07344c0f5dfec502ab314d5e7a34b15589211083b990ebb533c7168719 SHA512 d8e48d8e3c8bb53761f9ecc45bdcbc6fa0e5eb93052d454c94b4efb6f24efff37406a94e142931b423fb7b907324ecf69d8ef30e108a341eef7552427a16bd8d
 MISC metadata.xml 229 SHA256 1dc92f5b2030f244164224424f100de3bd51b83de33eca93b2df2e30a23db61c SHA512 20398591940a347d6f2fd6b202833c9ff6482f05c760ee8001bc82127901b5800f00d11ccb3902a92b4c1bdd2c47f6e0c118654d0146312443369ec84f676907 WHIRLPOOL 35415755173534553f652b588970e2c0e8a8e9b0f90a94b72a8a67ab17c87138036bf0132b651d4c261dc69819029700163f5e549dd166c4ae60726f1088d685
--- a/dev-libs/libconcord/libconcord-0.24.ebuild
+++ b/dev-libs/libconcord/libconcord-0.24.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=4
 inherit eutils toolchain-funcs
 MY_P="concordance-${PV}"
 DESCRIPTION="Library for programming the Logitech Harmony universal remote; part
 of the concordance project"
 HOMEPAGE="http://www.phildev.net/concordance/"
 SRC_URI="mirror://sourceforge/concordance/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 RDEPEND=">=dev-libs/libusb-0.1.12-r1"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}/${PN}"
 src_compile() {
 	emake DESTDIR="${D}" || die "make failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc ../Changelog ../LICENSE README
 	cd "${S}"/bindings/python
 	python setup.py install --root=${D}
 }
--- a/dev-libs/libconcord/libconcord-1.4.ebuild
+++ b/dev-libs/libconcord/libconcord-1.4.ebuild
@ -0,0 +1,101 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools xdg-utils perl-module distutils-r1
 DESCRIPTION="Library for programming the Logitech Harmony universal remote"
 HOMEPAGE="https://www.phildev.net/concordance"
 SRC_URI="https://github.com/jaymzh/concordance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="perl python static-libs"
 DEPEND="perl? ( >=dev-lang/swig-2:= )
 	python? ( ${PYTHON_DEPS} )"
 RDEPEND="dev-libs/hidapi
 	dev-libs/libzip"
 S="${WORKDIR}/concordance-${PV}/${PN}"
 src_prepare() {
 	default
 	eautoreconf
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Prepare perl bindings in ${PWD}"
 		perl-module_src_prepare
 		swig -perl5 concord.i
 		cd "${S}"
 	fi
 	if use python ; then
 		cd "${S}/bindings/python"
 		einfo "Prepare python bindings in ${PWD}"
 		distutils-r1_src_prepare
 		cd "${S}"
 	fi
 }
 src_configure() {
 	econf \
 		--disable-mime-update \
 		$(use_enable static-libs static)
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Configure perl bindings in ${PWD}"
 		perl-module_src_configure
 		cd "${S}"
 	fi
 }
 src_compile() {
 	default
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Compile perl bindings in ${PWD}"
 		mymake=( OPTIMIZE="${CFLAGS} -I${S}" )
 		perl-module_src_compile
 		cd "${S}"
 	fi
 	if use python ; then
 		cd "${S}/bindings/python"
 		einfo "Prepare python bindings in ${PWD}"
 		distutils-r1_src_compile
 		cd "${S}"
 	fi
 }
 src_install() {
 	emake install DESTDIR="${ED}"
 	dodoc README
 	dodoc ../Changelog ../TODO
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Install perl bindings in ${PWD}"
 		perl-module_src_install
 		cd "${S}"
 	fi
 	if use python ; then
 		cd "${S}/bindings/python"
 		einfo "Install python bindings in ${PWD}"
 		distutils-r1_src_install
 		cd "${S}"
 	fi
 }
 pkg_postinst() {
 	xdg_mimeinfo_database_update
 }
--- a/dev-libs/libconcord/metadata.xml
+++ b/dev-libs/libconcord/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+    <maintainer type="person">
-<email>gentoo@tk-webart.de</email>
+        <email>bertrand@jacquin.bzh</email>
-<name>Torsten Kurbad</name>
+        <name>Bertrand Jacquin</name>
    </maintainer>
 </pkgmetadata>
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@ -1,3 +0,0 @@
 DIST libserialport-0.1.1.tar.gz 405251 SHA256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85 WHIRLPOOL 1dd4db30de12edf9c604fa3e70b0d643f940acf75d029e0ce92727e83b566cba1fca062e25ca379398b8351391e4b99b6942d35829883ba1faea2372c5be98ad
 EBUILD libserialport-0.1.1.ebuild 704 SHA256 6094a0a7ee314b82cd3ea045dd366c4c2fc8afe7f230e2400591ee70656d5a17 SHA512 26b2ca273355733d64eb6a23bdb754d3432fb37160b57674054bcfbf00970f17942d6a3adfae1dcd34b194c77af4420fabbd9909eb9c6bf6af87cc995b01f88c WHIRLPOOL cb74d6d21d8b4e32ca95b67c8126b38f8efb5807899cc17fa733068d045dfdc3c131182aaac38b7b31a7119ba727c103e831b71ab4feb83e969b252f46fbd6dd
 MISC metadata.xml 247 SHA256 751aa1f012df292bed9716a5c6a7e64114b695d2ba0c0572fc7e87fc3bbcebc5 SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e WHIRLPOOL b6c074cf39f6ec1e2d085151836db47f9a4d71bcc9cc3296889bfa10172c7f07837ca79c8613f9c483b1332683e78eebe88e0a433a7caf801fc7ccac2552cd53
--- a/dev-libs/libserialport/libserialport-0.1.1.ebuild
+++ b/dev-libs/libserialport/libserialport-0.1.1.ebuild
@ -1,40 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=4
 inherit eutils
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
 	SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 DESCRIPTION="Cross platform serial port access library"
 HOMEPAGE="http://sigrok.org/wiki/Libserialport"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="static-libs"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_enable static-libs static)
 }
 src_install() {
 	default
 	prune_libtool_files
 }
--- a/dev-libs/libserialport/metadata.xml
+++ b/dev-libs/libserialport/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>embedded@gentoo.org</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
 </pkgmetadata>
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@ -1,4 +1,4 @@
 AUX pigpio-44-MakeRemote.patch 813 BLAKE2B 65730fabed5016f9c93193417e90683292171ab7b6cac46bd9eeb4ef550115bfd8de3f549d4aa06e09cf942eb887ddda59901806e914b2ed3d6523c353d7b2e7 SHA512 fcc6c3a27f889b688928c3c65683c91b449eff3de692fed33f1465f97ff7c30844a5927dfef96225034831a4a3512f245292ce1efe5fac6c3f7f2472a7987cd8
 AUX pigpio-9999-Makefile.patch 1962 BLAKE2B 73833ae5cfaeeaed28bf62073b11f6c0b88d1487f02c1010b9459926aaa911bd785a4517738f2441afebc22331469c7878460bf27b3ea5b900b8a4ecbba98dd6 SHA512 a181163ca0848766f1eee96cc3408d0f227f0281f8f1efb0d7530dbed2b5b42b94ce76e3b9bcfccb2c85e6c3bfc6f2048403a9ccaee45a0653ef52608a1234f3
-EBUILD pigpio-9999.ebuild 1554 BLAKE2B 61fb24b6716fed03d1afb97f3d27c2340c22e3116da92bf70b187d3a15393fdbe686ca93f38e825cef74018f24d75f2c9200a63fb4de4f7f78e47b8707e22b04 SHA512 aba376d38f2f54fe50a1fa2b3bd4cab00e3001a6a9ce9aa3c5540f8eb412c91c2cf3c48889e96c1e2e2a576357558deb9d7001ca395ea6b8207e80cc11791941
+EBUILD pigpio-9999.ebuild 1548 BLAKE2B 57596aefe9298fabb3622df1ac85d3baeea45e036f877234a0b7f5c4414460f0025d6c74133043a644ad954b15a761964515b9097d6720c91a2547222bb3f6c6 SHA512 c1a62443acc90cda2f0014a67aaebef325d8205d83e12482d6fdc49b428821c16984e74fe7d55619aca526c9c1b1952c6bcd47a195c5fe8b46ed384eaf6fd336
 MISC metadata.xml 297 BLAKE2B b97ca67fe97dad72b5e8a79755f3888c8c48bd22a0766607b4b09859dcae7cebedcb33e02c5231025ac8e45506c195750e6eb8cfbbb5908ed94979c1ef194b4f SHA512 9284ce2486abe9a813147f1fc1d395fffd5f20f652281077ff39c823eb10a317fe5dd14413e39f3a6d25b8814535482105fcba8ba6af0988a2141e403d3b3d8b
--- a/dev-libs/pigpio/pigpio-9999.ebuild
+++ b/dev-libs/pigpio/pigpio-9999.ebuild
@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_SETUPTOOLS=no
 inherit eutils git-r3 toolchain-funcs distutils-r1
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@ -1,3 +0,0 @@
 DIST CherryPy-10.2.2.tar.gz 688612 BLAKE2B 15b2ce0593693556645111fc0d21afbe6cefc16dce6597d5092430028127c30bee9dee1e091e86e101d8f53a1698fda9f44af8703447acbed6b0bee2ef2532eb SHA512 d82ca6b345ece6cc0d53419a18ad8973491fc0b31131d305927637ee23119816d2c6287b7d66709eb4581b73cbeaf5d82f9b6facab9a6d477fac8b7c79d748b3
 EBUILD cherrypy-10.2.2.ebuild 1306 BLAKE2B 068c078c582b4df641e85af4a64eee3cb4c702901efb3da1d45f501f63bfed7a2029b59673367f60f20ca916e6b11afc722ab6fd3cb4db275bc7e4b430879d6f SHA512 c07dcd3ccad91c8b4b224a3df7be0cba60e694ad46c052115224ffa2da0776901c7f66e2fd4c55bef29a824a76d8f6e58701683a384c4cc560055b6ffb1f97fe
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
--- a/dev-python/cherrypy/cherrypy-10.2.2.ebuild
+++ b/dev-python/cherrypy/cherrypy-10.2.2.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
 inherit distutils-r1
 MY_P="CherryPy-${PV}"
 DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
 HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
 SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 RDEPEND=">=dev-python/cheroot-5.5.0[${PYTHON_USEDEP}]
 	>=dev-python/portend-1.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
 		dev-python/path-py[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-cov[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/${MY_P}"
 python_prepare_all() {
 	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
 	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
 		-i cherrypy/test/test_static.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	py.test -v || die "tests failed under ${EPTYHON}"
 }
--- a/dev-python/cherrypy/metadata.xml
+++ b/dev-python/cherrypy/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>python@gentoo.org</email>
    <name>Python</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">CherryPy</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/euclid3/Manifest
+++ b/dev-python/euclid3/Manifest
@ -1,2 +1,2 @@
 DIST euclid3-0.01.tar.gz 13201 BLAKE2B ffa8d368f58cae91969230eaf4fa5324cda2c45ff69c98d73b1fdfbdb67e38846090fac4cdd128439583a7f36190c2d474c7f647823ac79440218bf02a73070f SHA512 c4e5e2770ab4ede08904fc3b76e50d6812944ed226c9db52f2da8d100370e20ea6031ca554ae44d72d53e96727d163bd3cc8da7bf175539de10749da77877b0b
-EBUILD euclid3-0.01.ebuild 452 BLAKE2B 35cee20ec1ac40e405ef3a1695d0cd1c2f007e950d1c860573dfd2af3ff66aa8a1635e9fdbc129125e5c0c1e005ac9c90664e4990e7cef76c5cfb9c6b815ec15 SHA512 b78c9c311b0b70cb7d678e8b06b4ed2926b390165c4b4e6a383aa5ed87d1985a992a7f7b787257cfc932543a926d4bf5508ceb6669c688199f03c08556826851
+EBUILD euclid3-0.01.ebuild 446 BLAKE2B 63f940400d181acaaea3956be22602d1254a70b8eb50a6c1cec187d4970521340f475ad6bf940d7452f105ae85f9deec6dad7eb247e863765e2b2a39fc530cd0 SHA512 2d570962118a8a4ff458442714e31e0d040bc852201cb7f614ee311a1651b4ab2859117b3364d4821995b40247b4336a10dfe0390fb8ebc5c91c0f96ed89efb3
--- a/dev-python/euclid3/euclid3-0.01.ebuild
+++ b/dev-python/euclid3/euclid3-0.01.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@ -1,2 +0,0 @@
 DIST flask-compress-1.4.0.tar.gz 6043 BLAKE2B f4b999736692b74962d0584ca37d624395f8e7a490f2bdcf7a5f1c6b4487af354ab945be882d9b81c757f59e983d924665555b2ac5f0ca0bb9160aac652cfebe SHA512 f86efc13f574335ca530f091252f9ae248f66e3251a3dbcfb5888602b00e1e05d10335f88541fe4f9ab7f537fbf7bc390468a57cefe2d3a7f63a69f2cf0619db
 EBUILD flask-compress-1.4.0.ebuild 614 BLAKE2B 18916fc06ba9b009511005680c5c07641f90e5cd5ad70898998d82c5ed431ce2ec3e27b349918766b9869cf1cb0fca9b1fb333e674615cebc037b6dc2682102c SHA512 6d2b183462c755c8ee117e861c051a570f54f8aaf7e0e33da64be0daac9ad08ee973cb708d510d0a66b720327283063e6a5441738546cb05d4f80120daa36138
--- a/dev-python/flask-compress/flask-compress-1.4.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.4.0.ebuild
@ -1,25 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7} pypy3 )
 MY_PN="Flask-Compress"
 MY_P="${MY_PN}-${PV}"
 inherit distutils-r1
 DESCRIPTION="Flask-Compress allows you to easily compress your Flask application's responses with gzip."
 HOMEPAGE="https://github.com/libwilliam/flask-compress"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
--- a/dev-python/flask-restplus/flask-restplus-0.10.1.ebuild
+++ b/dev-python/flask-restplus/flask-restplus-0.10.1.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy{,3} )
 inherit distutils-r1
 DESCRIPTION="Fully featured framework for fast, easy and documented API development with Flask"
 HOMEPAGE="http://flask-restplus.readthedocs.org/ https://github.com/noirbizarre/flask-restplus/"
 SRC_URI="https://github.com/noirbizarre/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RDEPEND="
 	>=dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	>=dev-python/flask-restful-0.3.3[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/rednose[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
 		dev-python/tzlocal[${PYTHON_USEDEP}]
 	)
 "
 src_prepare() {
 	use test || rm -rf "${S}"/tests
 	distutils-r1_src_prepare
 }
 python_test() {
 	nosetests -v || die "Tests fail with ${EPYTHON}"
 	rm -rf "${BUILD_DIR}"/../tests/ || die
 }
--- a/dev-python/flask-restplus/flask-restplus-0.8.6.ebuild
+++ b/dev-python/flask-restplus/flask-restplus-0.8.6.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 DESCRIPTION="Fully featured framework for fast, easy and documented API development with Flask"
 HOMEPAGE="http://flask-restplus.readthedocs.org/ https://github.com/noirbizarre/flask-restplus/"
 SRC_URI="https://github.com/noirbizarre/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RDEPEND="
 	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
 	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	>=dev-python/flask-restful-0.3.3[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/rednose[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
 		dev-python/tzlocal[${PYTHON_USEDEP}]
 	)
 "
 src_prepare() {
 	use test || rm -rf "${S}"/tests
 	distutils-r1_src_prepare
 }
 python_test() {
 	nosetests -v || die "Tests fail with ${EPYTHON}"
 	rm -rf "${BUILD_DIR}"/../tests/ || die
 }
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@ -1,5 +0,0 @@
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
 DIST jinja-2.9.6.tar.gz 487185 BLAKE2B 32f11030cec4fc085c6b866e0409a7b04f008720fc13e619f168e5fb5b4eee340beea7761c42940fcbe24a032548866ddf7938d7c06a6e38e6e898bc334af94c SHA512 934e253d9d621fd6d19302ea5e73b571a806c0e31e10ac29b54700ad6649fabf321b00cdc513bb3fb551ee28e83de7f163ce9ef88d232a6c178f4ee5dc2e69b5
 EBUILD jinja-2.9.5.ebuild 1744 BLAKE2B 7d98a97560b49d203f68ba10483b44d28a8c689acf51cdb917ad191f9f9bfe2523ebbe4f976b1ebd2f2a30a1a4651dd520a82a619508e13997c2448f10efc6ce SHA512 81c239488b75f715c995d319299d9d36b84cf2158fdc4fb281a7c6cfcf5ffc452ab16d3da842b2d4aad6860dc78daf803dabf9cafde96603eee0463bc12e04dd
 EBUILD jinja-2.9.6.ebuild 1744 BLAKE2B 7d98a97560b49d203f68ba10483b44d28a8c689acf51cdb917ad191f9f9bfe2523ebbe4f976b1ebd2f2a30a1a4651dd520a82a619508e13997c2448f10efc6ce SHA512 81c239488b75f715c995d319299d9d36b84cf2158fdc4fb281a7c6cfcf5ffc452ab16d3da842b2d4aad6860dc78daf803dabf9cafde96603eee0463bc12e04dd
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@ -1,75 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 inherit eutils distutils-r1
 DESCRIPTION="A full-featured template engine for Python"
 HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 # XXX: handle Babel better?
 wrap_opts() {
 	local mydistutilsargs=()
 	if [[ ${EPYTHON} == python* ]]; then
 		mydistutilargs+=( --with-debugsupport )
 	fi
 	"${@}"
 }
 python_compile() {
 	wrap_opts distutils-r1_python_compile
 	if [[ ${EPYTHON} == python3.2 ]]; then
 		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
 	fi
 }
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	py.test || die
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples ; then
 		docinto examples
 		dodoc -r examples/.
 	fi
 	distutils-r1_python_install_all
 	insinto /usr/share/vim/vimfiles/syntax
 	doins ext/Vim/*
 }
 pkg_postinst() {
 	if ! has_version dev-python/Babel; then
 		elog "For i18n support, please emerge dev-python/Babel."
 	fi
 }
--- a/dev-python/jinja/jinja-2.9.6.ebuild
+++ b/dev-python/jinja/jinja-2.9.6.ebuild
@ -1,75 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 inherit eutils distutils-r1
 DESCRIPTION="A full-featured template engine for Python"
 HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 # XXX: handle Babel better?
 wrap_opts() {
 	local mydistutilsargs=()
 	if [[ ${EPYTHON} == python* ]]; then
 		mydistutilargs+=( --with-debugsupport )
 	fi
 	"${@}"
 }
 python_compile() {
 	wrap_opts distutils-r1_python_compile
 	if [[ ${EPYTHON} == python3.2 ]]; then
 		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
 	fi
 }
 python_compile_all() {
 	use doc && emake -C docs html
 }
 python_test() {
 	py.test || die
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples ; then
 		docinto examples
 		dodoc -r examples/.
 	fi
 	distutils-r1_python_install_all
 	insinto /usr/share/vim/vimfiles/syntax
 	doins ext/Vim/*
 }
 pkg_postinst() {
 	if ! has_version dev-python/Babel; then
 		elog "For i18n support, please emerge dev-python/Babel."
 	fi
 }
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@ -1,12 +0,0 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>python@gentoo.org</email>
    <name>Python</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">Jinja2</remote-id>
    <remote-id type="github">pallets/jinja</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/kikit/Manifest
+++ b/dev-python/kikit/Manifest
@ -1 +1 @@
-EBUILD kikit-9999.ebuild 1089 BLAKE2B fcc1f3a237eb5ac1c9f4bec1b2308206e3ac1251b5bb48002d9780f6f2a6d6416766465378c22cc6c2a841a7c8c2650f4b6c193b124807bd2f11dd87ff342017 SHA512 49950e8b21f554b8ec571bfdcf7eac6dc707220c9c11d819ffe507e2afe334788a974586631c6467d875f7f37eff0f641847f03b33c4d9c6fb1b62a10bddda17
+EBUILD kikit-9999.ebuild 1083 BLAKE2B 8195e47d5fb1ffeac2775eaa43e415be36a2de71e3c36564397316903c3710d26f9247a31fa862091d534e54d5d29310b4521f9f73608c0d3cd9f9fe3eeb3764 SHA512 593d03c9f7ab62afd602d982c6382e0da59cfd9348851010374bdff41f855afdc0dff931b1c28e02cb822386b8f99b0a130acd2fcade7aae17465ececff6de8c
--- a/dev-python/kikit/kikit-9999.ebuild
+++ b/dev-python/kikit/kikit-9999.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 MY_PN="KiKit"
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@ -1,3 +0,0 @@
 DIST path.py-10.3.1.tar.gz 35871 SHA256 412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0 SHA512 e8dc874521aee6cadc5e3d7a66ca6909010f2069b1e6ed0298a3dbd86466c971ca466b442bff90906cb891fa9f13190fd9b3bf4ae62442e9fe73909169c32c02 WHIRLPOOL 577d527259543e09b0bc2287719c09b228dd0d681600ed04544c135461b2a116ba0f5f858ee0741d81a14e92226b859fc0f13f13ba9c5af16d3c3d3fc819b95d
 EBUILD path-py-10.3.1.ebuild 1045 SHA256 63ec6109ba0093835c79eed48cd8de02e789f069e8164207806d38af36902470 SHA512 178ebec8f66ec10b4fabadc23b7a7d07acc06bb79b0b9150ba8fac6779c009f7525c2a123aa831d8fabb54255c7073fa920c1ef2581c6760d69abf82fa275a9a WHIRLPOOL cdb633947092277fb369d410d3ba8085781f2c448a25fd51f6122a0c6ce2d9ffceb8bd9291cf0e0c77ca13b0a948ba7d926b30d4f4169ee596fdc706c913fb8f
 MISC metadata.xml 376 SHA256 fcc00f70918f4440a78110995e08277224425d8ce999a6d6fb1906b3c4df23f5 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd WHIRLPOOL ccfbc2921a9facbc2fcc5104b6e31af7f67d1b3c1cd24f462297d1224a6c4497a9c8c0e17dd46fbf02717d1fd2cadfca7b0ae0fe8af46721b57b533dc1ddf365
--- a/dev-python/path-py/metadata.xml
+++ b/dev-python/path-py/metadata.xml
@ -1,12 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>python@gentoo.org</email>
    <name>Python</name>
  </maintainer>
  <upstream>
    <remote-id type="pypi">path.py</remote-id>
    <remote-id type="github">jaraco/path.py</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ b/dev-python/path-py/path-py-10.3.1.ebuild
@ -1,42 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 MY_P="path.py-${PV}"
 DESCRIPTION="A module wrapper for os.path"
 HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
 SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/appdirs[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/${MY_P}"
 python_prepare_all() {
 	sed '/setuptools_scm/d' -i setup.py || die
 	sed -i -e "/name=/a\    version='${PV}'," setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	# https://github.com/jaraco/path.py/issues/122
 	unset XDG_CONFIG_HOME
 	esetup.py test
 }
--- a/dev-python/pybars3/Manifest
+++ b/dev-python/pybars3/Manifest
@ -1,2 +1,2 @@
 DIST pybars3-0.9.7.tar.gz 29203 BLAKE2B 7255a9bf7c2d0e56d90bef95a007a0d6ae9d4bc25dbdfef0a76d7dc3927da01d2ec7e4f597f53e62fd1c540e72718778cb0a5882b20e054b2fbfa9dfc927c82c SHA512 7aff86c0703e3827909f3603d7f35026ee39ce74d9c5ff1beb18a71b0a839c3aa407402f8d9c1aca9eb69af33750db0477881826e72135fc26a7274b0f1f538b
-EBUILD pybars3-0.9.7.ebuild 499 BLAKE2B a5da6501aefbe9240a46bcecab590e90255929ce6cf8e91b0cf4900b53011fbc253ef35b100f59f62697564c3c8dbf2e962a0969e34caf21e929b8f1c5d763a8 SHA512 18f67a569587543b28cee91fb179f3a09abd05b83a1dfc74e6f9a374eabd5049f2459d6dfee04bd19569e0504fdd849bbb54fc3e8bef69f77a52b72b44c3cae0
+EBUILD pybars3-0.9.7.ebuild 491 BLAKE2B 908712e0a37eb65a2ed298a6b5e753430dafbdd92ba1c3b8fca9525e40f8d6114be18d73562707c3d43ec85e135582cd68d07a3cae6b29e4adc5515e39a6e122 SHA512 8b4132087eca67ab9cd36b88be96b33d47c2ac44a33b14ea2002c44be4f927953e364080cae2141978d3f285add155648a0229a52ca2fcb2e82472cdde3ce02c
--- a/dev-python/pybars3/pybars3-0.9.7.ebuild
+++ b/dev-python/pybars3/pybars3-0.9.7.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
--- a/dev-python/pymeta3/Manifest
+++ b/dev-python/pymeta3/Manifest
@ -1,2 +1,2 @@
 DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575
-EBUILD pymeta3-0.5.1.ebuild 547 BLAKE2B bf2fd91c2f4683c538007a50b039f144baf149ab683cefd32b145122e5aa90732395103c2181b0451c0767cca6874ea362d941d9fe0eae8636c4be367ed463f2 SHA512 f2635bc56d3cac2487d727246957b659b885bd3c5320346937c918c5532a46fb179da0f153405191e38df7097d8227c863047b7e1923fff26355296207d07ef3
+EBUILD pymeta3-0.5.1.ebuild 539 BLAKE2B 8aa9c167b46b25f3ddc2c76a770d549a60a382415cb200b62fed6f4e35891ab351362c2bc17fdb4b3624aac5c6041fb72cfa014ab7fbe9032be9b46d85f4b870 SHA512 e6a8d4c4491c6d614e9a68675b31148cc37bde71b2b736fa821cc5d4ef97311d0e4d817bb1c01fe5156a91afef2b9491553e4d29f22d5fe4b795bcf1a4575a02
--- a/dev-python/pymeta3/pymeta3-0.5.1.ebuild
+++ b/dev-python/pymeta3/pymeta3-0.5.1.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 MY_PN="PyMeta3"
--- a/dev-python/pynzb/pynzb-0.1.0-r2.ebuild
+++ b/dev-python/pynzb/pynzb-0.1.0-r2.ebuild
@ -1,19 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy )
 inherit distutils-r1
 DESCRIPTION="Unified API for parsing NZB files"
 HOMEPAGE="https://pypi.python.org/pypi/pynzb/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
--- a/dev-python/pyside-tools/Manifest
+++ b/dev-python/pyside-tools/Manifest
@ -1,2 +0,0 @@
 EBUILD pyside-tools-9999.ebuild 2904 SHA256 7cfa74c5e9514dbdbf3149fb29fc9469ad1b5956a8711d284ad69d12fea45a96 SHA512 6e7ebd4d823f1d7fee62eaf57209ffbb0ffa44d344dd29720c55947b38a7b0999569c8a18392cb8124d93e7f8f1b2046b776fe62a0da6c1332f4bcfcd5c4d886 WHIRLPOOL 1b60120c01eb7a8e4593fb067fe19968b1cc9db46086ceb7e30315abd989e6041eb4b8ab23ef63cfd7999eea48d9f4e94373f1f28b50cb7f0dbe4e7491dac7e3
 MISC metadata.xml 247 SHA256 690d3e08cdd71b405f5361dfa3f33007ce9ec9d0ae7628e9271891da9e2bda92 SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2 WHIRLPOOL dffc398d6bdbe8a8afc8863675a819a7bd69ae4d098ffbddad4c21ab8f1a850ab8ede71f98e34999b0605ad01ea93c8864cd681b50d3e153aa3d0901ddb10743
--- a/dev-python/pyside-tools/metadata.xml
+++ b/dev-python/pyside-tools/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-python/pyside-tools/pyside-tools-9999.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-9999.ebuild
@ -1,110 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 CMAKE_IN_SOURCE_BUILD="1"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit cmake-utils python-r1 virtualx git-r3
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
 HOMEPAGE="https://wiki.qt.io/PySide2"
 EGIT_REPO_URI="https://code.qt.io/pyside/pyside-tools.git"
 EGIT_BRANCH="5.9"
 # Although "LICENSE-uic" suggests the "pyside2uic" directory to be dual-licensed
 # under the BSD 3-clause and GPL v2 licenses, this appears to be an oversight;
 # all files in this (and every) directory are licensed only under the GPL v2.
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS=""
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # The "pyside2uic" package imports both the "PySide2.QtGui" and
 # "PySide2.QtWidgets" C extensions and hence requires "gui" and "widgets".
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/pyside-${PV}:${SLOT}[gui,widgets,${PYTHON_USEDEP}]
 	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 "
 DEPEND="${RDEPEND}
 	test? ( virtual/pkgconfig )
 "
 src_prepare() {
 	cmake-utils_src_prepare
 	python_copy_sources
 	preparation() {
 		pushd "${BUILD_DIR}" >/dev/null || die
 		if python_is_python3; then
 			# Remove Python 2-specific paths.
 			rm -rf pyside2uic/port_v2 || die
 			# Generate proper Python 3 test interfaces with the "-py3" option.
 			sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
 				tests/rcc/CMakeLists.txt || die
 		else
 			# Remove Python 3-specific paths.
 			rm -rf pyside2uic/port_v3 || die
 		fi
 		# Force testing against the current Python version.
 		sed -i -e "/pkg-config/ s:shiboken2:&-${EPYTHON}:" \
 			tests/rcc/run_test.sh || die
 		popd >/dev/null || die
 	}
 	python_foreach_impl preparation
 }
 src_configure() {
 	configuration() {
 		local mycmakeargs=(
 			-DBUILD_TESTS=$(usex test)
 		)
 		# Find the previously installed "Shiboken2Config.*.cmake" and
 		# "PySide2Config.*.cmake" files specific to this Python version.
 		if python_is_python3; then
 			# Extension tag unique to the current Python 3.x version (e.g.,
 			# ".cpython-34m" for CPython 3.4).
 			local EXTENSION_TAG="$("$(python_get_PYTHON_CONFIG)" --extension-suffix)"
 			EXTENSION_TAG="${EXTENSION_TAG%.so}"
 			mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="${EXTENSION_TAG}" )
 		else
 			mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX="-python2.7" )
 		fi
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure
 	}
 	python_foreach_impl configuration
 }
 src_compile() {
 	compilation() {
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_compile
 	}
 	python_foreach_impl compilation
 }
 src_test() {
 	testing() {
 		local -x PYTHONDONTWRITEBYTECODE
 		CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake-utils_src_test
 	}
 	python_foreach_impl testing
 }
 src_install() {
 	installation() {
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_install
 	}
 	python_foreach_impl installation
 }
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@ -1,3 +0,0 @@
 AUX rpath.cmake 393 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f WHIRLPOOL 79dbd32a58b6bf8a408f8fef3dd918c1946c89c32731b515984cb0ed8230c63cd724150db636523484d525c2ebad1f78217c7ccb6a294221aa8d2ca8dcce6a1d
 EBUILD pyside-9999.ebuild 5334 SHA256 12caf866c4644c39c1024dd2293d4a8c22c51897fb9193c01e6fcb796357c05d SHA512 6f59077dbf291ef7cb1dae0ac6bb334ee49df59149c2f31ed1981a9a7e5dc9e9745dafb8445eedf50d00b7ff9f9afe5f939b28e1484194055dc27f3dea58c5fc WHIRLPOOL 6cce0ad6ad5e89732f11b90bf3567383ca1827a2924825b66020527615513d4b1fe966b52f2cd1c9f1d438e8c6fa969c55115f4d98f44c821093827a0e2d3cf1
 MISC metadata.xml 1625 SHA256 5086ff64f05e6079c9e73bbe2a880deafe25f8eab5b9e67363e5f5aa97bcd727 SHA512 4ebab1fd1948a764a2afa8eba682a627b6df3165d37bfa814c024486c97d4d7286f21fce1ac4f446d439acf9df65e1f010e86153c6afe23cd642bffadd480270 WHIRLPOOL b8cba8c976891a8163097076065eb3b9781e6351572e3267ba8455369deb713231688e07879dc9fd4e23d3e027b29c3bfc48fdc598f76d1d0620fdfb1bcc73ce
--- a/dev-python/pyside/files/rpath.cmake
+++ b/dev-python/pyside/files/rpath.cmake
@ -1,10 +0,0 @@
 # use, i.e. don't skip the full RPATH for the build tree
 SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 # when building, don't use the install RPATH already
 # (but later on when installing)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 # add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@ -1,33 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
 		<flag name="charts">Build QtCharts module</flag>
 		<flag name="concurrent">Build QtConcurrent module</flag>
 		<flag name="datavis">Build QtDataVisualization module</flag>
 		<flag name="declarative">Build QtQml, QtQuick, and QtQuickWidgets modules</flag>
 		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
 		<flag name="gui">Build QtGui module</flag>
 		<flag name="help">Build QtHelp module</flag>
 		<flag name="multimedia">Build QtMultimedia and QtMultimediaWidgets modules</flag>
 		<flag name="network">Build QtNetwork module</flag>
 		<flag name="opengl">Build QtOpenGL module</flag>
 		<flag name="printsupport">Build QtPrintSupport module</flag>
 		<flag name="script">Build QtScript module</flag>
 		<flag name="scripttools">Build QtScriptTools module</flag>
 		<flag name="sql">Build QtSql module</flag>
 		<flag name="svg">Build QtSvg module</flag>
 		<flag name="testlib">Build QtTest module</flag>
 		<flag name="webchannel">Build QtWebChannel module</flag>
 		<flag name="webengine">Build QtWebEngine and QtWebEngineWidgets modules</flag>
 		<flag name="webkit">Build QtWebKit and QtWebKitWidgets modules</flag>
 		<flag name="websockets">Build QtWebSockets module</flag>
 		<flag name="widgets">Build QtWidgets module</flag>
 		<flag name="x11extras">Build QtX11Extras module</flag>
 		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
 </pkgmetadata>
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@ -1,155 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit cmake-utils python-r1 virtualx git-r3 toolchain-funcs
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://wiki.qt.io/PySide2"
 EGIT_REPO_URI="https://code.qt.io/pyside/pyside-setup.git"
 EGIT_BRANCH="5.9"
 EGIT_SUBMODULES=()
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="2"
 KEYWORDS=""
 # TODO: speech
 IUSE="charts concurrent datavis declarative designer gui help multimedia
 	network opengl printsupport script scripttools sql svg test testlib
 	webchannel webengine webkit websockets widgets x11extras xmlpatterns"
 # The requirements below were extracted from the output of
 # 'grep "set(.*_deps" "${S}"/PySide2/Qt*/CMakeLists.txt'
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	charts? ( widgets )
 	datavis? ( gui )
 	declarative? ( gui network )
 	designer? ( widgets )
 	help? ( widgets )
 	multimedia? ( gui network )
 	opengl? ( widgets )
 	printsupport? ( widgets )
 	scripttools? ( gui script widgets )
 	sql? ( widgets )
 	svg? ( widgets )
 	testlib? ( widgets )
 	webengine? ( gui network webchannel widgets )
 	webkit? ( gui network printsupport widgets )
 	websockets? ( network )
 	widgets? ( gui )
 	x11extras? ( gui )
 "
 # Minimum version of Qt required, derived from the CMakeLists.txt line:
 #   find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
 QT_PV="5.9*:5"
 DEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
 	=dev-qt/qtcore-${QT_PV}
 	=dev-qt/qtxml-${QT_PV}
 	charts? ( =dev-qt/qtcharts-${QT_PV} )
 	concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
 	datavis? ( =dev-qt/qtdatavis3d-${QT_PV} )
 	declarative? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
 	designer? ( =dev-qt/designer-${QT_PV} )
 	gui? ( =dev-qt/qtgui-${QT_PV} )
 	help? ( =dev-qt/qthelp-${QT_PV} )
 	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets?] )
 	network? ( =dev-qt/qtnetwork-${QT_PV} )
 	opengl? ( =dev-qt/qtopengl-${QT_PV} )
 	printsupport? ( =dev-qt/qtprintsupport-${QT_PV} )
 	script? ( =dev-qt/qtscript-${QT_PV} )
 	sql? ( =dev-qt/qtsql-${QT_PV} )
 	svg? ( =dev-qt/qtsvg-${QT_PV} )
 	testlib? ( =dev-qt/qttest-${QT_PV} )
 	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
 	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets] )
 	webkit? ( =dev-qt/qtwebkit-${QT_PV}[printsupport] )
 	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
 	widgets? ( =dev-qt/qtwidgets-${QT_PV} )
 	x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
 	xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV} )
 "
 RDEPEND="${DEPEND}"
 S=${WORKDIR}/${P}/sources/pyside2
 src_prepare() {
 	if use prefix; then
 		cp "${FILESDIR}"/rpath.cmake . || die
 		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
 	fi
 	cmake-utils_src_prepare
 }
 src_configure() {
 	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5OpenGL=$(usex !opengl)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !declarative)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !declarative)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !declarative yes $(usex !widgets))
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKit=$(usex !webkit)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=$(usex !webkit)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
 	)
 	configuration() {
 		local mycmakeargs=(
 			"${mycmakeargs[@]}"
 			-DPYTHON_EXECUTABLE="${PYTHON}"
 		)
 		cmake-utils_src_configure
 	}
 	python_foreach_impl configuration
 }
 src_compile() {
 	CXXFLAGS="${CXXFLAGS} -I/usr/lib/gcc/"${CTARGET}"/$(gcc-fullversion)/include"
 	echo "CXXFLAGS: ${CXXFLAGS}"
 	python_foreach_impl cmake-utils_src_compile
 }
 src_test() {
 	local -x PYTHONDONTWRITEBYTECODE
 	python_foreach_impl virtx cmake-utils_src_test
 }
 src_install() {
 	installation() {
 		cmake-utils_src_install
 		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}2{,-${EPYTHON}}.pc || die
 	}
 	python_foreach_impl installation
 }
--- a/dev-python/python-sane/Manifest
+++ b/dev-python/python-sane/Manifest
@ -1,2 +0,0 @@
 DIST python-sane-2.8.2.tar.gz 21152 SHA256 0f47e1c34ca94dcbe3136a05f05b342f055e6c129743f7f6e1a6519d6000316b SHA512 073852a94b432f591d908e3759eb34349e875396d6c80989c0ee7cf96dd9c8a858e04e177c216a3bdd49a2846b8bbda75d648ddfe95c377b2023ed564f974e1d WHIRLPOOL 3a55a0a6decbf1a83f90e740f00a7eed9d8a93e274bea0fcf19d754cfe2b09deaa17c8b47bc9c2953dca99896e73917e413bcecfcf034378d31d845227e560d6
 EBUILD python-sane-2.8.2.ebuild 438 SHA256 914cfe578b74eae78926fcef3846c70c168705b4bab6fe16004f92d5e77e1553 SHA512 564063faec7a879f3ad042157ce7e0f2b203f7975e26cb000895f203a34857f83d04787d0975131586913c40f452996da2360c60ee9864ea26d8f774d9cccacf WHIRLPOOL 3135fc63cbae85693d500459f09352baecc71cbf65793e3542d91ec273a052c9b089a275c1936ca78bb593401aa2bab39ef644a9c18f0cfb19b56a4d8d50560e
--- a/dev-python/python-sane/python-sane-2.8.2.ebuild
+++ b/dev-python/python-sane/python-sane-2.8.2.ebuild
@ -1,20 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4} )
 inherit distutils-r1
 DESCRIPTION="Python interface to the SANE scanner and frame grabber"
 HOMEPAGE="https://github.com/python-pillow/Sane"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="PYTHON"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@ -1,3 +0,0 @@
 DIST rebulk-2.0.0.tar.gz 257112 BLAKE2B c68bbca02535a00b816d36e0c90bb80a9ea4f192e128efac701d96443d8ceb58642c0e0d3e3676a1395479c5923dbbdc91b132d99815281bb13dd1f64e8454be SHA512 e42bc73645eaa33ee321d69d5091c0a11e47ade0b2b48ba78b8b682e327f0608bb4345e7be7e51551b672bbfd6de490bc563e12344da30be6900b5860b9047ab
 EBUILD rebulk-2.0.0.ebuild 961 BLAKE2B 47fe57ab7ad15d8a6fa41d3b365c99bd5285f5287c4a9c009f43b92252fcd786910ef5da64cacbb725411901f8c0c426696cde15e282ece0b44b6ea640108b97 SHA512 8df14c92e7d0b7b6bc9fb2290520d71bf5f2cd7b200a9ddf00cb0eddec3c44d42b8c68c3e2c14da4529fa57a4e50327d76d410f51a8e6f8bb9b7db985995182d
 MISC metadata.xml 289 BLAKE2B 0b4705d4e9400951a5a9bbfd79a5f311cf4918e6665f697b8b94fc7daa4bb777457fd919d09f79627ab5cff49fdf473a4535146b0fb7decf33f1afe15b42d32f SHA512 d3d12fbd490d3b76d211a0a47691e7ed085b6bc6235e36ba5ddb6c976793cad1f206d61444d451da66ff16cc4e0bbc2208ce6fcee07fd8b52fe6a01e39417257
--- a/dev-python/rebulk/metadata.xml
+++ b/dev-python/rebulk/metadata.xml
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Toilal/rebulk</remote-id>
 		<remote-id type="pypi">rebulk</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/rebulk/rebulk-2.0.0.ebuild
+++ b/dev-python/rebulk/rebulk-2.0.0.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
 inherit distutils-r1
 DESCRIPTION="Python library that performs advanced searches in strings"
 HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 python_prepare_all() {
 	# Remove base64-encoded zip archive with pytest.
 	rm runtests.py || die
 	# Disable unconditional dependency on dev-python/pytest-runner.
 	sed -i -e "s|'pytest-runner'||g" setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	esetup.py test
 }
--- a/dev-python/solidpython/Manifest
+++ b/dev-python/solidpython/Manifest
@ -1,2 +1,2 @@
 DIST solidpython-1.0.2.tar.gz 67607 BLAKE2B 273bcf188d141d91d83be440e78346aa9b3f955ba8134e6a11d5707829218bbb27ffcdf4e8e86a093249908df4a16ac0d878fe6ed31790b5772340533e48796d SHA512 eeb7c68e54055fcfd5b53cf9c2745ea4dac602dbce158c8c7559dde21372c87cacbcac9c203cf0b577bd292a59304d48e8a4c7afcf9afdd9cc6c6cf0286e1d09
-EBUILD solidpython-1.0.2.ebuild 820 BLAKE2B 52d2cc249ec55e08bb2b6a12b182ef6e3133c35c650b717ecb4d6879d420dd72d62cbe632946b3e6a0807a75833861e9a8d99895777c367d6b3a71c40fdbe9f9 SHA512 7f840aa914e2d5b3aadcab493fc1097cf4ad20437c13c40e1e57de9ae55cb58e6966ba97d9cae800df7e1d18b4fc9cde75c500e13e34b6cff0db3af936991e5d
+EBUILD solidpython-1.0.2.ebuild 814 BLAKE2B a3b6c347beb01bd9eac3bd5889f62766eb451ab44f8bde0b7f835c0338df84a95cb5f3b3de44007e1ab85b26d4c9d9b22bd1acbf11fbd1f0f6a21e70e7bb20da SHA512 50680105f606331d50477958ef0d7e2bdd25224fb66f5c9f22e026d4a5d644f82e622be4e5416686de42d03e3e81992347b1ff80612e10a8148aeefba43e6b2b
--- a/dev-python/solidpython/solidpython-1.0.2.ebuild
+++ b/dev-python/solidpython/solidpython-1.0.2.ebuild
@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
--- a/dev-python/zxcvbn-python/Manifest
+++ b/dev-python/zxcvbn-python/Manifest
@ -1,4 +0,0 @@
 DIST zxcvbn-python-4.4.14.tar.gz 1921286 BLAKE2B 60b049914c86178c94c25b6cc164db168fcb3357737e9fa2cb2e271a0d83d60537ce402219a7c3872dd0cf3e6e087892e76b175f9809af37b091a8e002ad8581 SHA512 37a750efcbd727232b183f6287ade2d0f89399f22b1ed247ee9255a8382d766bf92e9fd9b0036544b07488179693b69e2bdc25a56acf04a24055b6a930274880
 DIST zxcvbn-python-4.4.15.tar.gz 1921579 BLAKE2B aa3901bb60f342667a482ae4c473995b87b7c6f6cf5a37548613d8da70cefb3837d378b70c6d92a01cb9c69670a4ea313eac246fffb3a63016b398049307b2ce SHA512 c3e1c610948b51db82c2c59d16c89cf57edd6a965d981958478ddf59545035a1f7c4a562c3b57065ce6a1a15026ed7e04e47c641c8699a2c56320f52cf4a15ff
 EBUILD zxcvbn-python-4.4.14.ebuild 549 BLAKE2B 6a753d684d10de57e663b1392a1229f6f18e76b29057fce0a0d921ee033fb5aca052bb96e2de34fc422eb8cc8e3157522162b7edd032f173ef265a412eee869b SHA512 1cd54371fc6f9d0286e0cc0386e7f6437f093110c3043b3f7f19c1e245703bd8eeeeeecb6099227ce641c8fd00352b851f0bf7bd49724bdccdda31c5208e9ff9
 EBUILD zxcvbn-python-4.4.15.ebuild 554 BLAKE2B 73e1dc9c5a225a0a52c8b2551256c90e83e82d5d0c220abbdfd72d12b8d68f1735ac3cc6f3b6acd852d2f0775eb0e990b3ed939af7184bcae386e8b2c167edc2 SHA512 4fd4130ae17ef12726bb059dfd9515343f2a6e799d272cce07525df0d4e8b0b42f7eac708256326a7cfa5bccc96397d3f808742c6d389270cd594d16f76e77e8
--- a/dev-python/zxcvbn-python/zxcvbn-python-4.4.14.ebuild
+++ b/dev-python/zxcvbn-python/zxcvbn-python-4.4.14.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 DESCRIPTION="A realistic password strength estimator."
 HOMEPAGE="https://github.com/dwolfhub/zxcvbn-python"
 SRC_URI="https://github.com/dwolfhub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=dev-python/py-1.4.31[${PYTHON_USEDEP}]
 	>=dev-python/pytest-3.0.4[${PYTHON_USEDEP}] 
 "
 DEPEND="${RDEPEND}"
--- a/dev-python/zxcvbn-python/zxcvbn-python-4.4.15.ebuild
+++ b/dev-python/zxcvbn-python/zxcvbn-python-4.4.15.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy3 )
 inherit distutils-r1
 DESCRIPTION="A realistic password strength estimator."
 HOMEPAGE="https://github.com/dwolfhub/zxcvbn-python"
 SRC_URI="https://github.com/dwolfhub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=dev-python/py-1.4.31[${PYTHON_USEDEP}]
 	>=dev-python/pytest-3.0.4[${PYTHON_USEDEP}] 
 "
 DEPEND="${RDEPEND}"
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@ -1,5 +0,0 @@
 AUX gvfs-1.30.2-sysmacros.patch 525 SHA256 fff2f64e7c5c7f2f10e0ff54dc240ee8f06d9be98252c115661b67a67a9ab777 SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2 WHIRLPOOL 7a161c9a22dc35f4cb451bbbe1c50f11d0ecf4ee2a604f3e7cd0dea454d0e424f9ee9017a20c348bd18eaefb50d8e51363f83ab08d589bfac30195a57372a1a4
 AUX gvfs-1.32.1-libcdio-1.0.0.patch 3013 SHA256 0f79d9797fc5b00054b92b8f3e2b0c3e546d1800ad6215d73b8a570e4bfd6754 SHA512 df49037ee06a61b7d248a96c05e30353254df8be942aa46fa5bd130f0041701cae6c5fe1fa8ff1550002db093180e34cb44e5d56a249c1caa8a42e9e37bf8a5f WHIRLPOOL ff2ba17103b333e9b07c889862135d57120a5d0acb3486fe5a53306c5b8b44eb1ee248cb3a866d1d21d2913698d4d1eb1b6b441350f5aac9ef5c69dbf3e63b7b
 DIST gvfs-1.32.1.tar.xz 1813212 SHA256 d0b6c9edab09d52472355657a2f0a14831b2e6c58caba395f721ab683f836ade SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8 WHIRLPOOL 490fab2906896131711e5d8acc9c1a15bbd160b6b02c0472201ff5cc4cdc28c1be83e3603717b038c93e9d1406108aefe2afe1d06e194cf6db5466a8ff77f3b9
 EBUILD gvfs-1.32.1.ebuild 3661 SHA256 30a3d81813f90b1f315c4e5820360e57dfa8c96d76953699e3a449afd417d3f8 SHA512 f7977d11c8e6b6c135d6763b2ee8a9975013aa453d771df7c379574eecc5375cea4fca7442ea9d7906e9bac1e5933a549020d8c2ddbf21d35138c73f957bed12 WHIRLPOOL 0b18c721f315661e956b9c7865f39d41873861021ba7b5bbfd59bd6c9f8d0819de026a4d1dbe3169b0ea3d57eac868bf9fa84603e1571bfc5b13b5d47a859fcc
 MISC metadata.xml 1542 SHA256 0f1cf1d46c6573378489147f87117ec280c31ba1f35ec49dbe6b4de4c80711d2 SHA512 f6576dfac41a515f2bf1918979e9f7927aea32f7cbd552c6f4f550e573556315eeda16f52262994ffe0ee305545f51845f101e7538e7a5e0f5745f3cc75201b9 WHIRLPOOL 2fd2253dadc101dbeeed35785c8b1db7f66500dd52c6597a81d094dbfb6a376782d37bb69c245e2dc4a16ebe3b882b4562a889cbdb765ab80907db0616f9d3ea
--- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
+++ b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
@ -1,21 +0,0 @@
 https://bugzilla.gnome.org/show_bug.cgi?id=776532
 https://bugs.gentoo.org/580234
 --- a/metadata/meta-daemon.c
 +++ b/metadata/meta-daemon.c
@@ -27,6 +27,7 @@
 #include <glib/gstdio.h>
 #include <locale.h>
 #include <stdlib.h>
 +#include <sys/sysmacros.h>
 #include "metatree.h"
 #include "gvfsdaemonprotocol.h"
 #include "metadata-dbus.h"
 --- a/metadata/metatree.c
 +++ b/metadata/metatree.c
@@ -1,4 +1,5 @@
 #include "config.h"
 +#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
--- a/gnome-base/gvfs/files/gvfs-1.32.1-libcdio-1.0.0.patch
+++ b/gnome-base/gvfs/files/gvfs-1.32.1-libcdio-1.0.0.patch
@ -1,69 +0,0 @@
 --- ./daemon/gvfsbackendcdda.c.old	2017-11-23 11:36:19.478546401 -0800
 +++ ./daemon/gvfsbackendcdda.c	2017-11-23 11:56:19.734810497 -0800
@@ -142,11 +142,11 @@ release_metadata (GVfsBackendCdda *cdda_
   cdda_backend->genre = NULL;
   g_list_free_full (cdda_backend->tracks, (GDestroyNotify) track_free);
   cdda_backend->tracks = NULL;
 }
 -#if LIBCDIO_VERSION_NUM < 84
 +#if LIBCDIO_VERSION_NUM < 84 && LIBCDIO_VERSION_NUM != 1
 static char *
 cdtext_string_to_utf8 (const char *string)
 {
   if (string == NULL)
     return NULL;
@@ -165,45 +165,45 @@ fetch_metadata (GVfsBackendCdda *cdda_ba
   cdio = cdio_open (cdda_backend->device_path, DRIVER_UNKNOWN);
   if (!cdio)
     return;
 -#if LIBCDIO_VERSION_NUM >= 84
 +#if LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1
   cdtext = cdio_get_cdtext (cdio);
 #else
   cdtext = cdio_get_cdtext (cdio, 0);
 -#endif /* LIBCDIO_VERSION_NUM >= 84 */
 +#endif /* LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1 */
   if (cdtext) {
 -#if LIBCDIO_VERSION_NUM >= 84
 +#if LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1
     cdda_backend->album_title = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, 0));
     cdda_backend->album_artist = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, 0));
     cdda_backend->genre = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_GENRE, 0));
 #else
     cdda_backend->album_title = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_TITLE, cdtext));
     cdda_backend->album_artist = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_PERFORMER, cdtext));
     cdda_backend->genre = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_GENRE, cdtext));
 -#endif /* LIBCDIO_VERSION_NUM >= 84 */
 +#endif /* LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1 */
   }
   cdtrack = cdio_get_first_track_num(cdio);
   last_cdtrack = cdtrack + cdio_get_num_tracks(cdio);
   for ( ; cdtrack < last_cdtrack; cdtrack++ ) {
     GVfsBackendCddaTrack *track;
     track = g_new0 (GVfsBackendCddaTrack, 1);
 -#if LIBCDIO_VERSION_NUM < 84
 +#if LIBCDIO_VERSION_NUM < 84 && LIBCDIO_VERSION_NUM != 1
     cdtext = cdio_get_cdtext (cdio, cdtrack);
 -#endif /* LIBCDIO_VERSION_NUM < 84 */
 +#endif /* LIBCDIO_VERSION_NUM < 84 && LIBCDIO_VERSION_NUM != 1 */
     if (cdtext) {
 -#if LIBCDIO_VERSION_NUM >= 84
 +#if LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1
       track->title = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_TITLE, cdtrack));
       track->artist = g_strdup (cdtext_get_const (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack));
 #else
       track->title = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_TITLE, cdtext));
       track->artist = cdtext_string_to_utf8 (cdtext_get_const (CDTEXT_PERFORMER, cdtext));
 -#endif /* LIBCDIO_VERSION_NUM >= 84 */
 +#endif /* LIBCDIO_VERSION_NUM >= 84 || LIBCDIO_VERSION_NUM == 1 */
     }
     track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC;
     cdda_backend->tracks = g_list_append (cdda_backend->tracks, track);
   }
--- a/gnome-base/gvfs/gvfs-1.32.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.1.ebuild
@ -1,132 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 GNOME2_LA_PUNT="yes"
 inherit autotools gnome2 systemd
 DESCRIPTION="Virtual filesystem implementation for gio"
 HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
 REQUIRED_USE="
 	cdda? ( udev )
 	google? ( gnome-online-accounts )
 	mtp? ( udev )
 	udisks? ( udev )
 	systemd? ( udisks )
 "
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 RDEPEND="
 	app-crypt/gcr:=
 	>=dev-libs/glib-2.51:2
 	dev-libs/libxml2:2
 	net-misc/openssh
 	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
 	archive? ( app-arch/libarchive:= )
 	bluray? ( media-libs/libbluray:= )
 	fuse? ( >=sys-fs/fuse-2.8.0:0 )
 	gnome-keyring? ( app-crypt/libsecret )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
 	google? (
 		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
 		>=net-libs/gnome-online-accounts-3.17.1:= )
 	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
 	http? ( >=net-libs/libsoup-2.42:2.4 )
 	ios? (
 		>=app-pda/libimobiledevice-1.2:=
 		>=app-pda/libplist-1:= )
 	mtp? (
 		>=dev-libs/libusb-1.0.21
 		>=media-libs/libmtp-1.1.12 )
 	nfs? ( >=net-fs/libnfs-1.9.8 )
 	policykit? (
 		sys-auth/polkit
 		sys-libs/libcap )
 	samba? ( >=net-fs/samba-4[client] )
 	systemd? ( >=sys-apps/systemd-206:0= )
 	udev? (
 		cdda? ( dev-libs/libcdio-paranoia )
 		>=virtual/libgudev-147:=
 		virtual/libudev:= )
 	udisks? ( >=sys-fs/udisks-1.97:2 )
 	zeroconf? ( >=net-dns/avahi-0.6 )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
 	dev-util/gtk-doc-am
 	test? (
 		>=dev-python/twisted-core-12.3.0
 		|| (
 			net-analyzer/netcat
 			net-analyzer/netcat6 ) )
 	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
 "
 # libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
 # test dependencies needed per https://bugzilla.gnome.org/700162
 # Tests with multiple failures, this is being handled upstream at:
 # https://bugzilla.gnome.org/700162
 RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
 	"${FILESDIR}"/${P}-libcdio-1.0.0.patch
 )
 src_prepare() {
 	if ! use udev; then
 		sed -e 's/gvfsd-burn/ /' \
 			-e 's/burn.mount.in/ /' \
 			-e 's/burn.mount/ /' \
 			-i daemon/Makefile.am || die
 		# Uncomment when eautoreconf stops being needed always
 		eautoreconf
 	fi
 	gnome2_src_prepare
 }
 src_configure() {
 	# --enable-documentation installs man pages
 	# --disable-obexftp, upstream bug #729945
 	gnome2_src_configure \
 		--disable-gdu \
 		--enable-documentation \
 		--enable-gcr \
 		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
 		$(use_enable afp) \
 		$(use_enable archive) \
 		$(use_enable bluray) \
 		$(use_enable cdda) \
 		$(use_enable fuse) \
 		$(use_enable gnome-keyring keyring) \
 		$(use_enable gnome-online-accounts goa) \
 		$(use_enable google) \
 		$(use_enable gphoto2) \
 		$(use_enable gtk) \
 		$(use_enable http) \
 		$(use_enable ios afc) \
 		$(use_enable mtp libmtp) \
 		$(use_enable mtp libusb) \
 		$(use_enable nfs) \
 		$(use_enable policykit admin) \
 		$(use_enable samba) \
 		$(use_enable systemd libsystemd-login) \
 		$(use_enable udev gudev) \
 		$(use_enable udev) \
 		$(use_enable udisks udisks2) \
 		$(use_enable zeroconf avahi)
 }
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@ -1,26 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <longdescription lang="en">
 gvfs is a userspace virtual filesystem designed to work with the i/o
 abstractions of gio (a library availible in glib &gt;= 2.15.1). It
 installs several modules that are automatically used by applications
 using the APIs of libgio. There is also fuse support that allows
 applications not using gio to access the gvfs filesystems.
 </longdescription>
 <use>
 	<flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
 	<flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
 	<flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
 	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 	<flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
 	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag>
 	<flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 </use>
 </pkgmetadata>
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@ -1,11 +0,0 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 *squirrelmail-1.5.2_p20121030.ebuild (30 Oct 2012)
  30 Oct 2012; Torsten Kurbad <gentoo@tk-webart.de>
  +squirrelmail-1.5.2_p20121030.ebuild, +metadata.xml,
  +files/ldapuserdata-0.4-gentoo.patch,
  +files/postinstall-en.txt:
  Initial ebuild for snapshot version.
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@ -1,15 +0,0 @@
 AUX ldapuserdata-0.4-gentoo.patch 709 SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3 SHA512 a3106d3dcf4cbd8ed194842f3a131feacae78152a83b447661e17a107843d3d90e3c29601fabdb7fdbe241c0f42fde20bbce56afe88d69ef17d7d8df19a48749 WHIRLPOOL 5630a393598f0401b1ea06a7c42d9441d8bb085a8826055b8968a5123ea7e5e29074999f28e0b5183a7af2105d4834dd13bb3fc4ef1c106bbc14521db01814b1
 AUX postinstall-en.txt 698 SHA256 4e3702651bb5cce4cc517a2b2bed3e71b137167645138bc72c0cedab4ba98da3 SHA512 2d01b8295ed88909bd8e1889e39655e7f9c8d284f691fca7823f4139bc74900d26af20f2df0e3c9b19a5ad3db0cfd13aef56fea91264ce86d1ef0369ade9c645 WHIRLPOOL cd1ba8c1d776ec7a9133d782898bd5fe6d8769103ff3b84beccdb0321f4ead0ae9dfc8b2b84f5fb35e86efd6940cf5b0a7b54ffdab42dfe9596256b4e99dcfae
 DIST admin_add.0.1-1.4.0.tar.gz 2388 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc SHA512 c8abb5a29b815ad2a4591ed965d60d1f75deea17d64c5eaa85ba4fec11d7d1ac1aa5beb8d39228e02b1377782d507b0fb55c47bb8ad10b9b958af8c207c6b627 WHIRLPOOL 94d26bd55e1e859f583db0cd39e4ae9b1ef778139302a24af1a10a671b44989354180c837e9eb74b0d58cef0adb345e65a2421c7777ddf77bcb48795133ce534
 DIST amavisnewsql-0.8.0-1.4.tar.gz 101008 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c
 DIST compatibility-2.0.16-1.0.tar.gz 41497 SHA256 bf179d29223fc76ff6609fdf5146d8f488c603314a343ef70e41f77267de0261 SHA512 478b921da90679022da8790183a651c91bcc879e2ec42db9982e3fef7d3f7e92cd23703ac81a7e8e465889348b28597feba8aaa60943cdbe518a076c4723cf3c WHIRLPOOL 6248e48123484d29c299f88485342b612ecfd72f1ea21a67e988b8d379fcc54bc1262095ed75a3ee238bc60e527d5177e1252a370d0e32f0640b227a4e5e69c2
 DIST ldapuserdata-0.4.tar.gz 67439 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 SHA512 89cb6740865a6b48dbdae8b6ded49bfdac1946f0a76538dd874db104d01ddbbd022f1819a7f94d9ade599d9583dc4b4a1e3f4981bdd6d3dbd86c673bb1d388ac WHIRLPOOL 0c69741b1abbdd51dad33e284fafe148e29c66e6fe20351763bee1d400f980a52ec95eb59d6d9a10afa1a4baf1e7d27843c3b51ccd296c1eae47723cee4ff5ab
 DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d SHA512 77588d0dafc603837cff7c33f8e487ee9b322d9ba875077fce1c5ef85b6e57fe9239680f1b9cf805e0940ae4f1a34c0dcd03e3d26706ac44732ea679ccaf8896 WHIRLPOOL b0121dac6146659fce80b9653084b92efb44fb4cc5ee986ebde91c46e581a721c775c8791e5f38bad10fba5b2369ab0f9e72c8749eeec102d1006a93e5f9d13a
 DIST secure_login-1.4-1.2.8.tar.gz 16993 SHA256 b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e SHA512 3246bf3e3f058d73e33a3f2e33166aa57061be0210fcc939f3a881bdb569d049fb95d8ad5c141de9ff7f2014feff40bcc5c72f4ca9acf9c30937c484977e15db WHIRLPOOL 86e5361ec0e0df994c2bd80346fc54126f77d463f642bb23e1fa39daf31488d2abab71cf81c8b290059e9acba1032b160b87a2d92f1295fb6b8b0ee22a477707
 DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a SHA512 5e2579a6d55924e5b92ee558379e88f7a5ffd4702009fa00c9a99a2a5bec750cf7b1de7b78ac05c0cdb5f59248c73bde15404e8b27a408766c96fc24ecc4b9c8 WHIRLPOOL d99dc6a04ef026b3faf8029b695ad5bb374009c1e19866661f3b32f5d2b46f27e231cd82f59130cbd15ca3caac3496b132b8c79b5229f5ed558b05e8743e7b8e
 DIST squirrelmail-20121030_0200-SVN.devel.tar.bz2 1118033 SHA256 3a7ef7f03e0b2aea590c98072a0e53e602720345a391768d1c9150194e7e9ebc SHA512 4912acb850edc8d21836bf54e253ebd6818f3abc980653ef5aac5c0b7f5e0d19c21efe1589a52f1d46cb0c765c96ff1e9411e4da853b35b71ad87f487f1ed6fc WHIRLPOOL f05c7ee751220a5a8edfd4ca3cd3bdb1361797aeddafe7a7ff800cf3f57b4a03832d74d6bc158743f44a41858b319ec87dcef3ee407ada928a3af4647b83a675
 DIST squirrelmail-20121030_0202-SVN.locales.tar.bz2 5254174 SHA256 ab8a1de6efaeb5e07cd8205cf03d6bc2d7034a2d4ca9c699e2f615367a86d3e1 SHA512 84bc80b9b4ec99afaad14f551de44f8ad3e266b77ea8a01549dfb236599ca0cc43ed29d89daa2404202ec32bb9170f945973afa9d30f608556bcaefe3349f4f9 WHIRLPOOL 146c3954e511eae856bca61e6ae345a1c37875b625e79d0d09aba7b82d1acd3e94936b7f28bc80c18105c4410e15b2b018fb0d8a21ffb7efa80fbdb77b28d064
 DIST squirrelmail-decode-1.2.tar.bz2 333942 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 SHA512 f804d7e4bf8814fc00ea076b388a106820df6cb22e0d6c76305fef414f159238578a31e13787a932f9e832dc4b31eb4a7ef5da481f2abbcb164b81673e68698b WHIRLPOOL 735695b9f78068542b1db65cb1d35c06eb5c7d94b699fb176d6c5c82cb2b2f38725a83c6bff355ec7035916a55493666e5f839356369b923d2a6b8f9bd5688da
 EBUILD squirrelmail-1.5.2_p20121030.ebuild 5798 SHA256 7a4995785dfcd5448aa2ccf50b29d63877a31a7518678c3eea25d00348df7fe1 SHA512 c5d84aa748c7dc3e409e361d1d3c8b18df9bb9303cae936c0757931f6342c136d38075b076d957984394a0d98fad92c584713af0589952ca2cdf5f706fa35364 WHIRLPOOL 1587a93d9c5bd824fba6e989c22b9137d42cca152d34be0ec80d0d462a63765da57895749af4db8666c5a1294917b131f3b238790dd7a49440c32ce8407a17f2
 MISC ChangeLog 392 SHA256 538bcf1cb0f8fa1319b9a4c378696c82d1b3a5ea221abcb9edaf7aa2c5d7d362 SHA512 ee8f03176cdd9714d8ee2cfc5d829c33540d2cdb49ab06f3998c3d28f99d48fbe565e56aa6b8958b3b948d06531db4504cea5e04dd6390bd3879372a2f294d9b WHIRLPOOL 9e31895266ebe6e3cab1b6dc6aef8fbf97a2ea6dcb9ca5fff5f01583617a3d24c1a81d9a46e019913eeac60de370563b6efa663d84412e0d52d5167bac5a7b10
 MISC metadata.xml 258 SHA256 21af48d333e86033571fce6541ff71f04d5172b3e807e711171d8a17208bc6a7 SHA512 3ac2bf8bc4223a24b4a79e267531b0f3e34a9d58432e8752ad91850e8c448ac66f9892080f190a1551b76b859875a807156cb4c96463cf0fa3204bf6a565db9f WHIRLPOOL aad34ee6e120081d7cbd90ca1d2b1b81f6c4931f3ddd939e14f94219c043f9abfe4b951017add31baebf87cb0cf3947a417975a819c3f0fc9ce597b9b56b336f
--- a/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
+++ b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
@ -1,20 +0,0 @@
 --- plugins/ldapuserdata/setup.php.orig	2004-01-15 23:40:41.000000000 -0800
 +++ plugins/ldapuserdata/setup.php	2004-01-15 23:40:52.000000000 -0800
@@ -92,7 +92,7 @@
 	global $ldap_bind_dn, $ldap_host;
 	/* fill $ldap_prefs_cache with data from LDAP. */
 -	$ldap_prefs_cache = retrieve_data($login_username);
 +	$ldap_prefs_cache = ldap_retrieve_data($login_username);
 	/*
 	print "<pre>";
@@ -121,7 +121,7 @@
 }
 -function retrieve_data ($uid) {
 +function ldap_retrieve_data ($uid) {
 	global $ldap_host, $username, $ldap_base_dn, $ldap_bind_dn, $ldap_bind_pw;
 	global $ldap_manager_dn, $ldap_manager_pw;
 	global $ldap_objectclass, $prefs_default, $ldap_attributes, $boolean_attrs, $multivalue_attrs;
--- a/mail-client/squirrelmail/files/postinstall-en.txt
+++ b/mail-client/squirrelmail/files/postinstall-en.txt
@ -1,18 +0,0 @@
 * You must edit the following configuration files to setup your server.
 * Note that not all of them may be present depending on USE flags.
 * 
 * config/config.php
 * plugins/retrieveuserdata/config.php
 * plugins/virus_scan/config.php
 * plugins/gpg/gpg_local_prefs.txt
 * plugins/ldapuserdata/config.php
 * plugins/show_ssl_link/config.php
 * plugins/secure_login/config.php
 * 
 * You should also create the file 'config/admins'
 * containing the users who should have access to administrative options.
 * Put each login on its own line, and be sure to leave a newline at the
 * end of the file.
 * 
 * You can use the console based configuration tool by executing:
 * cd config; perl conf.pl
--- a/mail-client/squirrelmail/metadata.xml
+++ b/mail-client/squirrelmail/metadata.xml
@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
 <use>
 	<flag name='filter'>Enable <pkg>mail-filter/amavisd-new</pkg>
 		filtering
 	</flag>
 </use>
 </pkgmetadata>
--- a/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.2_p20121030.ebuild
@ -1,218 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=4
 inherit webapp eutils
 IUSE="ldap spell ssl filter mysql postgres nls"
 DESCRIPTION="Webmail for nuts!"
 MY_PV="${PV/1.5.2_p/}_0200-SVN"
 # Plugin Versions
 COMPATIBILITY_VER=2.0.16-1.0
 USERDATA_VER=0.9-1.4.0
 ADMINADD_VER=0.1-1.4.0
 AMAVIS_VER=0.8.0-1.4
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.4-1.2.8
 SHOWSSL_VER=2.2-1.2.8
 LOCALES_VER="${PV/1.5.2_p/}_0202-SVN"
 DECODING_VER=1.2
 MY_P=${PN}-${MY_PV}
 S="${WORKDIR}/${PN}.devel"
 PLUGINS_LOC="http://www.squirrelmail.org/plugins"
 SRC_URI="http://snapshots.squirrelmail.org/${MY_P}.devel.tar.bz2
 	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
 	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
 	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
 	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
 	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
 	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
 	nls? ( http://snapshots.squirrelmail.org/${PN}-${LOCALES_VER}.locales.tar.bz2 )"
 HOMEPAGE="http://www.squirrelmail.org/"
 LICENSE="GPL-2"
 KEYWORDS=""
 DEPEND=""
 RDEPEND="dev-lang/php[session]
 	virtual/perl-DB_File
 	ldap? ( net-nds/openldap )
 	spell? ( app-text/aspell )
 	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
 	postgres? ( dev-php/PEAR-DB )
 	mysql? ( dev-php/PEAR-DB )"
 src_unpack() {
 	unpack ${MY_P}.devel.tar.bz2
 	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
 	cd "${S}" || die
 	mv config/config_default.php config/config.php || die
 	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" config/config.php || die
 	# Now do the plugins
 	cd "${S}/plugins"
 	sed -i 's:/usr/games/fortune:/usr/bin/fortune:g' fortune/setup.php || die "Unable to fix fortunes plugin."
 	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
 	unpack admin_add.${ADMINADD_VER}.tar.gz
 	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
 	use filter &&
 		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
 		mv amavisnewsql/config.php.dist amavisnewsql/config.php
 	use ldap &&
 		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz
 	use ssl &&
 		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
 		mv secure_login/config.sample.php secure_login/config.php &&
 		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
 		mv show_ssl_link/config.php.sample show_ssl_link/config.php
 	use nls &&
 		cd "${WORKDIR}" &&
 		unpack ${PN}-${LOCALES_VER}.locales.tar.bz2
 }
 src_prepare() {
 	cd "${S}"
 	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
 		config/config.php || die
 	cd "${S}/plugins" || die
 	if use ldap; then
 		epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch
 		mv ldapuserdata/config_sample.php ldapuserdata/config.php || die
 	fi
 	if use nls; then
 		cp -a "${WORKDIR}"/squirrelmail.locales/locale/* \
 			"${S}"/locale/ || die
 		cp -a "${WORKDIR}"/squirrelmail.locales/help/* \
 			"${S}"/help/ || die
 	fi
 }
 src_configure() { :; }
 src_compile() { :; }
 src_install() {
 	webapp_src_preinst
 	# handle documentation files
 	#
 	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
 	# get installed per vhost!
 	dodoc README
 	docinto compatibility
 	for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/README; do
 		dodoc ${doc}
 		rm -f ${doc}
 	done
 	docinto admin_add
 	for doc in plugins/admin_add/README; do
 		dodoc ${doc}
 		rm -f ${doc}
 	done
 	docinto retrieveuserdata
 	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
 		dodoc ${doc}
 		rm -f ${doc}
 	done
 	if use filter; then
 		docinto amavisnewsql
 		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
 			dodoc ${doc}
 			rm -f ${doc}
 		done
 	fi
 	if use ldap; then
 		rm plugins/ldapuserdata/README
 		docinto ldapuserdata
 		for doc in plugins/ldapuserdata/doc/README; do
 			dodoc ${doc}
 			rm -f ${doc}
 		done
 	fi
 	if use ssl; then
 		docinto secure_login
 		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
 			dodoc ${doc}
 			rm -f ${doc}
 		done
 		docinto show_ssl_link
 		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
 			dodoc ${doc}
 			rm -f ${doc}
 		done
 	fi
 	# Copy the app's main files
 	einfo "Installing squirrelmail files."
 	cp -r . "${D}${MY_HTDOCSDIR}" || die
 	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php \
 		"${D}${MY_HTDOCSDIR}/functions/decode" || die
 	# Identify the configuration files that this app uses
 	local configs="config/config.php config/config_local.example.php plugins/retrieveuserdata/config.php"
 	use filter && configs="${configs} plugins/amavisnewsql/config.php"
 	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
 	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
 	for file in ${configs}; do
 		webapp_configfile ${MY_HTDOCSDIR}/${file}
 	done
 	# Identify any script files that need #! headers adding to run under
 	# a CGI script (such as PHP/CGI)
 	#
 	# for phpmyadmin, we *assume* that all .php files that don't end in
 	# .inc.php need to have CGI/BIN support added
 	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
 	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
 	#done
 	mkdir -p "${D}${MY_HTDOCSDIR}"/data
 	local server_owned="data index.php"
 	for file in ${server_owned}; do
 		webapp_serverowned ${MY_HTDOCSDIR}/${file}
 	done
 	# add the post-installation instructions
 	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 	# all done
 	#
 	# now we let the eclass strut its stuff ;-)
 	webapp_src_install
 }
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@ -1,3 +0,0 @@
 AUX curaengine-3.4.1-cmake.patch 576 BLAKE2B fb92f33b974c1ace8625bd497d71324771d8927643fcb29aab814b5839e82d748039301982ba87bddf1d5f4bc4857dec4211a7b75ae13f3ec0adf589d2671cc9 SHA512 52e2e425782f7b06bc7e361356d2ff5acf0a2d5279173776b38a807e37bf53357c0416697504143a7e84e282cf0be304e943710dfc5bd2911542fbb302384187
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
 EBUILD curaengine-3.4.1.ebuild 954 BLAKE2B 8a35fb6db1ebf67873d739f19cc870a1edf988cdf1157417deb5099938767b1f052d1e67d5edc2a196ab6daf455c2b242287d943b0d0aec2d1c6a99190d702c4 SHA512 2b21788e3c9235801cb23c811d6bd2b18aaa48398c42c03348cf67c08b33386b85539528f5f298e31d873a219d438485ceaaf82c944fe740d61ba4caf1d2b9b3
--- a/media-gfx/curaengine/curaengine-3.4.1.ebuild
+++ b/media-gfx/curaengine/curaengine-3.4.1.ebuild
@ -1,47 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit cmake-utils eutils
 MY_PN="CuraEngine"
 DESCRIPTION="A 3D model slicing engine for 3D printing"
 HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
 SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:*
 	dev-libs/protobuf"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 DOCS=( README.md )
 S="${WORKDIR}/${MY_PN}-${PV}"
 src_prepare() {
 	cmake-utils_src_prepare
 	epatch "${FILESDIR}/${P}-cmake.patch"
 }
 src_configure() {
 	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
 	cmake-utils_src_configure
 }
 src_compile() {
 	cmake-utils_src_make
 	if use doc; then
 		doxygen
 		mv docs/html . || die
 		find html -name '*.md5' -or -name '*.map' -delete || die
 		DOCS+=( html )
 	fi
 }
--- a/media-gfx/curaengine/files/curaengine-3.4.1-cmake.patch
+++ b/media-gfx/curaengine/files/curaengine-3.4.1-cmake.patch
@ -1,14 +0,0 @@
 diff -Naur CuraEngine-3.4.1-old/CMakeLists.txt CuraEngine-3.4.1/CMakeLists.txt
 --- CuraEngine-3.4.1-old/CMakeLists.txt	2018-07-09 10:55:15.000000000 +0200
 +++ CuraEngine-3.4.1/CMakeLists.txt	2018-07-31 14:33:50.654251779 +0200
@@ -252,10 +252,6 @@
 endif()
 -add_custom_command(TARGET CuraEngine POST_BUILD
 -                   COMMAND ${CMAKE_COMMAND} -E copy_directory
 -                       ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>)
 -
 # Installing CuraEngine.
 include(GNUInstallDirs)
 install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/media-gfx/ocrfeeder/Manifest
+++ b/media-gfx/ocrfeeder/Manifest
@ -1,2 +1,2 @@
-DIST ocrfeeder-0.8.1.tar.xz 900692 SHA256 5816401c9b4bfce98fd9a7b649a3c7ecc3d6968a30f0e4d1b3677d172d55253b SHA512 77684cf752ea1f3b55a1373099d3be3cbfe812cead2b254bd0624f650ace5254d5f708c001f946c3e59fd34f6db52f39b94ff6865588370ed3a5ea6530be8113 WHIRLPOOL 182f7717c3b7638d1818b6172c660b2b00f232cc8ee43f4811ef417838aadbcce063281e241d176b19d353d6a654c1d7862cd4b9bda1fe1dec59a6e0493ca0b0
+DIST ocrfeeder-0.8.3.tar.xz 873932 BLAKE2B 4b4952947610e1b6c6d2c6441488ae96245453021457a92b43a048e6c3a80a0814a4bf4305a8c02315e942a2a2b84be8a062b9d001f45251318ff9bfd479ad5c SHA512 c7b3803c95ce78ed998f4466afd390a838207682a926ce139a9458e7bc3567642a629ab4fe3b90d5238f6233c9631930df91b59e1ebcee1e90f8b91cf40161af
-EBUILD ocrfeeder-0.8.1.ebuild 744 SHA256 17b5dad4d990938e26c38fb5c81343aa9621925bbec56c9058abc517c077cd53 SHA512 e08020f5f9b42214ea7f6f97eb4e4ac1ef924e3a92a0c538b0185ef9a2c790fac1c1f7007fb05819f3f16b9249e3b206cd3b8e45a5050e46c651c9bd3b4e212c WHIRLPOOL 785444b43e1e0f215de6d68a757d6a92064d1dc7bec7aec10a21e4d0dd79bec8b20d81a75274cf0427d757a115fe3a8f60c389f20d3cc82905c5c52445cf0a58
+EBUILD ocrfeeder-0.8.3.ebuild 712 BLAKE2B 9357f1254315196893f1ef7e178105f9be71c4c4ae9d5d1f4f33dc868b8963eee21188daad1df1cff402249b12a4d0f88b65c15c6d832b65adb341e44e196803 SHA512 0dd22fa4a518704a573599d7f6c7cb865907cd191f0dfe9055b3690f2642ecc94b0ece583d0cb7a0d4b43a8254588bb971403627199328c7a4a218033fe4eba8
--- a/media-gfx/ocrfeeder/ocrfeeder-0.8.3.ebuild
+++ b/media-gfx/ocrfeeder/ocrfeeder-0.8.3.ebuild
@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI=5
+EAPI=7
-inherit versionator
+inherit
 DESCRIPTION="Document layout analysis and optical character recognition system"
 HOMEPAGE="http://live.gnome.org/OCRFeeder"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
 LICENSE="GPL3"
 SLOT="0"
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@ -1,8 +0,0 @@
 AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
 DIST pstoedit-3.71.tar.gz 1046071 BLAKE2B c38f9d95df206a059ad55651a96f002e89589f23437ecfe185e489bacf506ea147f5ddde6ef9a128cef1521c7e1ff4d09c6f15e81ba93d1f886c47b73c63c867 SHA512 323c24adbd8063fd3108154654ede2a7a9043dd6fc471425e534c478cfb71fd41824bbaaa507003dd5096c3280484f11b082f10b75f365c1a462adac78927670
 DIST pstoedit-3.73.tar.gz 1276849 BLAKE2B 8d5b10a5acc4658111073bbe4b5590be4b4002bbf751b50462ecd8c8f268e9a6f54bc940ed8c669722077c1b27240401c5ba9aea7c9420a4420bfe8dc862e07d SHA512 77823d77dcec8604decab03cee86edb1ef0a6c56b8dd01a65ab6431d9345bc6a2140076f5d5572fd5221b7f381a07d14b2a45e66cff2a6e12ab7417cd95113b6
 DIST pstoedit-3.74.tar.gz 1286928 BLAKE2B 046d970eb6478fa3b5165deaba358f218ef67c03a15ba2835f59f66c226f4d4e0b6b90e6f3adaf18c5a2375545f6e1e09f9c6fc670a619a16774741f3ca2cdc5 SHA512 63dddb707a52c1d56f17da837ab7472b501723b032f21670455eb6bf1664fd783820b3496c29ecc19d7b8bc18c294dce5842a10ffed442ef14d1631ae35f18b8
 EBUILD pstoedit-3.71.ebuild 1328 BLAKE2B 7b6b3efb9ff6dea3571901a5582de600f6f92ce47c885e7f7ed5879f965e452dbcf93a35b83b7effeb5f1e01da49ade7ee111a854b6ec4da8cd65f59c827e819 SHA512 cfbfc7b8834bf6b37fc62c756de9edd59226022adb41b0648619dfd62e4329c2bd37a5717c861659d461b24c9263316e15e1b9536bbadc5b64982226c44b14e7
 EBUILD pstoedit-3.73.ebuild 1328 BLAKE2B 7b6b3efb9ff6dea3571901a5582de600f6f92ce47c885e7f7ed5879f965e452dbcf93a35b83b7effeb5f1e01da49ade7ee111a854b6ec4da8cd65f59c827e819 SHA512 cfbfc7b8834bf6b37fc62c756de9edd59226022adb41b0648619dfd62e4329c2bd37a5717c861659d461b24c9263316e15e1b9536bbadc5b64982226c44b14e7
 EBUILD pstoedit-3.74.ebuild 1328 BLAKE2B 7b6b3efb9ff6dea3571901a5582de600f6f92ce47c885e7f7ed5879f965e452dbcf93a35b83b7effeb5f1e01da49ade7ee111a854b6ec4da8cd65f59c827e819 SHA512 cfbfc7b8834bf6b37fc62c756de9edd59226022adb41b0648619dfd62e4329c2bd37a5717c861659d461b24c9263316e15e1b9536bbadc5b64982226c44b14e7
 MISC metadata.xml 709 BLAKE2B 001acbe9effb2a5523a46af676fed5a4ae513b04a96454ba6b0f1bd25130f9d8ffe5ad46c3dc55a276a47904d0e29f0e58dcd9d966ef4b16cde525ac5d6debde SHA512 36f14c4cce30c5a2d9f581ad02c61d7b8fc1de7bb613c3d1d1741a7753e215816c32846cf8c93f4905da839523d6a1e624beae66366770f102291e7219df0bda
--- a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
@ -1,13 +0,0 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 6b33220..30c9f2e 100755
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES =			\
 	genericints.h 				\
 	version.h
 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -lm
 libpstoedit_la_LDFLAGS = -no-undefined
 pstoedit_SOURCES = cmdmain.cpp
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/metadata.xml
@ -1,20 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>tex@gentoo.org</email>
    <name>Gentoo TeX Project</name>
  </maintainer>
  <maintainer type="project">
    <email>printing@gentoo.org</email>
    <name>Gentoo Printing Project</name>
  </maintainer>
  <use>
    <flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
    <flag name="flash">Enable <pkg>media-libs/ming</pkg> SWF support</flag>
    <flag name="pptx">Enable support for generating PowerPoint pptx files</flag>
  </use>
  <upstream>
    <remote-id type="sourceforge">pstoedit</remote-id>
  </upstream>
 </pkgmetadata>
--- a/media-gfx/pstoedit/pstoedit-3.71.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.71.ebuild
@ -1,63 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools
 DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
 HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emf flash imagemagick plotutils pptx static-libs"
 RDEPEND="
 	>=media-libs/gd-2.0.35-r1:=
 	>=app-text/ghostscript-gpl-8.71-r1
 	emf? ( >=media-libs/libemf-1.0.3 )
 	flash? ( >=media-libs/ming-0.4.3 )
 	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
 	plotutils? ( media-libs/plotutils )
 	pptx? ( dev-libs/libzip )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.60-libdl.patch
 )
 src_prepare() {
 	default
 	sed -i \
 		-e '/CXXFLAGS="-g"/d' \
 		-e 's:-pedantic::' \
 		configure.ac || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with emf) \
 		$(use_with imagemagick magick) \
 		$(use_with plotutils libplot) \
 		$(use_with flash swf) \
 		$(use_with pptx)
 }
 src_install() {
 	default
 	doman doc/pstoedit.1
 	dodoc doc/*.txt
 	docinto html
 	dodoc doc/*.htm
 	find "${ED}" -name '*.la' -delete
 }
--- a/media-gfx/pstoedit/pstoedit-3.73.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.73.ebuild
@ -1,63 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools
 DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
 HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emf flash imagemagick plotutils pptx static-libs"
 RDEPEND="
 	>=media-libs/gd-2.0.35-r1:=
 	>=app-text/ghostscript-gpl-8.71-r1
 	emf? ( >=media-libs/libemf-1.0.3 )
 	flash? ( >=media-libs/ming-0.4.3 )
 	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
 	plotutils? ( media-libs/plotutils )
 	pptx? ( dev-libs/libzip )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.60-libdl.patch
 )
 src_prepare() {
 	default
 	sed -i \
 		-e '/CXXFLAGS="-g"/d' \
 		-e 's:-pedantic::' \
 		configure.ac || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with emf) \
 		$(use_with imagemagick magick) \
 		$(use_with plotutils libplot) \
 		$(use_with flash swf) \
 		$(use_with pptx)
 }
 src_install() {
 	default
 	doman doc/pstoedit.1
 	dodoc doc/*.txt
 	docinto html
 	dodoc doc/*.htm
 	find "${ED}" -name '*.la' -delete
 }
--- a/media-gfx/pstoedit/pstoedit-3.74.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.74.ebuild
@ -1,63 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools
 DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
 HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="emf flash imagemagick plotutils pptx static-libs"
 RDEPEND="
 	>=media-libs/gd-2.0.35-r1:=
 	>=app-text/ghostscript-gpl-8.71-r1
 	emf? ( >=media-libs/libemf-1.0.3 )
 	flash? ( >=media-libs/ming-0.4.3 )
 	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
 	plotutils? ( media-libs/plotutils )
 	pptx? ( dev-libs/libzip )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.60-libdl.patch
 )
 src_prepare() {
 	default
 	sed -i \
 		-e '/CXXFLAGS="-g"/d' \
 		-e 's:-pedantic::' \
 		configure.ac || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with emf) \
 		$(use_with imagemagick magick) \
 		$(use_with plotutils libplot) \
 		$(use_with flash swf) \
 		$(use_with pptx)
 }
 src_install() {
 	default
 	doman doc/pstoedit.1
 	dodoc doc/*.txt
 	docinto html
 	dodoc doc/*.htm
 	find "${ED}" -name '*.la' -delete
 }
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@ -1,5 +1,4 @@
-AUX pycam-0.6.1-pyopengl.patch 489 SHA256 820d313634d84375e8aa19ab4e9c065eae522cb15973d8adc06e867b4c81ecc1 SHA512 45c496ce8d82923679e2d4c60fc07ae23937d01c6ffc2efe6f09c48920f0d356f7855f40a2d66b4353981e925afa480be2a430b81d25507385f4407a3c41ec04 WHIRLPOOL 5ea31de1bf4d1d8e881d417a0a7fabc7601bbfe947118cb449f129ec9fcc10f53257ea47c6563ebf5c6098a8897664fe060af808c1f1595264c4d3871063f832
+DIST v0.6.4.tar.gz 3079871 BLAKE2B 41368b177e8ead933e898d316349adc40d40e23d5c7b56943f3f46acf2ff3634e797636e0723b9470453bb2e12f8fd9c70fd4aaedc207ea4638d9d422948f3dc SHA512 4095d45b6c561c2e706469f12772ede8063fa0216cef4a52412fe4d5e892882aa62a65a6159d97c6c066aec20d4915a7a05724dc0e2b66f2309e0fa3bbc0253f
-DIST v0.6.1.tar.gz 3083640 SHA256 90505ab221b8ecf8a82234322213fbe8f55a8749aff17ba26c989c29217a15ac SHA512 18f6af3716069a8576077ecf4129daad6b689a53fdc86e6a33f0767c0162089fa0ac0200cb5f46a237de964fae9afb653955212f1b327e48bdf8b6a06c784584 WHIRLPOOL 9dcfa2ade46bd257518b5b612ee7db33e7d14501dad037896a8f3f8159677743de3b0eda11841c40d96d528a052f533eaff47165ca7724f75954e61218ec00a5
+EBUILD pycam-0.6.4.ebuild 651 BLAKE2B f231354d91eb4ea2696f52f07d187fe53f9babfb15c58be3d0a63256b7037eee2895198fcb1a2df8a3f55d681171d5e997031e9de7c6a4e7dc2603cc3810be9f SHA512 ee2e0f2b4e5cdf1a4b975a444de2b7ebc0a401b519814ab6c4e7de3597596f5ad90b8aa8c8ba2d3491cee1aed2ce5e2286e0fdb0f5f8bd9828206e89f81722d4
-EBUILD pycam-0.6.1.ebuild 759 SHA256 50ccce1fdf051e2e1d1017530eb5724426edff9a37bd8de18dad9cecac4a3ada SHA512 229f5171e9d72e249972748d2a9c884298221c4ac94883c5945af8da53781c0458c73ec4e583b2381333b001a50144b201220525640a53b52aa0f83d072a8511 WHIRLPOOL 9acf2332afca3544b8a10de9bfea22fb69b5ca3aefbae252a32e438178dd6d4a573e099e9b03ee38630fc43e2ad224630384fea8c62ccbc0c24b86323da300b4
+EBUILD pycam-9999.ebuild 651 BLAKE2B f231354d91eb4ea2696f52f07d187fe53f9babfb15c58be3d0a63256b7037eee2895198fcb1a2df8a3f55d681171d5e997031e9de7c6a4e7dc2603cc3810be9f SHA512 ee2e0f2b4e5cdf1a4b975a444de2b7ebc0a401b519814ab6c4e7de3597596f5ad90b8aa8c8ba2d3491cee1aed2ce5e2286e0fdb0f5f8bd9828206e89f81722d4
-EBUILD pycam-9999.ebuild 669 SHA256 0d248d68186a7446f6f8f4d63776783b196d14066697550b22014492e0ea1dbb SHA512 a38f172f84b5fd0dcb7056b0dcf0daebc628b279aca1e1d963d17a6dd7cbe0b0e77d4c1a4c08c3e5104f93eba2ad6ff569aee74f5fb773046b1db0bfc2bf983f WHIRLPOOL 731751198ffeffcd8919448eef5dd2403d7f1ba78769c66e1cfcafb820223833451998b7a86fd021db1ea3be1f57c3250b4ced1df9a2c889f0b4550430aaead6
+MISC metadata.xml 290 BLAKE2B 15f25f9b0eb3e58221cf49040cf9b0f923bc8936ceb3040de236b57206df3547e88f28cfd4666cc83c2021f4e23012ed33e352282aa3f6b668a2b9568f4b5a5d SHA512 b3ebcaa51728a7fe09029f792e3ad7dbaa50b30e98d4e523d7258ab2d70824f3722c40ba60cda6feae303dd3779cb65cefe560c9740f1b07e6d2c905660bf2eb
 MISC metadata.xml 290 SHA256 9f688a3bab3cd4d362d3eeb275027c73355b8cc5832405453d25244b12be8818 SHA512 b3ebcaa51728a7fe09029f792e3ad7dbaa50b30e98d4e523d7258ab2d70824f3722c40ba60cda6feae303dd3779cb65cefe560c9740f1b07e6d2c905660bf2eb WHIRLPOOL 96f9089a41ab4c5c577d9780c983a1ed99bb7025da9e4a1e3b2da86a3f6e37a4ed6522ff2a96771b021632d030d394b2f5527cb9bc8adf631cdcb438959ed057
--- a/media-gfx/pycam/files/pycam-0.6.1-pyopengl.patch
+++ b/media-gfx/pycam/files/pycam-0.6.1-pyopengl.patch
@ -1,9 +0,0 @@
 diff -urN pycam-0.6.1.orig/pycam/Gui/OpenGLTools.py pycam-0.6.1/pycam/Gui/OpenGLTools.py
 --- pycam-0.6.1.orig/pycam/Gui/OpenGLTools.py	2017-03-11 03:44:32.000000000 +0100
 +++ pycam-0.6.1/pycam/Gui/OpenGLTools.py	2017-10-16 19:51:03.776578998 +0200
@@ -91,4 +91,4 @@
     # center the cone
     GL.glTranslatef(0, 0, -cone_length * position)
     # draw the cone
 -    GLUT.glutSolidCone(cone_radius, cone_length, precision, 1)
 +    GLUT.glutWireCone(cone_radius, cone_length, precision, 1)
--- a/media-gfx/pycam/pycam-0.6.4.ebuild
+++ b/media-gfx/pycam/pycam-0.6.4.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1 python-r1 eutils
@ -22,15 +22,8 @@ LICENSE="GPL-3"
 SLOT="0"
 DEPEND="
 	virtual/python-enum34
 	dev-python/pygtk
 	dev-python/pygtkglext
 	dev-python/pyopengl
 	dev-python/pyyaml
 	dev-python/svg-path
 "
 RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/"${P}"-pyopengl.patch
 	distutils-r1_src_prepare
 }
--- a/media-gfx/pycam/pycam-9999.ebuild
+++ b/media-gfx/pycam/pycam-9999.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1 python-r1 eutils
@ -22,9 +22,8 @@ LICENSE="GPL-3"
 SLOT="0"
 DEPEND="
 	virtual/python-enum34
 	dev-python/pygtk
 	dev-python/pygtkglext
 	dev-python/pyopengl
 	dev-python/pyyaml
 	dev-python/svg-path
 "
 RDEPEND="${DEPEND}"
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@ -1,4 +1,4 @@
 AUX slic3r-9999-adjust_var_path.patch 477 BLAKE2B 0e0590aac466f4e2e6972144c5e12cd1f0d3eb85d33350d8b35ace9cacaa934338821274e9a227b44572adc6a89fce2d7a75e762aacbd9e6368cc2a0cbafd10a SHA512 ffe841707eca3a312b31a9ae6618f2d41004100547176e092436fb02d6d17f6bafe431e61f72f426f3c4894da208d8043d6b1f0e46fe6beffe90ee33d4f49894
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-EBUILD slic3r-9999.ebuild 2649 BLAKE2B faed6176499179fe628a1c89ae307eb1be9fedcde4f043b72456abcee58ce0fe6eec42412cd47a40858d451bee34822c871d1e28064bff2f4622fae3227a513f SHA512 92c37abf84356ff3d547ded93a881464bc1f84e729c2c9a095bac48aad0b70e1a38738b3481e388d2eab3f70032566d1d7a7fd11a2e95b9b13e3b23214dd6541
+EBUILD slic3r-9999.ebuild 2649 BLAKE2B f36dba444dfdf4fff4ed2900d9656e7b36efc9518f51d1398817043e22ac074e4bcff4563ee3f7bed2a88bbdabdc9531c02dc3f7a69cfa3f9466834db6f70d2d SHA512 cbb7112e1915ba40beb295cc53a3e2f117109aa195565e935962ffe1e126d9bae82ec930dbf443bfc9c0ef42fc661fa87380be9caeeb3e42761160c82cd0ffe9
 MISC metadata.xml 1166 BLAKE2B c5ccfe10e50fef8d5729e4c5887a66a524ede1262acc8934e393dd0d3c4bae24cce2b34bd8cb5a1063bf5b8950ee6837e74a48caa6100bf7cbe25e41716914bb SHA512 8fa8adf81c468d72253218f1e5c4c42e8546a89166c3a3158db17b7504c13920abe7bc4ce3efadb4e6fa035d23d3a509c844699ac80b417dd16b570a6f6f213e
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit eutils git-r3 perl-module
--- a/media-gfx/xmedcon/Manifest
+++ b/media-gfx/xmedcon/Manifest
@ -1,2 +1,2 @@
-DIST xmedcon-0.16.2.tar.bz2 836840 BLAKE2B 80b1df3b6c905463d4ab7e3e4284cfcad6b6f1aabf0845758f5f62f45e910112ea48bc74b17f8a8fd7f7299587e8a96a46d681fbb6394796907fd13c8acfd7ef SHA512 520159c784c3dedf7f3a1c58840ff178dd00211cc71b7f59fdbd515d6907333cb864f99ee3505c1ff45c376c548a0182cb6a90ad34c898e44475350c4e7dd851
+DIST xmedcon-0.21.1.tar.bz2 866228 BLAKE2B 5b449a0daca2a91196a68426dc92e4ceb20d12b430224300037bb67c7e1ac7d9277b79922963a75ac3243a31632a0d2193d67eb1669a45dcd115b64196294b79 SHA512 0dbe954efbb92460980952a07daf59820836f2f487f9ab372230102d03592f1b2a0408136435ac9ac71f97a3d1b4b72709e20fe084ee0a304df37ae6c6314ecd
-EBUILD xmedcon-0.16.2.ebuild 569 BLAKE2B 9f5f8f5ec9ad1f7b1fe0ae81a0dfc41199ac93e109f8c5d208886f9f83ab091ac6322976d8bb60c526cb71f5c18552878064b38f530f7479fdbb0dd1b7c82ddb SHA512 9562dfa88b68915e05b301d9421d1f428a6ee556a5c7a1fb2bca2b52fdebde168f59766b70e4b1945634501b009efa208307ea6a9edc9a923f97dc88f9f12d6b
+EBUILD xmedcon-0.21.1.ebuild 576 BLAKE2B bc98b360f93fb1457a36aea79b1d12649cb5b36875949bf45030bdb83fa3a57a08c18077ce87f6223f09770aea15ca7a21f474c56d1e7a6af90d8da4b98bc5b2 SHA512 fe5a31640318bc2245cddd8e06233d37c44eda93a538cfd8caf64c67a8dbc9b6b802e739b6e383b40b37b7f181555da81084ba7da4d21861b604a68a72a71d17
--- a/media-gfx/xmedcon/xmedcon-0.21.1.ebuild
+++ b/media-gfx/xmedcon/xmedcon-0.21.1.ebuild
@ -1,4 +1,4 @@
-EAPI=6
+EAPI=7
 DESCRIPTION="Medical Image Conversion Utility"
 HOMEPAGE="http://${PN}.sourceforge.net"
@ -10,8 +10,8 @@ SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE="png gtk"
-DEPEND="=x11-libs/gtk+-2*
+DEPEND="gtk? ( x11-libs/gtk+:3 )
-        png? ( >=media-libs/libpng-1.2.1 )
+        png? ( >=media-libs/libpng-1.6.0 )
 		dev-util/pkgconfig"
 src_configure() {
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@ -1,5 +0,0 @@
 AUX audacious-plugins-3.9-libcdio-1.0.0.patch 2123 SHA256 96a3099ef52c574fda3636633bceef04f2f896e7c7a5f0d2c48a8867b25bb237 SHA512 ad6dc10bc107c0e587caeb14dd4465339bfbbf9ed8ff9649e153f621993fe11ee1cdf57c5db46eaf6dcdad27308fc543c04a17cdda857ab16e7d9c2bbe89cb2d WHIRLPOOL 1712b8e27a9a7dfa396afbf3f564a44fa36e198c96b849a695ff2ad7366d1c4c51215b20173b3adaedaf1931680cf726ed17c1e931caf15c9cf5df136faf6b47
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 SHA256 2ad7ec156df316a26d77918b9258133a8c08cb2ae78565336cfddb5bd81993bd SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b WHIRLPOOL 576acdaa673d174e956dd17142e70f867d53aec1974660f62f5cb9edd5cd7def334e163384e549e4e8b2393724b3d0ac7c43c6018e1339764b6823689e12a657
 DIST audacious-plugins-3.9.tar.bz2 1843084 SHA256 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa WHIRLPOOL e0b7cb6a6fb97d7cd69be4d2efc7867bb8510e6ea94af84055e3c61ffb8b06e716f7ac30b961155d560f4e646b82c7df894a7024cfe68c0ee47c64b9e66e9665
 EBUILD audacious-plugins-3.9-r1.ebuild 4540 SHA256 4c9abca78f10ccc2c847fd60af9db24a58cbb19fd2115f7a49065d25c922a3d3 SHA512 2c89dbd2756b5915b31cb3a15e45e3e3982942be9d8bb5ada7fb27259e863bd247c90b92cbed091c305c89755530a5c0ea1ceda8f0eed2e560d943b55dff650f WHIRLPOOL c9319edb06e73024c0456a490f396d7ebc889db07076de1429a8b995d3381f3c598cf6e62a2fefe14d50ff9bb70cac750fb411a9449e88dd5dfc826f0f1dc6e5
 MISC metadata.xml 1428 SHA256 dad00cbbfbcd399a36aa7a4549b37e7bbfd09e4e3a20c0d18701f06802d635b2 SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d WHIRLPOOL 82a776cdb03df831e48827c31a54441c74f9395f37d7fc63d9842f7e07c5d131051770c0e81773e92ae8293f4a4c871dce313218ff616979c9c1944d2e5dbbfe
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild
@ -1,182 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 MY_P="${P/_/-}"
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
 HOMEPAGE="http://audacious-media-player.org/"
 inherit eutils
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
 	SRC_URI="
 		!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
 		gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
 	libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
 REQUIRED_USE="
 	^^ ( gtk gtk3 qt5 )
 	qt5? ( !libnotify )
 	|| ( alsa jack pulseaudio sdl )
 	ampache? ( qt5 http )"
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
 # Plugins without a configure option:
 #   alarm
 #   albumart
 #   delete-files
 #   ladspa
 #   playlist-manager
 #   search-tool
 #   skins
 #   vtx
 # Plugins with a configure option:
 #   glspectrum
 #   gtkui
 #   hotkey
 #   notify
 #   statusicon
 RDEPEND="
 	app-arch/unzip
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
 	~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
 	aosd? (
 		x11-libs/libXrender
 		x11-libs/libXcomposite
 	)
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		>=media-libs/libcddb-1.2.1
 		dev-libs/libcdio-paranoia
 	)
 	cue? ( media-libs/libcue )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/libvorbis-1.0
 		>=media-libs/flac-1.2.1-r1
 	)
 	fluidsynth? ( media-sound/fluidsynth )
 	http? ( >=net-libs/neon-0.26.4 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtmultimedia:5
 		dev-qt/qtwidgets:5
 		media-libs/adplug
 	)
 	jack? (
 		>=media-libs/bio2jack-0.4
 		media-sound/jack-audio-connection-kit
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
 	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	soxr? ( media-libs/soxr )
 	speedpitch? ( media-libs/libsamplerate:= )
 	vorbis? (
 		>=media-libs/libvorbis-1.2.0
 		>=media-libs/libogg-1.1.3
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
 	virtual/pkgconfig
 	nls? ( dev-util/intltool )"
 S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	if [[ ${PV} == *9999 ]]; then
 		git-r3_src_unpack
 	else
 		default
 		if use gtk3; then
 			mv "${MY_P}"{-gtk3,} || die
 		fi
 	fi
 }
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libcdio-1.0.0.patch
 	default
 	[[ ${PV} == *9999 ]] && eautoreconf
 }
 src_configure() {
 	if ! use mp3 ; then
 		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
 	fi
 	econf \
 		--enable-mpris2 \
 		--enable-songchange \
 		--disable-oss4 \
 		--disable-qtaudio \
 		--disable-qtglspectrum \
 		--disable-coreaudio \
 		--disable-sndio \
 		$(use_enable aac) \
 		$(use_enable alsa) \
 		$(use_enable ampache) \
 		$(use_enable aosd) \
 		$(use_enable bs2b) \
 		$(use_enable cdda cdaudio) \
 		$(use_enable cue) \
 		$(use_enable flac) \
 		$(use_enable fluidsynth amidiplug) \
 		$(use_enable flac filewriter) \
 		$(use_enable gme console) \
 		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable hotkeys hotkey) \
 		$(use_enable http neon) \
 		$(use_enable jack) \
 		$(use_enable gnome gnomeshortcuts) \
 		$(use_enable lame filewriter_mp3) \
 		$(use_enable libnotify notify) \
 		$(use_enable libsamplerate resample) \
 		$(use_enable lirc) \
 		$(use_enable mms) \
 		$(use_enable modplug) \
 		$(use_enable mp3 mpg123) \
 		$(use_enable nls) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable qt5 qt) \
 		$(use_enable scrobbler scrobbler2) \
 		$(use_enable sdl sdlout) \
 		$(use_enable sid) \
 		$(use_enable sndfile) \
 		$(use_enable soxr) \
 		$(use_enable speedpitch) \
 		$(use_enable vorbis) \
 		$(use_enable wavpack) \
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
 }
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-libcdio-1.0.0.patch
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-libcdio-1.0.0.patch
@ -1,48 +0,0 @@
 diff -ur audacious-plugins-3.9.orig/src/cdaudio/cdaudio-ng.cc audacious-plugins-3.9/src/cdaudio/cdaudio-ng.cc
 --- audacious-plugins-3.9.orig/src/cdaudio/cdaudio-ng.cc	2017-08-20 03:47:43.000000000 +0200
 +++ audacious-plugins-3.9/src/cdaudio/cdaudio-ng.cc	2017-11-26 20:57:29.554579385 +0100
@@ -33,7 +33,7 @@
 #include <cdio/sector.h>
 #include <cdio/cd_types.h>
 -#if LIBCDIO_VERSION_NUM >= 90
 +#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
 #include <cdio/paranoia/cdda.h>
 #else
 #include <cdio/cdda.h>
@@ -540,7 +540,7 @@
     if (aud_get_bool ("CDDA", "use_cdtext"))
     {
         AUDDBG ("getting cd-text information for disc\n");
 -#if LIBCDIO_VERSION_NUM >= 90
 +#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
         pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
         if (pcdtext == nullptr)
 #else
@@ -552,7 +552,7 @@
         }
         else
         {
 -#if LIBCDIO_VERSION_NUM >= 90
 +#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
             trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
             trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
             trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
@@ -568,7 +568,7 @@
     bool cdtext_was_available = false;
     for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
     {
 -#if LIBCDIO_VERSION_NUM < 90
 +#if LIBCDIO_VERSION_NUM < 90 && LIBCDIO_VERSION_NUM != 1
         if (aud_get_bool ("CDDA", "use_cdtext"))
         {
             AUDDBG ("getting cd-text information for track %d\n", trackno);
@@ -583,7 +583,7 @@
         if (pcdtext != nullptr)
         {
 -#if LIBCDIO_VERSION_NUM >= 90
 +#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
             trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
             trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
             trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@ -1,28 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
 		<flag name="adplug">Build with AdPlug (Adlib sound card emulation) support</flag>
 		<flag name="ampache">Support controlling audacious via <pkg>www-apps/ampache</pkg></flag>
 		<flag name="aosd">Enable support for Audacious OSD</flag>
 		<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural headphone filter</flag>
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
 		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
 		<flag name="hotkeys">Enable support for controlling via hotkeys</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
 		<flag name="speedpitch">Enable speed/pitch effects</flag>
 	</use>
 </pkgmetadata>
--- a/media-tv/concordance/Manifest
+++ b/media-tv/concordance/Manifest
@ -0,0 +1,3 @@
 DIST concordance-1.4.tar.gz 122724 BLAKE2B c4fb2ef81956a252509a3acfe41d3d48416a2fb09384c1481d67ed3f63b140731222cdd71c7ce15681e8f82ab253efabf0b465fb440d45a74ad0e153665ac8f6 SHA512 bf4645791f35e9328a72b56c2cf20be30980e9f70379be0e24494b0f86e14869ff86d789f0e90341f5ab0abc6e747f91d3bc0ec20f730c33473fc54c39cf543b
 EBUILD concordance-1.4.ebuild 1096 BLAKE2B 4f6976ece318e60028f8b75001a49e2a1babd0398112e01c382fa88e8361b7939d490abd2f214c02be250d9fbf6c1b0f82d97efce69ee8c2564e96d3f106080b SHA512 2f55417b30ef921822a64b8db5e8cb484281932c8098d88484abe77198591f5fd02eaea6e1b6311aebf30fa35eea2c62418a9994afaa4b402ed4a9152000a163
 MISC metadata.xml 270 BLAKE2B a2fd019fbbbf3a66f2811f37c069b931997535afe955daf6c9040195fb9ee0af3250fd07344c0f5dfec502ab314d5e7a34b15589211083b990ebb533c7168719 SHA512 d8e48d8e3c8bb53761f9ecc45bdcbc6fa0e5eb93052d454c94b4efb6f24efff37406a94e142931b423fb7b907324ecf69d8ef30e108a341eef7552427a16bd8d
--- a/app-misc/concordance/concordance-0.24.ebuild
+++ b/app-misc/concordance/concordance-0.24.ebuild
@ -1,30 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI=4
+EAPI=7
 inherit autotools
 DESCRIPTION="Linux client for programming the Logitech Harmony universal remote"
-HOMEPAGE="http://www.phildev.net/concordance/"
+HOMEPAGE="https://www.phildev.net/concordance"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://github.com/jaymzh/concordance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64"
 IUSE=""
-RDEPEND="~dev-libs/libconcord-${PV}"
+DEPEND="=dev-libs/libconcord-${PV}"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 S="${WORKDIR}/${P}/${PN}"
-src_compile() {
+src_prepare() {
-	emake DESTDIR="${D}" || die "make failed"
+	default
 	eautoreconf
 }
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
-	dodoc ../Changelog ../LICENSE README
+
 	dodoc ../README.md
 	dodoc ../Changelog ../TODO
 }
 pkg_postinst() {
--- a/media-tv/concordance/metadata.xml
+++ b/media-tv/concordance/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+    <maintainer type="person">
-<email>gentoo@tk-webart.de</email>
+        <email>bertrand@jacquin.bzh</email>
-<name>Torsten Kurbad</name>
+        <name>Bertrand Jacquin</name>
    </maintainer>
 </pkgmetadata>
--- a/media-tv/congruity/Manifest
+++ b/media-tv/congruity/Manifest
@ -0,0 +1,3 @@
 DIST congruity-20.tar.bz2 203861 BLAKE2B c35c1c3cebc24e7a24361194b6af633e943a2abac82dc496258b04a398bc467d42d848e632a35e39684efd203f250aba254ff0f6bdc7c9e050987522a7de81d7 SHA512 64b07fe427a4589044bf89c546482003a2f173f59563c6207d3290c5be2b1c99d95ffa92e6c196de6a68e22d9abb4a31a09840a672920ecec303ba1473351c55
 EBUILD congruity-20.ebuild 794 BLAKE2B a15e922b0e4302221b65f167aa3da86fbdff929918e2e72a3e2a87640e27d0c1276919dfbf6f612daa57476ebc1242456c0e9b3c771365bcf92f78d12bfaf030 SHA512 be49926a3a776f6ec7d50111f1ac4ac5fa508988cc395585a138c61d0b2e5e93d13ba8ca1738d4ac44de2ea54ccdd5690a7c6857450388119882cfb7dfcc0a0f
 MISC metadata.xml 270 BLAKE2B a2fd019fbbbf3a66f2811f37c069b931997535afe955daf6c9040195fb9ee0af3250fd07344c0f5dfec502ab314d5e7a34b15589211083b990ebb533c7168719 SHA512 d8e48d8e3c8bb53761f9ecc45bdcbc6fa0e5eb93052d454c94b4efb6f24efff37406a94e142931b423fb7b907324ecf69d8ef30e108a341eef7552427a16bd8d
--- a/media-tv/congruity/congruity-20.ebuild
+++ b/media-tv/congruity/congruity-20.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1 xdg-utils
 DESCRIPTION="GUI application for programming Logitech Harmony"
 HOMEPAGE="https://sourceforge.net/projects/congruity"
 SRC_URI="mirror://sourceforge/congruity/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 DEPEND="
 	dev-python/wxpython:4.0[${PYTHON_USEDEP}]
 	>=dev-libs/libconcord-1.3[python,${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.7[${PYTHON_USEDEP}]
 	app-crypt/libsecret
 	dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 python_install() {
 	distutils-r1_python_install \
 		--skip-update-desktop-db
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 }
--- a/media-tv/congruity/metadata.xml
+++ b/media-tv/congruity/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+    <maintainer type="person">
-<email>gentoo@tk-webart.de</email>
+        <email>bertrand@jacquin.bzh</email>
-<name>Torsten Kurbad</name>
+        <name>Bertrand Jacquin</name>
    </maintainer>
 </pkgmetadata>
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@ -1,3 +0,0 @@
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
 EBUILD avidemux-2.6.20.ebuild 4298 SHA256 09a12e1f571b633688d0f6894d3d8e209e2a284e1fa124e1807158cc28afe615 SHA512 bff5799b66b86b61b61860bbd48c0b14927f25089baec22629f09e322bb1426870bf1098ac0f083d9f476cbcb6fa6f130a8d31ee139cea6ccfbc365710af38a5 WHIRLPOOL 4842dd38d690ca03eb3309e28be56cedbced86be5bf244a0a5a24a224b55078dcdf542a8b07247ae825e0a59a5013ebb1ef898fdd5226a557c1ed6a502aa88f7
 MISC metadata.xml 489 SHA256 cea0a7554482097ce99fec34fb6abb767c09620acf42d23842285d4efb4ae9f3 SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d WHIRLPOOL f00dfaf7eeaaa1302955b696309f4d3b75ea64b483b0bca62098cb36a1edd4b49fa40043df1968bc6ca2100a085819e105b183e375575bc7a2c73b57170f68a5
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@ -1,161 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
 inherit cmake-utils l10n xdg-utils
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/${PN}"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.6"
 IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv"
 if [[ ${PV} == *9999* ]] ; then
 	MY_P="${P}"
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
 	inherit git-r3
 else
 	MY_P="${PN}_${PV}"
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	opengl? ( virtual/opengl:0 )
 	qt5? ( dev-qt/qtgui:5 )
 	vaapi? ( x11-libs/libva:0 )
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 "
 RDEPEND="
 	$DEPEND
 	nls? ( virtual/libintl:0 )
 "
 PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	processes="buildCli:avidemux/cli"
 	if use qt5 ; then
 		processes+=" buildQt4:avidemux/qt4"
 	fi
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
 	done
 	# Fix icon name -> avidemux-2.6.png
 	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
 	# The desktop file is broken. It uses avidemux2 instead of avidemux3
 	# so it will actually launch avidemux-2.5 if it is installed.
 	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
 	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
 	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
 	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
 	# Now rename the desktop file to not collide with 2.5.
 	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
 	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
 	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
 }
 src_configure() {
 	# Add lax vector typing for PowerPC.
 	if use ppc || use ppc64 ; then
 		append-cflags -flax-vector-conversions
 	fi
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 	# The build relies on an avidemux-core header that uses 'nullptr'
 	# which is from >=C++11.  Let's use the GCC-6 default C++ dialect.
 	append-cxxflags -std=c++14
 	local mycmakeargs=(
 		-DAVIDEMUX_SOURCE_DIR='${S}'
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
 		-DLIBVA="$(usex vaapi)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
 	)
 	if use qt5 ; then
 		mycmakeargs+=( -DENABLE_QT5="$( usex qt5 )" )
 		export QT_SELECT=5
 	fi
 	if use debug ; then
 		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 	fi
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
 		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
 	done
 }
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
 		BUILD_DIR="${build}" cmake-utils_src_compile
 	done
 }
 src_test() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
 		BUILD_DIR="${build}" cmake-utils_src_test
 	done
 }
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
 		BUILD_DIR="${build}" cmake-utils_src_install
 	done
 	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
 		fperms +x /usr/bin/avidemux3_cli
 	fi
 	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
 		fperms +x /usr/bin/avidemux3_jobs
 	fi
 	cd "${S}" || die "Can't enter source folder."
 	newicon ${PN}_icon.png ${PN}-2.6.png
 	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_qt5
 	fi
 	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_jobs_qt5
 	fi
 	if use qt5 ; then
 		domenu ${PN}-2.6.desktop
 	fi
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 }
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@ -1,14 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>media-video@gentoo.org</email>
    <name>Gentoo Video project</name>
  </maintainer>
  <use>
    <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
  </use>
  <upstream>
    <remote-id type="sourceforge">avidemux</remote-id>
  </upstream>
 </pkgmetadata>
--- a/media-video/avinfo/Manifest
+++ b/media-video/avinfo/Manifest
@ -1,3 +0,0 @@
 DIST avinfo-1.0.a15unix-patch1.tar.gz 5665 SHA256 b239c7a414dc92e4a6d3881801e981e71f66242d0e38ffae774a3a0f8c8bdf81 SHA512 9219d7b4a92cc776979b9332cfb286781e4cfada5280bb145377a4d51078895368392fef7c4ff24dc714101617f4aaa0916fd5c19897919af0dfa78f3765a457 WHIRLPOOL 01dbc6622363f427bf4d0139d1f5c7131b6c3310007a36cdbfcf5c3911e9caffe7b4cc61d840472d61b6bdb1a336a6d59c784f99dde200b7a2864f7f80d01e3d
 DIST avinfo-1.0.a15unix.tar.gz 105743 SHA256 3e3404a76e6057c1703e0c49b63910a8ffcb5ea15ae7b2d0a7d2ede4b4c19887 SHA512 984bb2e8916c1469206163ef9fa37f89d71a842a94a1ebf5a92ded410de4aacaf83d77d790f70624431d5c60305951a3cfbdea075fc2705bbd28250f9f9ade2e WHIRLPOOL 5f93c9b120b037014aef8d6e0268e76fed0197a6d4db2c6f30ec128ad9e4272e037e906dc2335f4951a6b6db2c87860c951753726488193dfacb74ca7274e553
 EBUILD avinfo-1.0_alpha15_p1.ebuild 950 SHA256 457dce5108daaa42c7e26bef3f41b5eae0da409ae14f8cdabb6aefdc76de8f26 SHA512 81c938eb64c3eb7012cf7d0713b99a5fb46ba2d8565d420934d0b36c5a8135085cba54f8c89fd5650eff9f3731461baf34e63240bac250ed7da1e7234c82a9e8 WHIRLPOOL de34fabd03981274a5d8a9b95a5f4b06bcb41b71b68872ae02961c65d0593b59c33504e4fac9ed229a2b248280c3e408afbb70c8428748da76bb72ad9b6647d2
--- a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild
+++ b/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild
@ -1,38 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild,v 1.2 2011/11/20 21:32:44 radhermit Exp $
 EAPI=6
 inherit eutils toolchain-funcs
 MY_P=${PN}-1.0.a15unix
 DESCRIPTION="Utility for displaying AVI information"
 HOMEPAGE="http://shounen.ru/soft/avinfo/english.shtml"
 SRC_URI="http://shounen.ru/soft/${PN}/${MY_P}.tar.gz
 	http://shounen.ru/soft/${PN}/${MY_P}-patch1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 S="${WORKDIR}"/${PN}-1.0.a15
 src_prepare() {
 	default
 	epatch "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff
 	sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die
 }
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 src_install() {
 	dobin src/avinfo
 	doman src/avinfo.1
 	dodoc CHANGELOG README "${WORKDIR}"/${MY_P}-patch1/FIXES
 	dodoc doc/*
 }
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@ -1,2 +0,0 @@
 DIST devedeng-4.4.0.tar.gz 1882418 SHA256 29c4c66fa23d0386aa9220ad331b0863d3dc897b43b08de023a64ef4405325b9 SHA512 7c820f8dfb1408e9c7d5167b73e34e729e4731bdc2708939920fcc3f0f0d1161618813072f6808959975da40548cd9032516223887bdf70ea41976f28598c08a WHIRLPOOL d8de694cfc46d137791648beae4ef698c07ee81153d68cde25e956672dd5a0b549e4650fb8f2bb653244e0b2b775f1f0119a118130afc60c25b161181d14e068
 EBUILD devedeng-4.4.0.ebuild 839 SHA256 67cb166b564607681c1c02cdec46450a27a6969b43d5074b618a3c235305935f SHA512 4457c61b549666cefb8e054cc75e1d96c1b3e720efada298a3f0d2faae15db84de211549d5bae77da8ba66af93121528bb2cf0425c557f4f2f6b62e48b44d1e7 WHIRLPOOL c7327711720822d021c78dc8d85a5c5a24e13c69546e59c89c2614e252ed05e32eb677f854f38f3a5f5fdcb3543fa8188c221ee1f05097a8f601d2ed525d5363
--- a/media-video/devedeng/devedeng-4.4.0.ebuild
+++ b/media-video/devedeng/devedeng-4.4.0.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python3_4 )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
 HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
 SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libav"
 RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3
 	|| ( media-video/vlc media-video/mpv media-video/mplayer )
 	!libav? ( media-video/ffmpeg )
 	libav? ( media-video/libav )
 	media-video/dvdauthor
 	media-video/vcdimager
 	virtual/cdrtools
 	|| ( app-cdr/brasero app-cdr/k3b )"
 DEPEND="${PYTHON_DEPS}"
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@ -1,4 +0,0 @@
 AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 SHA256 65798b9c6070d53957d46b0cac834e1ab9bd4014fab50773ac83b4d1babe00a6 SHA512 b49e8742627b6e0d56efd455230f78cb49a3337a376da39d9b77869835c1d34b8f4a826ae0f888fe0f81ce011a3f0e6dcf52479c34813594129fb2916c782c57 WHIRLPOOL 4310ce8d881f29f4185a9fc7aa6c8cd280bd4ecbc09a98f0517ba4c9b1b50d02a29481768f3cd40976482d7a30dc3c4b137b4d63415f930cbcb42ef3770ea352
 DIST vcdimager-0.7.24.tar.gz 1066815 SHA256 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214 WHIRLPOOL b94f3937415ec1b178484adfc653b1846e9f52ed95fd0677fa5f7b077b345f4cbd3b11526bb9b9011b76f74a916644e9d60dec3ce37571ed97523db04cb5ec42
 EBUILD vcdimager-0.7.24.ebuild 1469 SHA256 752485f477184fca70d9566332797ae9a631c0030d24f9e70db48ef81ffa750e SHA512 c354a833d0558bd0f057ec5667aee3ecb97890de50c2cc55db23b9ce1f98e5034c49c26d4ad50719c60132e4656721211f0810d54226972f89ecb7b40fba4e24 WHIRLPOOL 672f68af2a98acf5d45909f17e393027b14def6019e4b61f332b064985162e652a6ef3207c519bfbd9a09efe512728afc69a56925e0a9f68f8721a8ced5e8703
 MISC metadata.xml 223 SHA256 7d0451c70b262d8928fbd11c938e6b5663794345ad10f7be8533ab42b521e42c SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db WHIRLPOOL 0b20f52f85830d008257e03325b74780038fc6e0bf6cc3917aa7f0d8621673c87bebcf201ca0cd876276febe9fcf785fe8f80de1889f2009fdd5bd05c2615d17
--- a/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
+++ b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
@ -1,230 +0,0 @@
 diff --git a/frontends/xml/vcd_xml_rip.c b/frontends/xml/vcd_xml_rip.c
 index 3d28065..f1be95d 100644
 --- a/frontends/xml/vcd_xml_rip.c
 +++ b/frontends/xml/vcd_xml_rip.c
@@ -769,7 +769,7 @@ _visit_lot (pbc_ctx_t *p_pbc_ctx)
       _visit_pbc (p_pbc_ctx, n + 1, tmp, true);
   _vcd_list_sort (p_pbc_ctx->offset_list, 
 -		  (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
 +		  (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
 }
 static int
 diff --git a/include/libvcd/info.h b/include/libvcd/info.h
 index 2d70940..b62d541 100644
 --- a/include/libvcd/info.h
 +++ b/include/libvcd/info.h
@@ -455,12 +455,12 @@ extern "C" {
   /*!
     Get the VCD info list.
   */
 -  CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
 +  CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
   /*!
     Get the VCD info extended offset list.
   */
 -  CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
 +  CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
   /*!
     Get the VCD info offset multiplier.
 diff --git a/lib/data_structures.c b/lib/data_structures.c
 index 4415ae1..cef7381 100644
 --- a/lib/data_structures.c
 +++ b/lib/data_structures.c
@@ -58,7 +58,7 @@ struct _CdioListNode
 /* impl */
 static bool
 -_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
 +_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
 {
   CdioListNode_t **pp_node;
   bool changed = false;
@@ -86,7 +86,7 @@ _bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
   return changed;
 }
 -void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func)
 +void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
 {
   /* fixme -- this is bubble sort -- worst sorting algo... */
@@ -263,7 +263,7 @@ _vcd_tree_node_sort_children (VcdTreeNode_t *p_node,
   vcd_assert (p_node != NULL);
   if (p_node->children)
 -    _vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func);
 +    _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
 }
 void
 diff --git a/lib/data_structures.h b/lib/data_structures.h
 index d0932a9..eb5ba48 100644
 --- a/lib/data_structures.h
 +++ b/lib/data_structures.h
@@ -28,7 +28,7 @@
 CdioListNode_t *_vcd_list_at (CdioList_t *list, int idx);
 -void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func);
 +void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func);
 /* n-way tree */
 diff --git a/lib/dict.h b/lib/dict.h
 index c3e2ce3..fa003f6 100644
 --- a/lib/dict.h
 +++ b/lib/dict.h
@@ -88,7 +88,7 @@ _dict_get_bykey (VcdObj_t *obj, const char key[])
   vcd_assert (key != NULL);
   node = _cdio_list_find (obj->buffer_dict_list,
 -			  (_cdio_list_iterfunc) _dict_key_cmp,
 +			  (_cdio_list_iterfunc_t) _dict_key_cmp,
 			  (char *) key);
   if (node)
@@ -106,7 +106,7 @@ _dict_get_bysector (VcdObj_t *obj, uint32_t sector)
   vcd_assert (sector != SECTOR_NIL);
   node = _cdio_list_find (obj->buffer_dict_list, 
 -			  (_cdio_list_iterfunc) _dict_sector_cmp, 
 +			  (_cdio_list_iterfunc_t) _dict_sector_cmp, 
 			  &sector);
   if (node)
 diff --git a/lib/files.c b/lib/files.c
 index 79fa8fe..61e8077 100644
 --- a/lib/files.c
 +++ b/lib/files.c
@@ -634,7 +634,7 @@ get_search_dat_size (const VcdObj_t *p_vcdobj)
     + (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));
 }
 -static CdioList *
 +static CdioList_t *
 _make_track_scantable (const VcdObj_t *p_vcdobj)
 {
   CdioList_t *p_all_aps = _cdio_list_new ();
 diff --git a/lib/image_bincue.c b/lib/image_bincue.c
 index 69091b3..4e4d460 100644
 --- a/lib/image_bincue.c
 +++ b/lib/image_bincue.c
@@ -88,7 +88,7 @@ _sink_free (void *user_data)
 }
 static int
 -_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
 +_set_cuesheet (void *user_data, const CdioList_t *vcd_cue_list)
 {
   _img_bincue_snk_t *_obj = user_data;
   CdioListNode_t *node;
@@ -102,7 +102,7 @@ _set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
   track_no = 0;
   index_no = 0;
 -  _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
 +  _CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list)
     {
       const vcd_cue_t *_cue = _cdio_list_node_data (node);
       char *psz_msf;
 diff --git a/lib/info_private.c b/lib/info_private.c
 index 648ef27..53edff7 100644
 --- a/lib/info_private.c
 +++ b/lib/info_private.c
@@ -136,7 +136,7 @@ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj)
       ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
   _vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list, 
 -                  (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
 +                  (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
   /* Now really complete the offset table with LIDs.  This routine
      might obviate the need for vcdinf_visit_pbc() or some of it which is
 diff --git a/lib/mpeg.h b/lib/mpeg.h
 index 0425db6..7df668a 100644
 --- a/lib/mpeg.h
 +++ b/lib/mpeg.h
@@ -103,7 +103,7 @@ typedef struct {
       unsigned vbvsize;
       bool constrained_flag;
 -      CdioList *aps_list; /* filled up by vcd_mpeg_source */
 +      CdioList_t *aps_list; /* filled up by vcd_mpeg_source */
       double last_aps_pts; /* temp, see ->packet */
     } shdr[3];
 diff --git a/lib/mpeg_stream.c b/lib/mpeg_stream.c
 index 8384780..2ee3f41 100644
 --- a/lib/mpeg_stream.c
 +++ b/lib/mpeg_stream.c
@@ -270,7 +270,7 @@ vcd_mpeg_source_scan (VcdMpegSource_t *obj, bool strict_aps, bool fix_scan_info,
 }
 static double
 -_approx_pts (CdioList *aps_list, uint32_t packet_no)
 +_approx_pts (CdioList_t *aps_list, uint32_t packet_no)
 {
   double retval = 0;
   CdioListNode_t *node;
@@ -324,7 +324,7 @@ _set_scan_msf (msf_t *_msf, long lsn)
 static void 
 _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
 -                unsigned packet_no, double pts, CdioList *aps_list)
 +                unsigned packet_no, double pts, CdioList_t *aps_list)
 {
   CdioListNode_t *node;
   long _next = -1, _prev = -1, _forw = -1, _back = -1;
 diff --git a/lib/vcd.c b/lib/vcd.c
 index 4936c09..b1545a0 100644
 --- a/lib/vcd.c
 +++ b/lib/vcd.c
@@ -583,7 +583,7 @@ vcd_obj_add_sequence_pause (VcdObj_t *obj, const char sequence_id[],
   }
   _vcd_list_sort (p_sequence->pause_list, 
 -                  (_cdio_list_cmp_func) _pause_cmp);
 +                  (_cdio_list_cmp_func_t) _pause_cmp);
   vcd_debug ("added autopause point at %f", pause_time);
@@ -623,7 +623,7 @@ vcd_obj_add_segment_pause (VcdObj_t *p_obj, const char segment_id[],
   }
   _vcd_list_sort (_segment->pause_list, 
 -                  (_cdio_list_cmp_func) _pause_cmp);
 +                  (_cdio_list_cmp_func_t) _pause_cmp);
   vcd_debug ("added autopause point at %f", pause_time);
@@ -685,7 +685,7 @@ vcd_obj_add_sequence_entry (VcdObj_t *p_obj, const char sequence_id[],
   }
   _vcd_list_sort (p_sequence->entry_list, 
 -                  (_cdio_list_cmp_func) _entry_cmp);
 +                  (_cdio_list_cmp_func_t) _entry_cmp);
   return 0;
 }
@@ -1001,7 +1001,7 @@ vcd_obj_add_dir (VcdObj_t *p_obj, const char iso_pathname[])
   _cdio_list_append (p_obj->custom_dir_list, _iso_pathname);
   _vcd_list_sort (p_obj->custom_dir_list, 
 -                  (_cdio_list_cmp_func) strcmp);
 +                  (_cdio_list_cmp_func_t) strcmp);
   return 0;
 }
@@ -2290,7 +2290,7 @@ vcd_obj_write_image (VcdObj_t *p_obj, VcdImageSink_t *p_image_sink,
   /* start with meta info */
   {
 -    CdioList *p_cue_list;
 +    CdioList_t *p_cue_list;
     vcd_cue_t *p_cue;
     p_cue_list = _cdio_list_new ();
--- a/media-video/vcdimager/metadata.xml
+++ b/media-video/vcdimager/metadata.xml
@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit eutils multilib-minimal
 DESCRIPTION="GNU VCDimager"
 HOMEPAGE="http://www.vcdimager.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+xml static-libs"
 RDEPEND="
 	>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
 	dev-libs/popt
 	xml? ( dev-libs/libxml2:2 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
 src_prepare() {
 	# Avoid building useless programs. Bug #226249
 	sed -i \
 		-e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
 		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
 		test/Makefile.in || die
 	sed -i \
 		-e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
 		example/Makefile.in || die
 	epatch "${FILESDIR}"/$P-libcdio-1.0.0.patch
 }
 multilib_src_configure() {
 	# We disable the xmltest because the configure script includes differently
 	# than the actual XML-frontend C files.
 	local myconf
 	if use xml && multilib_is_native_abi ; then
 		myconf="--with-xml-prefix=${EPREFIX}/usr --disable-xmltest"
 	else
 		myconf="--without-xml-frontend"
 	fi
 	multilib_is_native_abi || myconf="${myconf} --without-cli-frontend"
 	ECONF_SOURCE="${S}" \
 		econf $(use_enable static-libs static) ${myconf}
 }
 multilib_src_install_all() {
 	prune_libtool_files
 	einstalldocs
 }
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@ -1,12 +1,10 @@
 AUX flexget-2.10.35-guessit.patch 559 BLAKE2B fc5a9348c77f298c0919c532d741c196f3ee3548eb667c277595760deb6465c1bfe4089f0bf545a0115f788d7c170bd9f3c93709f4a2769ffba0ce0827d2f990 SHA512 e10aef03cdaf5e1c9839c8c165776c613ffeb007d68f5d030c2ae648a4b7452694194cff0774365df3475c2f780d84b0d2b5c8515e48263e46766580e07caef0
 AUX flexget.service 415 BLAKE2B d3900ecde223345364ca33bcf7d8fa8695b61dfd6f101b7a93d330294581b55e98adcb0b9b779d54fd201dfee64312edec29835f55e57b8517924dc545c2ca78 SHA512 96c413e85acb7d31a390446833b6c861fc72c175e1d9f6fbe73037d25b57bc7e2d6ae82fed9faddbf2a18dfbf706b8ef0e0df32ae480ee5dfee4fca49c62de6b
 DIST FlexGet-3.1.10.tar.gz 9771981 BLAKE2B a023a9281a73fb0040c9d28fece50696a884182b53d52599f0ee4539305174e72bb123e15df83d0f756897e0ce5ad245071786667250dda6198a86509716919e SHA512 6e9ec520cddd8df86daf6c854be08e07101ff19c749292893091709fc769a915b638dfcdf3852270dffe7fa5238e6e9b620111171d993dd23d0d23fa5734b661
 DIST FlexGet-3.1.100.tar.gz 8598546 BLAKE2B 2ece2b4666ecf6b2b93f32232f5b5f9f386b5ee70bf44a8e89973eb0de10a8d552d66921c78e783d481baaa4a4ccd0586647d14aec74997634f74c1b38c685fa SHA512 b27473b4440f9f8ae66f345cc0bd4b0343bbb1b2db38774d73e42a5827530d7039652b9ea40dba040d3458540e65d6dc103a8a846bc67e3b428e9b93485040ee
 DIST FlexGet-3.1.106.tar.gz 8599599 BLAKE2B 240bbe48916bade1a49a6f1d44df3c644c406ac8f6e025c84ffd3f975b8799ca1ef28897e5467cf609251e402a93c5eca0def68bd8401ef6dc4be086e2e991ed SHA512 cf19c8ce0665e72257f120a4cf208c06483a1ed5ad6ef3e3d6c778e8897e0c5db4cf337f7a03893a1be22c4993f81146532fa60a466f62e67e96409223013acf
 DIST FlexGet-3.1.128.tar.gz 8621930 BLAKE2B 76c179bdeaa14957f7d679443700cc22e4f561ff9f20747dcc553c007e8bccd98f6128ec10700e459629da5b1536bd342d3d1e6a72183b039878b84cfdfac46b SHA512 2ed4e52bb7a03307a0a97ee6c2a1077d3c44ac4e0606201aea6ce31354aec6798df1b5b8d3260f75ca293d322500cebc1806c0dacb144a252e5efd98debf4f49
 DIST FlexGet-3.1.48.tar.gz 8579168 BLAKE2B e741aea505aca635fb9d9e5518e19d21162a5fc34196cf277c3c045d987df4e032ee97fc64a543db44007334062a7aa270e79944a15d35c31d81e7b9f39e2a68 SHA512 e88d1bcec6f5e41aace79d010e66d1a3ead44ef950244a7d00be319950aa961af0346774c9034a29e4d40835741870b68da1c9dbc360eb8ba303b60de9f383ce
 DIST FlexGet-3.1.70.tar.gz 8594444 BLAKE2B 64814bb87ae208ca1020e2491c09dbce343b1afda76beb7a157021f0cb62dd87b24c70176969931974431641f258bf2caeabf982cce2131edbcbff2c862a727c SHA512 977187497abda6ebccfefff8e7cdafa6ed828042f7457b9f62b84e7b4a4aba932a4d99df57b6da065a2a355170c48e3de9de9427b2f190c4db088c20581ebfed
 EBUILD flexget-3.1.10.ebuild 6484 BLAKE2B 785094de081c42490a8cca366cd410af70a843fe0eb37fea991dd85a986e87727e5de92cc49320c8b7e83f1b12e5f9c3ee449fdb07115f1a1290474db6cdf641 SHA512 fbf2574b26305f594c005bc819243f9d5f9b640e5b396e2228f4d321a0b683437876f23b26fd943e137987f8ad6a50c4fc52247875de3c5c368d73e611393a38
 EBUILD flexget-3.1.100.ebuild 7468 BLAKE2B 63832eb753fd023feb9ceb2acde44db5c2feece538c8467f95f412e0824e917ace19375afdbb1419c063658853cb772c9bcf5bc6da71ab0fe5acaad7cd676be2 SHA512 5add6137e6b72e56cff56a15bf1b2718828d37af89aebe3c4533878b4adfdecb09346d90ce195f613d28b362a1a371edb30120328fbd2949c9afd9c58b822744
 EBUILD flexget-3.1.106.ebuild 7698 BLAKE2B 9c5fcb77d8350b4334967035fab0fa2bc7409af9a0380faf160f3e3ae0543320e958c66792698066c715f5d713f612b98aa2daff4724e6761239c08d0fafbe48 SHA512 a2bcf7ade15d5291e0e41886b3af823ecdf2896c29c5f67c44ed6d44d64e79923c169e374b4c298ff76c64898851fbb2709b4c4573b7e19e91df37a3330bf598
 EBUILD flexget-3.1.128.ebuild 8013 BLAKE2B b4d33ac21ac98a93aec76708f2f0d0224e230205ce3ec77d40cd9157a3880051c7b2393d6b0273f7acfb729c10bf6d1245b1b7db68957ae5709dc98115396a8b SHA512 7b90d266862f5408a439b3f4e6b36eb40cd5c305533752d73277a346baea8c4509facbd8ed1c640d3c963353731a51249870143936582f7f255e8bed5477c706
--- a/net-misc/flexget/flexget-3.1.10.ebuild
+++ b/net-misc/flexget/flexget-3.1.10.ebuild
@ -1,153 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy{,3} )
 inherit distutils-r1 eutils systemd user
 if [[ ${PV} != 9999 ]]; then
 	MY_P="FlexGet-${PV}"
 	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
 		https://github.com/Flexget/Flexget.git"
 fi
 DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
 HOMEPAGE="http://flexget.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE="systemd test transmission"
 RESTRICT="nomirror"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	~dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
 	=dev-python/APScheduler-3.5.3[${PYTHON_USEDEP}]
 	~dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
 	=dev-python/beautifulsoup-4.8.2:4[${PYTHON_USEDEP}]
 	=dev-python/certifi-2019.11.28[${PYTHON_USEDEP}]
 	~dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
 	~dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
 	~dev-python/cherrypy-18.1.0[${PYTHON_USEDEP}]
 	~dev-python/click-7.0[${PYTHON_USEDEP}]
 	~dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
 	~dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
 	~dev-python/flask-1.1.1[${PYTHON_USEDEP}]
 	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
 	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
 	=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
 	=dev-python/flask-restful-0.3.7[${PYTHON_USEDEP}]
 	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
 	=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
 	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
 	~dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
 	~dev-python/jaraco-functools-3.0.0[${PYTHON_USEDEP}]
 	~dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
 	~dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	~dev-python/loguru-0.4.1[${PYTHON_USEDEP}]
 	~dev-python/markupsafe-1.1.1[${PYTHON_USEDEP}]
 	~dev-python/more-itertools-7.0.0[${PYTHON_USEDEP}]
 	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
 	~dev-python/portend-2.6[${PYTHON_USEDEP}]
 	~dev-python/progressbar-2.5[${PYTHON_USEDEP}]
 	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
 	~dev-python/pyparsing-2.4.0[${PYTHON_USEDEP}]
 	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
 	~dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
 	=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP}]
 	=dev-python/rebulk-2.0.0[${PYTHON_USEDEP}]
 	~dev-python/requests-2.22.0[${PYTHON_USEDEP}]
 	=dev-python/rpyc-4.0.2[${PYTHON_USEDEP}]
 	=dev-python/six-1.14.0[${PYTHON_USEDEP}]
 	=dev-python/soupsieve-1.9.5[${PYTHON_USEDEP}]
 	=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]
 	=dev-python/tempora-1.8[${PYTHON_USEDEP}]
 	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
 	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
 	=dev-python/urllib3-1.25.8[${PYTHON_USEDEP}]
 	~dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
 	~dev-python/werkzeug-0.16.0[${PYTHON_USEDEP}]
 	=dev-python/zc-lockfile-2.0[${PYTHON_USEDEP}]
 	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
 "
 DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 if [[ ${PV} == 9999 ]]; then
 	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
 else
 	S="${WORKDIR}/${MY_P}"
 fi
 python_test() {
 	cp -lr tests setup.cfg "${BUILD_DIR}" || die
 	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
 		|| die "Tests fail with ${EPYTHON}"
 }
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 ${PN}
 }
 src_prepare() {
 	distutils-r1_src_prepare
 	sed -i -e "s/^aniso8601==1.2.1/aniso8601==4.0.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^apscheduler==3.5.0/apscheduler==3.5.3/" ${S}/requirements.txt || die
 	#sed -i -e "s/^beautifulsoup4==4.6.0/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
 	sed -i -e "s/^certifi==2017.4.17/certifi==2019.11.28/" ${S}/requirements.txt || die
 	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
 	#sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^cherrypy==18.4.0/cherrypy==18.1.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^click==6.7/click==7.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^flask==1.0.2/flask==1.1.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^flask-restful==0.3.6/flask-restful==0.3.7/" ${S}/requirements.txt || die
 	#sed -i -e "s/^future==0.16.0/future==0.17.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
 	#sed -i -e "s/^idna==2.5/idna==2.8/" ${S}/requirements.txt || die
 	#sed -i -e "s/^importlib-metadata==0.8/importlib-metadata==0.23/" ${S}/requirements.txt || die
 	sed -i -e "s/^itsdangerous==0.24/itsdangerous==1.1.0/" ${S}/requirements.txt || die
 	sed -i -e "s/jaraco.functools==2.0/jaraco.functools==3.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^jinja2==2.10.1/jinja2==2.10.3/" ${S}/requirements.txt || die
 	sed -i -e "s/^markupsafe==1.0/markupsafe==1.1.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^more-itertools==7.2.0/more-itertools==7.0.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^path.py==11.5.0/path.py==11.0.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
 	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
 	#sed -i -e "s/^progressbar==2.5/progressbar==2.3/" ${S}/requirements.txt || die
 	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.8.1/" ${S}/requirements.txt || die
 	sed -i -e "s/^pytz==2017.2/pytz==2019.3/" ${S}/requirements.txt || die
 	sed -i -e "s/^pyparsing==2.2.0/pyparsing==2.4.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^requests==2.21.0/requests==2.22.0/" ${S}/requirements.txt || die
 	sed -i -e "s/^rpyc==4.0.1/rpyc==4.0.2/" ${S}/requirements.txt || die
 	sed -i -e "s/^six==1.13.0/six==1.14.0/" ${S}/requirements.txt || die
 	#sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.3.4/" ${S}/requirements.txt || die
 	sed -i -e "s/^urllib3==1.24.2/urllib3==1.25.8/" ${S}/requirements.txt || die
 	sed -i -e "s/^werkzeug==0.15.6/werkzeug==0.16.0/" ${S}/requirements.txt || die
 	#sed -i -e "s/^zipp==0.3.3/zipp==0.6.0/" ${S}/requirements.txt || die
 }
 src_install() {
 	distutils-r1_src_install
 	keepdir /var/log/${PN}
 	fowners ${PN}:${PN} /var/log/${PN}
        fperms 755 /var/log/${PN}
 	if use systemd; then
 		systemd_dounit "${FILESDIR}"/flexget.service
 	fi
 }
--- a/net-misc/ymarks-server/Manifest
+++ b/net-misc/ymarks-server/Manifest
@ -1,3 +0,0 @@
 AUX ymarks-server-constants.patch 649 BLAKE2B a726cd9df461df441b84923f2477af8b25e0df85fe0aa91131b495b9bca3e9119448b68bf7775666d8bfa18eae5e8fb707fdfbe49fab6cd271dbed0863063df1 SHA512 7bdb5cbcd07595c43281a9d67ff6186e0de6816a36921a696b05e2c760934a70f44331c1f048720dd2dcf855c2432e90dff791ed831f161ea81303477222cf19
 AUX ymarks.service 228 BLAKE2B 1d36be15f494f63ec04a9d5041cf417fb12901277044c07ea031650e0341980619b382dc646c05a9624d59f9bdc1ffe8b723554017cb8f73a1fbf8746b6ea389 SHA512 81e3ae34e97a64851751aa0e2d5edbed8e8bc3040abdc9cf2f8a239a017680f134de52287086d96fcb8581c2e7ef6ea87fd760a027b47bc205b740fe623216d5
 EBUILD ymarks-server-9999.ebuild 897 BLAKE2B e2b5cb56e8ef2ef0980b579bcbd08eac114b05a7b796dc5806401110f8b82a7ed5b41e52d841a306c5459a57ccc816478eda2249c3f59ad07b2b8bddb41532d8 SHA512 91a5582a0fd30cdfd16329a050a39c25f0968473e6d8b74b388a4bb7ec68c82e6579a5121be9ebb5227e82b68538a12faf42ce982f3946f80b8403e1656c59be
--- a/net-misc/ymarks-server/files/ymarks-server-constants.patch
+++ b/net-misc/ymarks-server/files/ymarks-server-constants.patch
@ -1,16 +0,0 @@
 diff -ur ymarks-server-9999.orig/src/constants.h ymarks-server-9999/src/constants.h
 --- ymarks-server-9999.orig/src/constants.h	2018-05-21 22:35:56.623271162 +0200
 +++ ymarks-server-9999/src/constants.h	2018-05-21 22:37:02.882961737 +0200
@@ -16,10 +16,10 @@
 /* The port ymarks will bind its server component to: */
 -static const int   SERVERPORT   = 8888;
 +static const int   SERVERPORT   = 9999;
 /* The folder in which backups will be created (if enabled): */
 -static const char* BACKUPFOLDER = ".";
 +static const char* BACKUPFOLDER = "/etc/ymarks";
 /* The name of your database file: */
 static const char* SQLFILE      = "ymarks.db";
--- a/net-misc/ymarks-server/files/ymarks.service
+++ b/net-misc/ymarks-server/files/ymarks.service
@ -1,15 +0,0 @@
 [Unit]
 Description=ymarks-server
 After=network.target
 [Service]
 Type=simple
 User=ymarks
 Group=ymarks
 WorkingDirectory=/etc/ymarks
 ExecStart=/etc/ymarks/ymarks &
 Restart=always
 RestartSec=5
 [Install]
 WantedBy=multi-user.target
--- a/net-misc/ymarks-server/ymarks-server-9999.ebuild
+++ b/net-misc/ymarks-server/ymarks-server-9999.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit eutils user systemd
 if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="https://bitbucket.org/ymarks/${PN}"
 	inherit mercurial
 fi
 DESCRIPTION="Simple KISS bookmark sync server"
 HOMEPAGE="https://www.ymarks.org"
 LICENSE="WTFPL"
 SLOT="0"
 IUSE="systemd"
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 pkg_setup() {
 	enewgroup ymarks
        enewuser ymarks -1 /bin/bash /etc/ymarks ymarks
 }
 src_prepare() {
 	default
 	eapply "${FILESDIR}/ymarks-server-constants.patch"
 }
 src_compile() {
 	cc -I . -I /usr/include -o ymarks 3rdparty/cJSON.c src/backup.c src/main.c -lsqlite3
 }
 src_install() {
 	exeinto /etc/ymarks
 	doexe ${S}/ymarks
 	echo "12345" > "${D}"/etc/ymarks/PIN.txt
 	fowners -R ymarks:ymarks /etc/ymarks
 	use systemd &&
 		systemd_dounit "${FILESDIR}"/ymarks.service
 }
--- a/sci-electronics/minipro/Manifest
+++ b/sci-electronics/minipro/Manifest
@ -1,4 +1,4 @@
 AUX minipro-9999-firmware-03.2.86.patch 1008 BLAKE2B 83500ef8376c0af9800d2e1986b2143795f0a6ca935a5efe34447a3b3ff9b0384c403e7d548f3cc6a7021eb4eb91605e81cfe4bbdbe760004827abe7917b3edd SHA512 a05e9eeed2144d75d1b0bdc7886f5c108a5207faedbe0e96cfa1d8cfd043f90e6ce5cff5bbf6782498d2cfd9b89cb90d566f21977872810cf74573578b7b8cf6
-AUX minipro-9999-infoic.patch 3094 BLAKE2B 16e6dae51fea157cabf8feb65e351a1f5d689396eabfb7f7528c069fcbbe3b752a8dd9f45d98f043f5153a0f0866ca0758e3fcb48e6db4e40c11a86c73beb9cc SHA512 e13fcd785059bae338a88022d6ae2499d0362022ecaff83d316a9eec8e8d303962d5ac8a6775e457ac050d483f92dc581567828d4e548103d2985d315b9e74e8
+AUX minipro-9999-infoic.patch 3180 BLAKE2B 916cbb4b3c72652ca677a1093c71adf8f33da4f8f27d18546bb90b8a22f27782e9b073fc2ec0146f2a9614dce1d210b2dc1a6eafce0eb46085c32bef49f5d058 SHA512 fd10c24d039eb832b52dd3db4b29c56e3ad7a892e2eb78870d79064d0ea5d16217ac040f094d8669b19ebd21e33791a8c82a396f1e809bce3f846973c4489d0e
 AUX minipro-9999-voltages.patch 340 BLAKE2B 0da44851a5d1910dae6d27f416059947a6c303a7ec4906abad4dbbc508fbd606147372c99decff152e5829debd8c95cf28754b9518a5c61970a835bbb250e71c SHA512 3be8c037a4801ea00bff65bada29d920609cdb5c78d69b5b93caaff27a40804909d37804e563cdf240af1af364f3743a09e3f946f85921aab578888aca7f2015
-EBUILD minipro-9999.ebuild 833 BLAKE2B f7515f6317e0fae55cb424433d3e76755df883788aca6f7e9d93683da2b77eb553a512cb61ddd2925a3c2f37b00919c51df3563961d78a597df24de00d2afdd0 SHA512 53d44253ac202f9a781cd7c262f13b09d094cf4f73978daef420764a32f5a2e62b97d6895945172c94a32686d97a5c3b42ee8ec9e98d7ad7e5cbb5c2a6cfd482
+EBUILD minipro-9999.ebuild 833 BLAKE2B ed75157a84eb0be8340cff170370034ee0dcec6a1e92764c39c42f5faa9f733ef8898e062f7c37da92a57f49f45f6d56e9a1c8cf6302d3a9a5c3b098bdd1c41f SHA512 be5f4ee2b8c371a31def069130e34236914685d4b7730704c7537e6b61b12d47985464fcfc9e48f040bc90bc563e3373037d49865686d2912b810e77bf577454
--- a/sci-electronics/minipro/minipro-9999.ebuild
+++ b/sci-electronics/minipro/minipro-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit eutils bash-completion-r1 git-r3 udev
--- a/sci-electronics/smartsim/Manifest
+++ b/sci-electronics/smartsim/Manifest
@ -1,2 +1,2 @@
 DIST smartsim_user_manual.pdf 1625979 BLAKE2B 804f4ca0fd1e4c7101a7701f684d5e77f892b4c2875e6a7069f465d89fad86eb996185e5884a34723198502baf03c761f3200e7fcd243d4078615827e99bac90 SHA512 607fba86bd7a6a57ae29627ba0ead77ebcac0060bf596f26eaef852b0e5d4e3e1a06abf8634fd8a418b504b1e384f72b63a8a12d4a41f98ae538d9a074dcd4c4
-EBUILD smartsim-9999.ebuild 746 BLAKE2B f1acca357ff1a21b511824d7406bb04a818db52a5c36de93ddb5a077cd08311ecc27d9e9b2bbe2adfec391bd3f92dfde9a593137723aa81192b9a3968113d9f1 SHA512 b56f8425c2fc1a95de3b8747322bbf3277ff61762ec84fa6f6e6690c54776ad91c6d1479bbca0e64107fe81ef8ccfcb9135785e258a372a17e196599bf4b3b3a
+EBUILD smartsim-9999.ebuild 746 BLAKE2B de363718a532e0728a967e5a180a72a0ed99c86120cca9471c7ba9c27ebfe37bc0bbfb5a5c705c00deb6e291fa5596f4d9f876bd33ec176c3652a02609c587d3 SHA512 d463d5f51b6ba1ccd1b712d08a97d8581d7a17211febbf47da4709bcdbb7d01d284b6070e7f12831c3255889bdc2d404dfa84ca341391e70fc28d296be6b5b45
--- a/sci-electronics/smartsim/smartsim-9999.ebuild
+++ b/sci-electronics/smartsim/smartsim-9999.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI=6
+EAPI=7
 inherit git-r3 autotools
--- a/sci-electronics/vzlogger/Manifest
+++ b/sci-electronics/vzlogger/Manifest
@ -2,4 +2,4 @@ AUX vzlogger-9999-cpp-true_false.patch 1542 BLAKE2B 52eda9cb87f12fa845d042ee26ec
 AUX vzlogger-9999-curl_tls1_2.patch 694 BLAKE2B b26f6617961aa822fec087b25f078ba293a85a19f49f486781f136907be15699a57a1decbe2367cb9eb06b86a39f0f0855412dccea5fe2963c802413d531ce68 SHA512 e304c71e644b3d732945b0cd44f24667da0b99a65691e682816d85571fd262ab5ea69842a741e942435ded45a69b8d3dbf3e5059e0feffdf661590ffdde730af
 AUX vzlogger.logrotate 71 BLAKE2B ac41e0c56cd3ddc1432635ce2ef9c6e383dab49422215b6610ebbff8890916308caf22cc6d10c86e126190dfb8d18f2c6b13f2078c7febcab7a48ca52878f6e5 SHA512 cbb813856a949bd4e11a552def0ce18e55f7127e8a03c7e5d42302f49e79bba004a9f80789f554899c7f5304b555bcc2d85ad837b00e8201550c1a642b64c17a
 AUX vzlogger.service 254 BLAKE2B 3466c9d10ef4e67382f52de0967bfd7256a872244907a5cb4a2fb14d90d26df180698d14b39430e5e8f848157a82065b12194f70b95af8e072c9f8d5db1a325a SHA512 3a0e295c2c6f8467ee070db67adb1bdfca7afd1b958fd193c83bd2f59edd10079ecff9177b098c34bed594cfc13886b15609a7665aa5ab9827223040c04de64f
-EBUILD vzlogger-9999.ebuild 2115 BLAKE2B 9ec686a9897bb04b840630acc71a78f1ec48686005534c2b716d0dd1a9eafde0d71120aa6fc169dc977f20ff916489e90f02ad69e727cd1af9dfdb5a5394527e SHA512 5d3ed9064dde935d6d690794d7f3386a1b2c26a0c11427f39e5e2ca291fc38a71cc2c2e626e92008218e2a4489f92b60df1fd949aa542124298a2e1f4ae16d4a
+EBUILD vzlogger-9999.ebuild 2115 BLAKE2B e0c74f828ba18ff0faf130d77581691930d75e5f0722779d1e8082f52d55ea709cda2281508f2da900b33a691e02239531b8fa5d5eed9429d3e33fffc23e68fc SHA512 7e3f6be1a91706d4f982aeb23344c07c8bf14e868830b27440d7de88f6e2f0b94aa26c715b60f3688659ac7abc683129f2bcd6f8a1cdf4942c71b85f9b246b2a
--- a/sci-electronics/vzlogger/vzlogger-9999.ebuild
+++ b/sci-electronics/vzlogger/vzlogger-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit cmake-utils systemd
--- a/sci-libs/libmbus/Manifest
+++ b/sci-libs/libmbus/Manifest
@ -1,2 +1,2 @@
-EBUILD libmbus-9999.ebuild 586 BLAKE2B 6230c40c9fcae267b31981f0166c949478371b8a57b8690a5cb9bec92a3829e42217d5cccb1b5ba414f080b47cfdbf9785bd61e23f530f827d2d0272f577f97a SHA512 4a6c89e7efe955daf547cc912c39735d4cb5a810b36d07a2350200221012b3043f8f4af55246845fef1cfc934cb13f7f4aaae80a9462015e24a27125f09bf01f
+EBUILD libmbus-9999.ebuild 586 BLAKE2B 16cb48ff51e55d4c428456723c4a9017f65f0f2d4785b4200628fac4d3eb0db4d65075f0309f394db4a02d82fcd011476bd6681c1873e061ed925cc162fbe007 SHA512 f51e930c06128eeb78e8c78ab76b5c46e686d52508e8bf42a953bf6dd79b17ba326e503749c4f5e26d331595597aa3f80dfc6b6a8f73540a843239a03473d36c
 MISC metadata.xml 256 BLAKE2B 4c059fb5081287336047af5a449bebc0838049c83b5c7a078c308df426e16a2fe9d9b7f97e9e6cb4f4b2e2ee482391a7b0569b0d8a82d1668edee19711357ad6 SHA512 6cce7981d034a259ea4a4e010da189961cb8e64067cfb93b2497c02198b858161e70f4c0ac9db84e6dcd857c54e3e30de71b63d248167fd2b18185b337fc7d60
--- a/sci-libs/libmbus/libmbus-9999.ebuild
+++ b/sci-libs/libmbus/libmbus-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/rscada/${PN}"
--- a/sci-libs/libmed/libmed-3.2.0.ebuild
+++ b/sci-libs/libmed/libmed-3.2.0.ebuild
@ -1,64 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 FORTRAN_NEEDED=fortran
 # NOTE:The build for multiple python versions should be possible but complecated for the build system
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 inherit eutils toolchain-funcs fortran-2 python-single-r1 cmake-utils
 MY_P="med-${PV}"
 DESCRIPTION="A library to store and exchange meshed data or computation results"
 HOMEPAGE="http://www.salome-platform.org/"
 SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fortran python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	sci-libs/hdf5[fortran=]
 	sys-cluster/openmpi[fortran=]
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-2.0.9:0 )
 "
 S="${WORKDIR}/med-${PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-cmake-fortran.patch"
 	"${FILESDIR}/${P}-fix-swig-build.patch"
 )
 DOCS=( AUTHORS ChangeLog INSTALL README )
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	use fortran && fortran-2_pkg_setup
 }
 src_configure() {
 	local mycmakeargs=(
 		-DMEDFILE_BUILD_FORTRAN="$(usex fortran)"
 		-DMEDFILE_BUILD_STATIC_LIBS="$(usex static-libs)"
 		-DMEDFILE_INSTALL_DOC="$(usex doc)"
 		-DMEDFILE_BUILD_PYTHON="$(usex python)"
 		-DMEDFILE_BUILD_TESTS="$(usex test)"
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	# Prevent test executables being installed
 	use test && rm -rf "${D}/usr/bin/"{testc,testf}
 }
--- a/sci-libs/libmed/libmed-4.1.0.ebuild
+++ b/sci-libs/libmed/libmed-4.1.0.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 FORTRAN_NEEDED=fortran
 # NOTE:The build for multiple python versions should be possible but complecated for the build system
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit eutils toolchain-funcs fortran-2 python-single-r1 cmake-utils
--- a/sci-libs/libsml/Manifest
+++ b/sci-libs/libsml/Manifest
@ -1,2 +1,2 @@
-EBUILD libsml-9999.ebuild 1433 BLAKE2B 7d71fe080bbb00f5c0e88dc1ef062ab3d95cd384ad5ba2fe15571a7ca31d96e9d3a3d03a2620c28054bc57e384b5c2e174c3d61fd7eec22c026594e9e01af394 SHA512 87d232e5e5135116775eb7bc48830607464d1b401e30591fda741db4d8cda34dbc1ede0858c30b05360d1f29a478d4c7c0468203ed909c2055899ea984884299
+EBUILD libsml-9999.ebuild 1433 BLAKE2B 032d82e649317a7c8daa732bcdeaaceb05947556540c9e3edd2b2b53af0adcd9dfc90512b6c908d1cd4416c75ee8e61b044d2f4fe4a9d9d1bf5c151069129876 SHA512 eca68b0afcdf92815f5c3a07d6f8a76473812f0d460810fcf85bf3a746244b732c978a72fc61b33513fe5325e6c0e407f4f86658e1a719d47845b38a393fd4e6
 MISC metadata.xml 256 BLAKE2B 4c059fb5081287336047af5a449bebc0838049c83b5c7a078c308df426e16a2fe9d9b7f97e9e6cb4f4b2e2ee482391a7b0569b0d8a82d1668edee19711357ad6 SHA512 6cce7981d034a259ea4a4e010da189961cb8e64067cfb93b2497c02198b858161e70f4c0ac9db84e6dcd857c54e3e30de71b63d248167fd2b18185b337fc7d60
--- a/sci-libs/libsml/libsml-9999.ebuild
+++ b/sci-libs/libsml/libsml-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 MULTILIB_COMPAT=( abi_x86_64 )
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@ -1,4 +0,0 @@
 AUX opencascade-7.1.0-buildsystem.patch 3181 SHA256 7c77e83733d239101d0c7f3d150b48e217006d881c3a17ea6afe1d7db9478505 SHA512 1eaf59916eae29ac34af31aebda38a19009cf9b1eb310acf786c92d116dbcb7a61328c9e1644c59a9c2317b3d33215cf7928b765b1b802c068d5b797d4e48636 WHIRLPOOL 50f9d48add55fd43fb4137fa9e66a7b070f4f7e55a0fdeb422a1b0408dd4fed192c3d40e64e58684f942c2df8bd170efeff91b59e73c82c989f035e15873ff25
 DIST opencascade-7.1.0.tgz 221861542 SHA256 0e23f038f4d12ed68d402dd8093923ac506db34abcf1c09bd2bffba1587f68d5 SHA512 4b729ccca950e90381ccdd9f407d98af281f02f98212d7fc13be031253f530f75cc1c6e2f2a1a9880ada6626a0c5bd144d991370170745c087313a4bdb2c45b0 WHIRLPOOL f9c74d3f2b1a5bb41fbbdf71e17317f5e3e12dc72fcb846e533472eead53eab2a3b0dd666ba3e5acd5466e9b91a31fa580c054e704cab2bc7409c9cc472ff4da
 EBUILD opencascade-7.1.0.ebuild 4646 SHA256 01e5d55acd21fde60afea77ae16789a52fff294f58ff4b76ef81633f3db13825 SHA512 f7dce3db889f2ad6a907114447de216d71e90a24043ad10af3853f8401396e9eed7c08552413f76ed1fe5e5fc96b173a3a444667725cced0464a76611111261c WHIRLPOOL 52cc23d9b0aaad748c0dc2e18e7815d300c420d527b712f3d46012425176d9738911413d85a2091433953bd826a2db456e90ce5e81d803aa7a2daac58eb5c55c
 MISC metadata.xml 580 SHA256 f8102061d63967206a537e3fac408d212b784c606f40cd260d02811566257fe6 SHA512 5483b31f271b1492f499aec837b18dd4e5abe4e0b4ac8a4e3de17be6bd9467faa0629bd7423c9fad3a6c827eb74ecddaedf61f795a2c05757b69400ad0b68311 WHIRLPOOL 04b93b1e78d244ca3dd658f3ac6b63e519c63d84f9eabe9b9ae905195885e56619f7322e755c9717d02f2636c6dc0bf414348a8a420dd9d8f1d8b97c91134b1b
--- a/sci-libs/opencascade/files/opencascade-7.1.0-buildsystem.patch
+++ b/sci-libs/opencascade/files/opencascade-7.1.0-buildsystem.patch
@ -1,51 +0,0 @@
 --- CMakeLists.txt	2016-11-25 12:52:00.000000000 +0300
 +++ CMakeLists.txt.new	2017-06-05 10:38:15.000000000 +0300
@@ -755,15 +755,15 @@
 endif()
  # change custom.bat/sh
 -if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
 -  file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
 -
 -  set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
 -
 -  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
 -else()
 +#if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
 +#  file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
 +#
 +#  set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
 +#
 +#  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
 +#else()
   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
 -endif()
 +#endif()
 # write current custom.bat/sh (for install directory)
 set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
@@ -891,7 +891,8 @@
 list (REMOVE_DUPLICATES OCCT_COMPILE_DEFINITIONS)
 # export compile definitions and C/C++ flags for each configuration to OpenCASCADE config files
 -foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
 +#foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
 +set(OCCT_CONFIGURATION ${CMAKE_BUILD_TYPE})
   set (SET_OpenCASCADE_COMPILE_DEFINITIONS)
   string (TOUPPER "${OCCT_CONFIGURATION}" OCCT_CONFIGURATION_UPPER)
   string (TOLOWER "${OCCT_CONFIGURATION}" OCCT_CONFIGURATION_LOWER)
@@ -903,10 +904,11 @@
   set (SET_OpenCASCADE_CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${OCCT_CONFIGURATION_UPPER}}")
   set (SET_OpenCASCADE_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${OCCT_CONFIGURATION_UPPER}}")
   configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADECompileDefinitionsAndFlags.cmake.in" "OpenCASCADECompileDefinitionsAndFlags-${OCCT_CONFIGURATION_LOWER}.cmake" @ONLY)
 -endforeach()
 +install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-${OCCT_CONFIGURATION_LOWER}.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
 +#endforeach()
 # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
 -install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
 -install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
 +#install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
 +#install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${CMAKE_INSTALL_PREFIX}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
 foreach (OCCT_MODULE ${OCCT_MODULES})
   if (BUILD_MODULE_${OCCT_MODULE})
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@ -1,14 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
  <use>
    <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
    <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
    <flag name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
    <flag name="vtk">Enable Virtualisation Toolkit</flag>
  </use>
 </pkgmetadata>
--- a/sci-libs/opencascade/opencascade-7.1.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.1.0.ebuild
@ -1,153 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 inherit cmake-utils eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
 DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="http://www.opencascade.com/"
 SRC_URI="http://www.${PN}.com/sites/default/files/private/occt/OCC_${PV}_release/${P}.tgz"
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc examples freeimage gl2ps java tbb test +vtk"
 MY_VTK="vtk-7.1"
 DEPEND="app-eselect/eselect-opencascade
 	dev-lang/tcl:0=
 	dev-lang/tk:0=
 	dev-tcltk/itcl
 	dev-tcltk/itk
 	dev-tcltk/tix
 	media-libs/freetype:2
 	media-libs/ftgl
 	virtual/glu
 	virtual/opengl
 	x11-libs/libXmu
 	doc? ( app-doc/doxygen )
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
 	java? ( >=virtual/jdk-0:= )
 	tbb? ( dev-cpp/tbb )
 	vtk? ( =sci-libs/${MY_VTK}*[rendering] )"
 RDEPEND="${DEPEND}"
 # https://bugs.gentoo.org/show_bug.cgi?id=352435
 # https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
 RESTRICT="bindist"
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
 PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch 
 	)
 pkg_setup() {
 	check-reqs_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 src_prepare() {
 	cmake-utils_src_prepare
 	java-pkg-opt-2_src_prepare
 my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
 	local my_env_install="#!/bin/sh -f
 if [ -z \"\$PATH\" ]; then
 	export PATH=VAR_CASROOT/Linux/bin
 else
 	export PATH=VAR_CASROOT/Linux/bin:\$PATH
 fi
 if [ -z \"\$LD_LIBRARY_PATH\" ]; then
 	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
 else
 	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
 fi"
 	local my_sys_lib=${EROOT}usr/$(get_libdir)
 	local my_env="CASROOT=VAR_CASROOT
 CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
 CSF_LANGUAGE=us
 MMGT_CLEAR=1
 CSF_EXCEPTION_PROMPT=1
 CSF_SHMessage=VAR_CASROOT/src/SHMessage
 CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
 CSF_XSMessage=VAR_CASROOT/src/XSMessage
 CSF_StandardDefaults=VAR_CASROOT/src/StdResource
 CSF_PluginDefaults=VAR_CASROOT/src/StdResource
 CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
 CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
 CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
 CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
 CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
 CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
 CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
 CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
 CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
 TCLHOME=${EROOT}usr/bin
 TCLLIBPATH=${my_sys_lib}
 ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
 ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
 TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
 TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
 TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
 	( 	echo "${my_env_install}"
 		echo "${my_env}" | sed -e "s:^:export :" ) \
 	| sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
 	source env.sh
 	(	echo "PATH=${my_install_dir}/bin"
 		echo "LDPATH=${my_install_dir}/$(get_libdir)"
 		echo "${my_env}" | sed \
 			-e "s:VAR_CASROOT:${my_install_dir}:g" \
 			-e "s:/Linux/lib/:/$(get_libdir)/:g" || die
 	) > ${S}/50${PN}
 }
 src_configure() {
 	# from dox/dev_guides/building/cmake/cmake.md
 	local mycmakeargs=(
 		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
 		-DBUILD_WITH_DEBUG=$(usex debug)
 		-DCMAKE_INSTALL_PREFIX="${my_install_dir}"
 		-DINSTALL_DIR_DOC="/usr/share/doc/${P}"
 		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake/${PN}"
 		-DUSE_D3D=no
 		-DUSE_FREEIMAGE=$(usex freeimage)
 		-DUSE_GL2PS=$(usex gl2ps)
 		-DUSE_TBB=$(usex tbb)
 		-DUSE_VTK=$(usex vtk)
 		-DBUILD_DOC_Overview=$(usex doc)
 		-DINSTALL_DOC_Overview=$(usex doc)
 		-DINSTALL_SAMPLES=$(usex examples)
 		-DINSTALL_TEST_CASES=$(usex test)
 	)
 #		-DINSTALL_DIR_WITH_VERSION=yes
 #		-DINSTALL_DIR="${my_install_dir}"
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	insinto /etc/env.d/${PN}
 	newins ${S}/50${PN} ${PV}
 	if ! use examples; then
 		rm -rf "${my_install_dir}"/share/${P}/samples || die
 	fi
 }
 pkg_postinst() {
 	eselect ${PN} set ${PV}
 	einfo
 	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
 	elog "You get a list by running \"equery depends sci-libs/opencascade\""
 	elog "revdep-rebuild does NOT suffice."
 	einfo
 }
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@ -1,5 +1,5 @@
-AUX smartd-r1.rc 621 SHA256 ab06df01453c754649be911577464bb7c1379b236d420450f5ce1b1b480a136d SHA512 fed706bff5e45e207f90962a6185ab3f14166108eddd4f6f142cedb5489dfa05cab3e2e21593aa0d6361d02707cdb5f19cc35be5abbb3d4be51fdb976d959097 WHIRLPOOL b2b0cad7395edd40c29081abd4f9d9e4eb31d10efaf2f6bfc8e39d5faea8908ba4ccc60d3ea473fe197bd257f9fa7be4b086a576ded834c0c987677f41ba408c
+AUX smartd-r1.rc 621 BLAKE2B 1dc951b0ebf01707faa6e1df0023f561c9969471a4513c3cf586c8b77003335ff4eb68ab0f290dc93e2975b5b022eafe275e4a5295b61f416ab5b8248a399c9b SHA512 fed706bff5e45e207f90962a6185ab3f14166108eddd4f6f142cedb5489dfa05cab3e2e21593aa0d6361d02707cdb5f19cc35be5abbb3d4be51fdb976d959097
-AUX smartd.confd 107 SHA256 714cc1b253e1f59b884be89693757fec91ca878c62f37451a49ef6bb72263e85 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 WHIRLPOOL 773405a2cc669f6eaae835bc3a6415151891b91ccf4111147f8b12d9763be26cbf65815879a70cd64ae12a36f59840ffcb15ff7e527479f88d9816130e704e76
+AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-AUX smartmontools-update-drivedb 42 SHA256 53a766a094ef63b925e2c3f8c08322b67c2ab40b1f2b84d414e5de4f6747aca8 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8 WHIRLPOOL 3dd62cd6e26a18c9fe5555a1d3feb2597eea6773c857a2cf559331486fc0ef2ef67a0bcb7d1e03b14631d0c8809daae7688d6e1f83f02e8867b0dc23dfcafb55
+AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
-EBUILD smartmontools-9999.ebuild 2659 SHA256 837e643359828272e48ed187fc59bb3022fce58022ea8ee12bd06fd66edc2e60 SHA512 62429c61b88a98e26ad715240d9713e25d916e9531712e17b27f4f6b3ea7d260b50d66780b1f7818d86dbc8d138e873311960b2a8c8e3d0d7c747e868bdc2c49 WHIRLPOOL da7ec558f93d05509783f87365c7d8487bacab1733b1df9a592850e940710d0531ef11411f84a12542025749ec8ae34acfa0c5d29ea17d6b0a14d6868f0c07dd
+EBUILD smartmontools-9999.ebuild 2659 BLAKE2B c491c9983c327ac65aa1898d71c3a097cbf3b9c9283c4740d1468de8dc6f95249ac07fa8a2139d64af6411a5c2064d004be65e531113eabdd917a37cd8bdd501 SHA512 160f0c900925f9925ab6501517ebbde5089a1394dd638fa679b1528de58e5a78662c7c6709de004bb42002a2397026c314c3b9a3cff779a7ce74bdd1efeac71f
-MISC metadata.xml 517 SHA256 9498d60f66b4e752d70f5f34e5bcf2ed20bb9d113310d9f4344049dde7fc6087 SHA512 63c3af11414b2a8ac83351486b600c16dec940d01c07bacfefb762b3acb152f87db3f630772c0ec32cdc4b316ab3a98ed3efbda82d0af5680d76f0b24459ba14 WHIRLPOOL 4a7af5fe7bd02387df2ebd7c34379eff330710a4ffc7beed20953cac8c4ab2cfae4d1283c71bf1f79d1d765e681761b2e1a5ab19557ebb7e84c16aa143429f5c
+MISC metadata.xml 517 BLAKE2B e8f682d6126b98df1cbe6b43c2052ec1c36789580d19514c53d547ee11caf2b7f941066c647db091065949433f9ad87f8509ecf9f7c752853b8825456cc24401 SHA512 63c3af11414b2a8ac83351486b600c16dec940d01c07bacfefb762b3acb152f87db3f630772c0ec32cdc4b316ab3a98ed3efbda82d0af5680d76f0b24459ba14
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=7
 inherit flag-o-matic systemd
 if [[ ${PV} == "9999" ]] ; then
--- a/www-apps/volkszaehler/Manifest
+++ b/www-apps/volkszaehler/Manifest
@ -1,2 +1,2 @@
-EBUILD volkszaehler-9999.ebuild 2760 BLAKE2B 8f4d31302ac866464049d2c90d16df1a37645ffca30441194e532425ee34e53272863c03162cfee77aaea39c76c06075dbc7078fbc0806254a56572d920011aa SHA512 68ada7e18dfdd04984012eb1146384bde89f23ab993924bad84bc4a77e3d35465dfb701bb6d30443ba7cecc5b800c36d09a761e29581bcf28256e70e1cd024f1
+EBUILD volkszaehler-9999.ebuild 2760 BLAKE2B 53375e3274d6947a1cc940ca9aee477576b8cb4129639d0a22da4f99dd3332a7dfddae6e2f793c387f5b641121a9bd8ec421e9c52856d23c15c9b04548e6449c SHA512 52d589a231b8824b75941fd757de39e00a9bc0f31b764257b88ab954a020d5c9817f537c0188ea15ae66ceb5c71137a8194fe9dd2999f55b7d60a0e2846f3f56
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
--- a/www-apps/volkszaehler/volkszaehler-9999.ebuild
+++ b/www-apps/volkszaehler/volkszaehler-9999.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
 inherit webapp
`@ -1,2 +1,2 @@`
	`EBUILD xdms-9999.ebuild 773 BLAKE2B b006d21fec5d5eee31a88b6dd6c69a8e06b431080b9abb61d36594588da9fa722cf0b3839c2e1ac69390ee8eba2e4507f22cfb5501eca26d60b9fcfa9c3deed2 SHA512 159b0fbe5280f8778496c35f2e40eb8ad1a03f60a041b7e95d4002cd8e9828b11b16a9df06e5ab75aa2dedb5ff757b92a3f6a0dde5f3cf95332d09a4f6a52892`	`EBUILD xdms-9999.ebuild 773 BLAKE2B d55ad19b18d0611f5df5ece9526e8d3e13f25c1a9f101f933a809caefd75cde7844aa59a9a85d3d17de163898904086cf46256a43c2c2479f01a5a53efae39df SHA512 dc4497d98a8be717299d997d46f74df920066cbf5350df3f2ab38df9c5250ac89150ca664d15e61b7ad782fa246647bc4438db596ea96f037b4c853ecf569763`
	`MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba`	`MISC metadata.xml 864 BLAKE2B 209b2fd1290a35b6d372b5725bd9d297a2d9b86a56bc45bdfd725e81399f004ac6d4de87386d883e921bc6a34d2e45797d029d71ec317f7c3930a4d7faf991f6 SHA512 a535abd221a7ea350cfeb4fbb84585cc4f4d6ee83f607ae5d0eee73a709b8df5ed3cf9b3056dbd6b8a68ff06353c5c8b407f322a06a3bbeb5fe3d6d0cea4cdba`
		`@ -1,2 +0,0 @@`
			`DIST kicad-doc-5.0.2.tar.gz 68999325 BLAKE2B 000fdc4293b5cfa0f09290cbfdd7e1f2b881e79dc61acef1418773be669aad0c214df155bb0edf07dbc1157e6619c627d4455ad6da00108838af4d7610d632e6 SHA512 e9f34c478c0eb4d79c13236a5b105882a8411047c73ed822df2fad1b1eaabc45d8fd61a055069000ebfc724e6e3e828dbab16855cfe51bb70623a56e1e50f0d8`
			`EBUILD kicad-doc-5.0.2.ebuild 1282 BLAKE2B 077099fadccb3eb08b50efebf6e0a9400f4cf9dad5b2430d2c9338b479b2c0b49bb4c4b8ba3d3854178387df8b9c2eb6ff6e47fb61e41554d4c15137588315a7 SHA512 f399261b647092f7ebea60233825f2e8994664ebef4945c7a9e93a2eb63d2d131cee4d8b8f16a6619a66f612aaae43b0a17d711cb97b50785d305f9e442c8373`
		`@ -1,2 +0,0 @@`
			`DIST arduino-1.8.1.tar.gz 86826305 SHA256 cc82bbb2979fbf53dc4775668de7e5eefcb61ab65f46507aa933107ad458d268 SHA512 1ca8c306d2bdee52fbc69ba7b933ac9a3a1154cfa2e5861e75b5eb2ca1cdfa7843b36b36eae68d8d932194be5ea938fbe3c2492b87d81d88d88edd9d0aeb1541 WHIRLPOOL 0ca152bbf1600e0f15ceb11130252fb353f2b7b74c461f8d8725ca9175295bc29a1609c847a1544df4053673b8e01207267c9e9a493fd08dc75cf05614c697b7`
			`EBUILD arduino-libs-1.8.1.ebuild 923 SHA256 7697ee6305c17edf18cf214d305293485db795bb48ca05786d09f7475a73e04e SHA512 b8691ef253f8f3e4fd1c555c92c12f3fe4ff99979015b36ff2be24a42cc4eda6921e25ad3af7ddd0f1618caa00dc32974f18c7e66cd6eeb517c4c7bb2b86e75e WHIRLPOOL 9f435b9b5775a2fd47776c8887d6302d7a6fee07ba9018a1d22f2f9bf6cdbdee09cae57e69cc41e333309d767cd397d91ddc4bd5a7ebc1fa8a814dcc1b094092`
`@ -1,2 +1,2 @@`
	`DIST euclid3-0.01.tar.gz 13201 BLAKE2B ffa8d368f58cae91969230eaf4fa5324cda2c45ff69c98d73b1fdfbdb67e38846090fac4cdd128439583a7f36190c2d474c7f647823ac79440218bf02a73070f SHA512 c4e5e2770ab4ede08904fc3b76e50d6812944ed226c9db52f2da8d100370e20ea6031ca554ae44d72d53e96727d163bd3cc8da7bf175539de10749da77877b0b`	`DIST euclid3-0.01.tar.gz 13201 BLAKE2B ffa8d368f58cae91969230eaf4fa5324cda2c45ff69c98d73b1fdfbdb67e38846090fac4cdd128439583a7f36190c2d474c7f647823ac79440218bf02a73070f SHA512 c4e5e2770ab4ede08904fc3b76e50d6812944ed226c9db52f2da8d100370e20ea6031ca554ae44d72d53e96727d163bd3cc8da7bf175539de10749da77877b0b`
	`EBUILD euclid3-0.01.ebuild 452 BLAKE2B 35cee20ec1ac40e405ef3a1695d0cd1c2f007e950d1c860573dfd2af3ff66aa8a1635e9fdbc129125e5c0c1e005ac9c90664e4990e7cef76c5cfb9c6b815ec15 SHA512 b78c9c311b0b70cb7d678e8b06b4ed2926b390165c4b4e6a383aa5ed87d1985a992a7f7b787257cfc932543a926d4bf5508ceb6669c688199f03c08556826851`	`EBUILD euclid3-0.01.ebuild 446 BLAKE2B 63f940400d181acaaea3956be22602d1254a70b8eb50a6c1cec187d4970521340f475ad6bf940d7452f105ae85f9deec6dad7eb247e863765e2b2a39fc530cd0 SHA512 2d570962118a8a4ff458442714e31e0d040bc852201cb7f614ee311a1651b4ab2859117b3364d4821995b40247b4336a10dfe0390fb8ebc5c91c0f96ed89efb3`
		`@ -1,2 +0,0 @@`
			`DIST flask-compress-1.4.0.tar.gz 6043 BLAKE2B f4b999736692b74962d0584ca37d624395f8e7a490f2bdcf7a5f1c6b4487af354ab945be882d9b81c757f59e983d924665555b2ac5f0ca0bb9160aac652cfebe SHA512 f86efc13f574335ca530f091252f9ae248f66e3251a3dbcfb5888602b00e1e05d10335f88541fe4f9ab7f537fbf7bc390468a57cefe2d3a7f63a69f2cf0619db`
			`EBUILD flask-compress-1.4.0.ebuild 614 BLAKE2B 18916fc06ba9b009511005680c5c07641f90e5cd5ad70898998d82c5ed431ce2ec3e27b349918766b9869cf1cb0fca9b1fb333e674615cebc037b6dc2682102c SHA512 6d2b183462c755c8ee117e861c051a570f54f8aaf7e0e33da64be0daac9ad08ee973cb708d510d0a66b720327283063e6a5441738546cb05d4f80120daa36138`
`@ -1 +1 @@`
	`EBUILD kikit-9999.ebuild 1089 BLAKE2B fcc1f3a237eb5ac1c9f4bec1b2308206e3ac1251b5bb48002d9780f6f2a6d6416766465378c22cc6c2a841a7c8c2650f4b6c193b124807bd2f11dd87ff342017 SHA512 49950e8b21f554b8ec571bfdcf7eac6dc707220c9c11d819ffe507e2afe334788a974586631c6467d875f7f37eff0f641847f03b33c4d9c6fb1b62a10bddda17`	`EBUILD kikit-9999.ebuild 1083 BLAKE2B 8195e47d5fb1ffeac2775eaa43e415be36a2de71e3c36564397316903c3710d26f9247a31fa862091d534e54d5d29310b4521f9f73608c0d3cd9f9fe3eeb3764 SHA512 593d03c9f7ab62afd602d982c6382e0da59cfd9348851010374bdff41f855afdc0dff931b1c28e02cb822386b8f99b0a130acd2fcade7aae17465ececff6de8c`
`@ -1,2 +1,2 @@`
	`DIST pybars3-0.9.7.tar.gz 29203 BLAKE2B 7255a9bf7c2d0e56d90bef95a007a0d6ae9d4bc25dbdfef0a76d7dc3927da01d2ec7e4f597f53e62fd1c540e72718778cb0a5882b20e054b2fbfa9dfc927c82c SHA512 7aff86c0703e3827909f3603d7f35026ee39ce74d9c5ff1beb18a71b0a839c3aa407402f8d9c1aca9eb69af33750db0477881826e72135fc26a7274b0f1f538b`	`DIST pybars3-0.9.7.tar.gz 29203 BLAKE2B 7255a9bf7c2d0e56d90bef95a007a0d6ae9d4bc25dbdfef0a76d7dc3927da01d2ec7e4f597f53e62fd1c540e72718778cb0a5882b20e054b2fbfa9dfc927c82c SHA512 7aff86c0703e3827909f3603d7f35026ee39ce74d9c5ff1beb18a71b0a839c3aa407402f8d9c1aca9eb69af33750db0477881826e72135fc26a7274b0f1f538b`
	`EBUILD pybars3-0.9.7.ebuild 499 BLAKE2B a5da6501aefbe9240a46bcecab590e90255929ce6cf8e91b0cf4900b53011fbc253ef35b100f59f62697564c3c8dbf2e962a0969e34caf21e929b8f1c5d763a8 SHA512 18f67a569587543b28cee91fb179f3a09abd05b83a1dfc74e6f9a374eabd5049f2459d6dfee04bd19569e0504fdd849bbb54fc3e8bef69f77a52b72b44c3cae0`	`EBUILD pybars3-0.9.7.ebuild 491 BLAKE2B 908712e0a37eb65a2ed298a6b5e753430dafbdd92ba1c3b8fca9525e40f8d6114be18d73562707c3d43ec85e135582cd68d07a3cae6b29e4adc5515e39a6e122 SHA512 8b4132087eca67ab9cd36b88be96b33d47c2ac44a33b14ea2002c44be4f927953e364080cae2141978d3f285add155648a0229a52ca2fcb2e82472cdde3ce02c`
`@ -1,2 +1,2 @@`
	`DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575`	`DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575`
	`EBUILD pymeta3-0.5.1.ebuild 547 BLAKE2B bf2fd91c2f4683c538007a50b039f144baf149ab683cefd32b145122e5aa90732395103c2181b0451c0767cca6874ea362d941d9fe0eae8636c4be367ed463f2 SHA512 f2635bc56d3cac2487d727246957b659b885bd3c5320346937c918c5532a46fb179da0f153405191e38df7097d8227c863047b7e1923fff26355296207d07ef3`	`EBUILD pymeta3-0.5.1.ebuild 539 BLAKE2B 8aa9c167b46b25f3ddc2c76a770d549a60a382415cb200b62fed6f4e35891ab351362c2bc17fdb4b3624aac5c6041fb72cfa014ab7fbe9032be9b46d85f4b870 SHA512 e6a8d4c4491c6d614e9a68675b31148cc37bde71b2b736fa821cc5d4ef97311d0e4d817bb1c01fe5156a91afef2b9491553e4d29f22d5fe4b795bcf1a4575a02`
		`@ -1,2 +0,0 @@`
			`EBUILD pyside-tools-9999.ebuild 2904 SHA256 7cfa74c5e9514dbdbf3149fb29fc9469ad1b5956a8711d284ad69d12fea45a96 SHA512 6e7ebd4d823f1d7fee62eaf57209ffbb0ffa44d344dd29720c55947b38a7b0999569c8a18392cb8124d93e7f8f1b2046b776fe62a0da6c1332f4bcfcd5c4d886 WHIRLPOOL 1b60120c01eb7a8e4593fb067fe19968b1cc9db46086ceb7e30315abd989e6041eb4b8ab23ef63cfd7999eea48d9f4e94373f1f28b50cb7f0dbe4e7491dac7e3`
			`MISC metadata.xml 247 SHA256 690d3e08cdd71b405f5361dfa3f33007ce9ec9d0ae7628e9271891da9e2bda92 SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2 WHIRLPOOL dffc398d6bdbe8a8afc8863675a819a7bd69ae4d098ffbddad4c21ab8f1a850ab8ede71f98e34999b0605ad01ea93c8864cd681b50d3e153aa3d0901ddb10743`
		`@ -1,2 +0,0 @@`
			`DIST python-sane-2.8.2.tar.gz 21152 SHA256 0f47e1c34ca94dcbe3136a05f05b342f055e6c129743f7f6e1a6519d6000316b SHA512 073852a94b432f591d908e3759eb34349e875396d6c80989c0ee7cf96dd9c8a858e04e177c216a3bdd49a2846b8bbda75d648ddfe95c377b2023ed564f974e1d WHIRLPOOL 3a55a0a6decbf1a83f90e740f00a7eed9d8a93e274bea0fcf19d754cfe2b09deaa17c8b47bc9c2953dca99896e73917e413bcecfcf034378d31d845227e560d6`
			`EBUILD python-sane-2.8.2.ebuild 438 SHA256 914cfe578b74eae78926fcef3846c70c168705b4bab6fe16004f92d5e77e1553 SHA512 564063faec7a879f3ad042157ce7e0f2b203f7975e26cb000895f203a34857f83d04787d0975131586913c40f452996da2360c60ee9864ea26d8f774d9cccacf WHIRLPOOL 3135fc63cbae85693d500459f09352baecc71cbf65793e3542d91ec273a052c9b089a275c1936ca78bb593401aa2bab39ef644a9c18f0cfb19b56a4d8d50560e`