gentoo resync : 25.12.2017

18 files changed, 22 insertions, 647 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 60aa53170676..652afe0c7c61 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
index ec6946791d81..d50d49d8b61d 100644
--- a/dev-embedded/avr-libc/Manifest
+++ b/dev-embedded/avr-libc/Manifest
@@ -1,30 +1,5 @@
-AUX avr-libc-1.7.1-gcc46.patch 979 BLAKE2B fbee3b30014cb66edc1699afcd1c9e72a682be969b13b4ad1b9c2c0bc2f1ae3178d0594fed802979f2edb5681b5882537c9a00b9da50997cffbf370ccfd2b99f SHA512 f69cd81e28681d765ab9b829e23f02d2cba14d2ee7e3b3c7d0eb5a8cfd37a98ac58670c0f9643271088374f63a524b98e7eba244ca2081d85f465d21bb0e83b6
-DIST avr-libc-1.6.2.tar.bz2 1044977 BLAKE2B c3a5ee0bd955502560617184415f32d475405cad2b494a326cfaaa4980f8154d6eee4f12b2cbca2577aaf0be3232d8e7e00915c1df8f83bc852813b8bfacb6f7 SHA512 9c79450c87b6a74b88dc9628984388c0d0e0a78639bdafae29fb84bf19daae250f8e21f65e269de25ed935bdfe0edf0671e025c81870909dfaff4ec6e68b370e
-DIST avr-libc-1.6.4.tar.bz2 1137818 BLAKE2B 4bbabe97899041c5a73c9e496ba4c4fb567b4a4ec806679e1f6ae5ac5a65ec39bca1ffe80d101514ec0bc4ae51c34f133190ed53c66ddc39389dedf6d55effff SHA512 eef74396040990a930f504c05dfb9ab319ee5815411cdc48bdc389cf8e8bf33b8936cc52b1437f9a41fa965d9aa9503cf062bb9246b62af51d11abd84b2fbb53
-DIST avr-libc-1.6.8.tar.bz2 1345899 BLAKE2B e3a6a94db83d62ce4cf5519dc3ea2bf2127397a4eec7f459ed799d454f7a02d263e099dc78350737f197723f122c511ff124d9a7be0ce46fea79119c72ed48ad SHA512 31ca1969bdbb0725aa19de8e84cfa5a2868403a454a828c915dd754d53965feed7a6441564a8b5c6e54e5879771d4e03dce086b2e699a088474c7e71968b9159
-DIST avr-libc-1.7.0.tar.bz2 1409160 BLAKE2B 2c09fa8cea80887c93a99354c2bd68833c5897ad367113c29c7fd1c67eb35298a9491d124adf6ce568a0cc3ef81e9813a202f9d0572fb56a33f1426b1455a63b SHA512 7343c16aaf9760fdba10f5f3319e1b8698c7b87b0d6de03d6a34b7cc69741aa6a89ef84b6c952254541cf3ed90a26e22364254d06f170a8b67dce1e8e1cb3095
-DIST avr-libc-1.7.1.tar.bz2 1417545 BLAKE2B 082deba6b9d20c5c95a487a37eccc8058552a445ca53fc7c4e2ca3ff8ad3df213651a2123f71e975db6dfe09752731c1c71a782c242cce03532d5c2a3880fb12 SHA512 814e41b84b62213782ef886140d6aae99a76495ad3c06796038e3c58a138a3ef55076b7809dab8f4ce856b2b49a29d23952230a7784a914e20507ce06a6f99ed
-DIST avr-libc-1.8.0.tar.bz2 1428776 BLAKE2B c86dce55546e0837d608b48ad6242ac99059df0a4cd997d7e70cab083a9eb36cf36251cda92a772bbf94ac3d716cf02a8663c9cb93ccc44c55b28d1388a459e8 SHA512 932cd41be062c5930cf4d2c555b1748a6916cf8e901e2bdb6d79fec3193d8b142c32e26b9b48c680fd909cd4bafb5ed74c346846f0a4200386db6ddc2651567a
-DIST avr-libc-1.8.1.tar.bz2 3230418 BLAKE2B a32e99127970b59f88955c2e90b36aceec7ac44c2de6338d7aa42ef9432ce68337c0119030c7c543867d3342b66f4adc64ec0a8c327b24caf5b1f4cc93c05d81 SHA512 9827028117d63bab9071bc0af68ef87038ed1e6e6c5cfd6db2c77a8387ce5b9eb2825c651405ad2842d81bc0abe173b76340b56671b930fc42d2f05bb7f261f7
 DIST avr-libc-2.0.0.tar.bz2 3590893 BLAKE2B cc628f5f55d12c78ca9215e3e37b4a0061feae3c7c19653384b5d789fb6e1c70efe420631bf987379ae5524ec0f65c6df459eaad0fcfb80833cc4732ed5e796b SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
-DIST avr-libc-manpages-1.6.2.tar.bz2 133249 BLAKE2B 2aa23b9ec51cf4061418e9ec1859904a39bb18e5aac28dada874601ddb750601b085c294232080c9f558a014bb9433b9b0a02108eca8c34e34b69f7efe764a40 SHA512 8eb4aa0aedb20613253e4f17424251752fd61c5095690e69b2a4a0d6072460a0015379c04b9f01946d1063942ec876b6c6f2c0689878bfd8473a5e1cd31a534b
-DIST avr-libc-manpages-1.7.0.tar.bz2 143540 BLAKE2B 234e72ffcd4063ea1274c325fd7a1cab5abaa6524140f9d9677740797bc3268f5be3a2367d452055665369afd3c2ede9f32e4caf9e6749fb72459bb3de982c5e SHA512 4422deb8778be3e617d6059ba9c40f7cd4069f3f3d8343944f8aa370fc88aa5934c6f5bb375c130ff59bb7450599bb13da4cf127a87f8057abb85eb68001d702
-DIST avr-libc-manpages-1.7.1.tar.bz2 143831 BLAKE2B 3a727c168f0833906bd4056838b7983f50b1963167e6f1738862eae76eedd53d972aa2b7e3622da2df9049b5cfbafdfe9cb778fe92ff79844890bf5589d267a4 SHA512 c77f60be472a26ec7a158dcbfc38960dcde7bc192518bf5a35d339c628cf39030f44c56785770a3e0c01ced568e6ca7fff0f655e4a396348464c9d23cc1ccd3e
-DIST avr-libc-manpages-1.8.0.tar.bz2 127217 BLAKE2B b48b97a7dd750be78ceb2259845037e180f386d7d539d0f1e11891affa9612eb70c3c6b684068d9cac9a436c6a804bc411e25ae9cf014a30d6556f60ffa7a37a SHA512 8b7d5734ded698f0f136b8a38785efc87d288ece7fbed943e7da0d1c6aa21ffd73707e63d54757df47da687d5e6d70d781bf9b4947624976921b5fb5c9cffc86
-DIST avr-libc-manpages-1.8.1.tar.bz2 158580 BLAKE2B 218f3756ebcca0004d03b0a89fcd7f95987b5d3e7549b60853070fed1aca2caae8f9fa77485005f834b6203bcdb44402bb9f16bf5918f1b04dc5aa2b9ff9222b SHA512 84f12c4b56b0c5e21edb0ad27a68c8b1d665a60b19bd2aee10714840d4153cb5aff65f90b0e815ddce9037ad06a4a3b54856cf81b0aea85a1d97a0cf3c672a80
 DIST avr-libc-manpages-2.0.0.tar.bz2 151137 BLAKE2B 7fbaa9c1014e8cf9b4caac723b57f9c24272da458b987ba302730116437bb3a5b49296c6804d857b421e6f71f2c4efda959d278ebcc14aba35fdd44a958dfca8 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823
-DIST avr-libc-user-manual-1.6.2.tar.bz2 511408 BLAKE2B 11dfe0eb953c83275ebd9c630ba67611713fe6fa71efc19fbe05e9a4b95ad1208e6e41946bfd3754186c352d67c5fb3cd4f9334e330000608d37810290de0409 SHA512 09d531d612b72fff9dc3f0bbdf34866ed9f2b979d7d00adfd9e6d52557bb1500f18936c3b859ce7a477df6cf63bfbfab53871b6c4565f3127faa67ad912704e1
-DIST avr-libc-user-manual-1.7.0.tar.bz2 690477 BLAKE2B f7296ed96dfa618c7f6e78cdc44b1e848dc22c5136b017868bf832c07c56d14ccb247962ddcfc511fb56f100dfa8d0ebad45d25d4bdde587536b6d3b0294cd3c SHA512 d8fd5e9c35b840f094c06620836744982c2302a024499f4dcbfaa107a52dac3eaaaaa58ce49529d31a60cf6c1ecdfb9b2c9313febc7cb82c7577b7da22db65a4
-DIST avr-libc-user-manual-1.7.1.tar.bz2 692262 BLAKE2B 786d441a44d3159ed0bd63a96a7a41729fce18d511bbaa22e4d3051c0f18028fe01e822c71da18fed50b9d557c2fbc5c68e7089bd618f31a57b07b8b7769f9d6 SHA512 9996ed97aac12a37c589beb32d761dc0740b321bb219d316091f9b3a763b8a96401c2de6cf99f89744d337a482e8be88104778deb6d8b9a76e96870526139d5e
-DIST avr-libc-user-manual-1.8.0.tar.bz2 705087 BLAKE2B 637927cb5f486678d8172ad76f61e9b69ff9c6f55ea7f7c9f7aca6b7219218e806d1be3f551ceb919240162fa054c9b6bca10217eec633cddf9fb261491806f4 SHA512 731fbc45e9184b70f28001a9427d72ab5385017f1d8f197b2c942e458a6542632420f11e57a81949586d6fd8d4f4cd401b5fc76595ab7d95ccad7b158ceef59b
-DIST avr-libc-user-manual-1.8.1.tar.bz2 864405 BLAKE2B aab98ce1c3d4e3aec1cdd760487692d03b7563abf3d5da4a078da8cff98ec73aa5f99594f63c109ffd83506d6ddb94b889cabde7871e34c53f7a2b2353a0168a SHA512 65da1b6f648bc8f2dc23dca15be45c960606c44703407fcdb60a924174cd9970d9d4f5a9c10eda827b91a5dbd0cd122daab92458626e67817c3ad8a864baedf4
 DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 BLAKE2B d3190af26dbe38719bc78e73de31af1ce69d885b928f48a4fb9ccd145a33f19f71c017253ad16eadc641fc88495c642dd5fd1668c6bebddf7d813f70db01a3f6 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6
-EBUILD avr-libc-1.6.2.ebuild 1845 BLAKE2B c0119ecf9bcb069b4db6fbb451c4a89d942c552237b2fa8d61843b3942716d66eb1cb26c0bbdaa6d2d9b5012d58b274ab2893958c0f9533173c7ce99bf54d282 SHA512 8b4aff80114615e3739cf2354b5ee81e472397283ae8951ab89401346a9417aa6d9845a83d4df5827c014e21b5853d5dd9cc1fdcc9cba17de2de5d62006fe060
-EBUILD avr-libc-1.6.4.ebuild 1847 BLAKE2B a468af8a116bbf69f4ce36d6488722c68b6ba19a76cbdaf346de18940b452200908aeb2786c2a3a647573de10035aea2d895b5f17aebb5031bbe99ed3ea35266 SHA512 99a08601a1d2fbaf6ac219ab2ad5bcdaeb2aea4fc0600eeba5579d37e3925a91a8a7245df86ea78f729817660a4c62b1c31c73b08a6dd503975cf1b3dad39c23
-EBUILD avr-libc-1.6.8.ebuild 1821 BLAKE2B ab6d48b610a325f4e1d275aa299ca3722c0cff5b0936d4cc456efddaf10d73dca05ad2630c2260639d7937dbe64c56ca36dfbd859927d3c1ec1c25d610672e43 SHA512 99b9929f444658bc0896d0578d682ab7c152949a02138bbb30ca4b5f1c97c1bbaa262421b5d95bf01840a700132ec727e22f2c9781f651d85e09d1a3e320df5b
-EBUILD avr-libc-1.7.0.ebuild 1893 BLAKE2B 5d3c32a58583c2f8b41475f6d265f8cde09f61bb25c5fb5ab60c8836f5116194720c7b0f84da34da0959e9d46a7e803f66aa09e87c043f2ebe53ac1c2318c546 SHA512 5b904ee227aa689285b4ee0ac9263d02429c23bed184b46ce23d407b275354f2e3b1a26ec8f123bb793e03114efccdf1762b0dfd943f160145f8ee7d55815987
-EBUILD avr-libc-1.7.1.ebuild 2026 BLAKE2B 932971c75b5df04e210ee59e4941c9341bdbb5cd7a8fda54f82c16eff2c9bd2a031579d2e1757e0c27e876fe8ab9db998e782ee8815febf7a3205cece4a9638e SHA512 328553995ccbd513917d90937876afce1fcaad6f55b0b93bbdbb4d8fcb1516485dfb27de45f37f8facaed79c7e282348e36173d78602138583713804338b3c61
-EBUILD avr-libc-1.8.0.ebuild 2035 BLAKE2B 43d166ccb7a5e486a5d5bd0e0bab9ef5d69b6e4e9d36c93da48be0b8aff4cdd4b94cd0c1c3af6a255f0b0d93782a59ac027e707b9186a84ca742721afe6fe6d5 SHA512 37c8819abac7bfc6701e1b92b2449bb82fb51cd881f1029847f595d55f8299533b4a9bf4b484568d18cfe1d85dad60b7de2c3a985ac8923dea94ff26e957f6f5
-EBUILD avr-libc-1.8.1.ebuild 2036 BLAKE2B 5633dbcb358126f6d6d19f9aa03257efcd18af76330cf9241e0942b4c9b400e77bd388c8eae550f6e425c5e80f64680b60583b3acee8a62483534c7ccbd06d7a SHA512 1090affc9cb12a373352499e17bfc48329613cef4dc9b9a5ff8cff271b652874e4ad4004ea68cece8640a392562de63289d938f93dc69240a7a01fc9c7da5cfd
 EBUILD avr-libc-2.0.0.ebuild 2035 BLAKE2B 760680b1539a5df3b010e4a26429a23f387c9e2786c531551dc3103aa2462dcc56e5e39466ee7733248f0d76eedf4f4345ce1230d69bc4703c98b524c8225e95 SHA512 80ceb718fe6ec318e1b1b71db70af8743ffcd3837948a7e56cc4cdc3dc27266b2e8b8883d1d3f4725ca1763ca5ba1c591fe12ba52a17804fa7515399d60a84cf
 MISC metadata.xml 470 BLAKE2B 8855ba12ec2147f31efb154d314b9e2e625076453bc4ddf43022b08a597a1f1ea5bb401768e38b000718b200b8e60d16214a89c1642b66d31386152e242a4e03 SHA512 0a09da72e78c945fa53ee056913bc563897dcb65c33e8cba04dfd15d57a1578a502f18071b0a3cd5feecdbc7e570bfddfde05deda12746e70962b841d90d566a
diff --git a/dev-embedded/avr-libc/avr-libc-1.6.2.ebuild b/dev-embedded/avr-libc/avr-libc-1.6.2.ebuild
deleted file mode 100644
index 159067b2bd64..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic
-
-DOCS_PV="1.6.2"
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="amd64"
-IUSE="doc nls crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_compile() {
-	strip-flags
-	strip-unsupported-flags
-
-	mkdir obj-avr
-	cd "${S}"/obj-avr
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable nls) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"/obj-avr
-	make DESTDIR="${D}" install || die "make install failed"
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-	prepman /usr/share/doc/${PF}
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.6.4.ebuild b/dev-embedded/avr-libc/avr-libc-1.6.4.ebuild
deleted file mode 100644
index daa457e08bd3..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.6.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic
-
-DOCS_PV="1.6.2"
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="~amd64"
-IUSE="doc nls crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_compile() {
-	strip-flags
-	strip-unsupported-flags
-
-	mkdir obj-avr
-	cd "${S}"/obj-avr
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable nls) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"/obj-avr
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-	prepman /usr/share/doc/${PF}
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.6.8.ebuild b/dev-embedded/avr-libc/avr-libc-1.6.8.ebuild
deleted file mode 100644
index ca7f5fde1704..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.6.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic
-
-DOCS_PV="1.6.2"
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${DOCS_PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${DOCS_PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="~amd64"
-IUSE="doc crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_compile() {
-	strip-flags
-	strip-unsupported-flags
-
-	mkdir obj-avr
-	cd "${S}"/obj-avr
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}"/obj-avr
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	cd "${S}"
-	dodoc AUTHORS ChangeLog* NEWS README
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-	prepman /usr/share/doc/${PF}
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${DOCS_PV}/*
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.7.0.ebuild b/dev-embedded/avr-libc/avr-libc-1.7.0.ebuild
deleted file mode 100644
index 0e4ea8fbe364..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.7.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="~amd64"
-IUSE="doc crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_prepare() {
-	# work around broken gcc versions PR45261
-	local mcu
-	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
-		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
-			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
-		fi
-	done
-
-	strip-flags
-	strip-unsupported-flags
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog* NEWS README
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	dosed "s:\$(VERSION):${PVR}:" /usr/bin/avr-man
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-	prepman /usr/share/doc/${PF}
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild b/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild
deleted file mode 100644
index dbe5b3c302bb..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.7.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="~amd64"
-IUSE="doc crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_prepare() {
-	# Fix avr-libc bug #32988 causing an ICE with gcc-4.6.0
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-
-	# work around broken gcc versions PR45261
-	local mcu
-	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
-		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
-			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
-		fi
-	done
-
-	# Install docs in correct directory
-	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
-
-	strip-flags
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-	prepman /usr/share/doc/${PF}
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild b/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild
deleted file mode 100644
index 166f785d1ea9..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.8.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="amd64"
-IUSE="doc crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_prepare() {
-	epatch_user #455828
-
-	# work around broken gcc versions PR45261
-	local mcu
-	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
-		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
-			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
-		fi
-	done
-
-	# Install docs in correct directory
-	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
-
-	strip-flags
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-
-	# Make sure diff cross-compilers don't collide #414075
-	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-}
diff --git a/dev-embedded/avr-libc/avr-libc-1.8.1.ebuild b/dev-embedded/avr-libc/avr-libc-1.8.1.ebuild
deleted file mode 100644
index a217bfb1bc43..000000000000
--- a/dev-embedded/avr-libc/avr-libc-1.8.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="~amd64"
-IUSE="doc crosscompile_opts_headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_prepare() {
-	epatch_user #455828
-
-	# work around broken gcc versions PR45261
-	local mcu
-	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
-		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
-			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
-		fi
-	done
-
-	# Install docs in correct directory
-	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
-
-	strip-flags
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-
-	# Make sure diff cross-compilers don't collide #414075
-	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-}
diff --git a/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch b/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch
deleted file mode 100644
index 1f0922196c36..000000000000
--- a/dev-embedded/avr-libc/files/avr-libc-1.7.1-gcc46.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- avr-libc-1.7.1.orig/include/avr/pgmspace.h
-+++ avr-libc-1.7.1/include/avr/pgmspace.h
-@@ -252,7 +252,7 @@
- # define PSTR(s) ((const PROGMEM char *)(s))
- #else  /* !DOXYGEN */
- /* The real thing. */
--# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];}))
-+# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
- #endif /* DOXYGEN */
- 
- #define __LPM_classic__(addr)   \
---- avr-libc-1.7.1.orig/libc/stdlib/dtostre.c
-+++ avr-libc-1.7.1/libc/stdlib/dtostre.c
-@@ -37,9 +37,9 @@
- char *
- dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags)
- {
--    __attribute__((progmem)) static char str_nan[2][4] =
-+    __attribute__((progmem)) static const char str_nan[2][4] =
- 	{"nan", "NAN"};
--    __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] =
-+    __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] =
- 	{"inf", "INF"};
-     char *d;		/* dst	*/
-     char *s;		/* src	*/
diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest
index 0a35cf059545..e68d21a381d8 100644
--- a/dev-embedded/dfu-programmer/Manifest
+++ b/dev-embedded/dfu-programmer/Manifest
@@ -1,4 +1,3 @@
 DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4
 EBUILD dfu-programmer-0.7.2-r1.ebuild 1271 BLAKE2B 9fe3fc243d5cb4ccb4cab584439049983c04935f0a70dcbf5a66c938b428523acb6b82e4df315ab59c780d962b3d84f64369ccdbe93b3c1a84720557fbee9eb1 SHA512 906960d349bda4a531b229e7e4583d7721f28cf02cd900b8b19314545e3fbadef9fb37571804a0e80bf72496e09e712442e7108ef03667d81e4a1b115f068f80
-EBUILD dfu-programmer-0.7.2.ebuild 1087 BLAKE2B c9a5877f3afcab813320298292d914acd15ecb6f9b0b575542326e25a9735e2ceae7452e419097df753ab5163c19e077c77c868388d4fbbad1a3f0978e56a96d SHA512 8457ccfbb37887941b1a462bef3365958fb51896abe2a9bd4196d8518b401352d48a4996243374334cb258c412fbffd4ed87ea16bc47510f64328dae76ef7579
 MISC metadata.xml 441 BLAKE2B fb5651aaeac357109390fd1b83fe5259369ca3613eec202f3c263db19e111bab5ac28d43312dbb5f7751f0258318c2845fc65100cfdf1c35b1a31dc1c2446df7 SHA512 97cf04d36796543c7fde8bcff89a8a5e3f19a665e4a20f84dc9493a46a0543038ca262ab26b149a3c514771f21963247dbf8f751f3dd26b6d505c3bc43cb4fe0
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2.ebuild
deleted file mode 100644
index 1cc8bda74914..000000000000
--- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit udev
-
-DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
-HOMEPAGE="http://dfu-programmer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-RDEPEND="virtual/libusb:1
-	virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Upstream has fixed this in their configure already.
-	tc-export CPP PKG_CONFIG
-	sed -i \
-		-e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \
-		-e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \
-		configure || die
-}
-
-src_install() {
-	default
-
-	cat <<-EOF > 70-dfu-programmer.rules
-	#
-	# do not edit this file, it will be overwritten on update
-	#
-	EOF
-	printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \
-		2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules
-
-	udev_dorules 70-dfu-programmer.rules
-}
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 4bbf92da3935..bd08bfb98df8 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,9 +3,9 @@ AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014
 DIST libftdi-0.19.tar.gz 406671 BLAKE2B 47979967d8597584e46a5d9297ed24454d0583869110b52af7662a04a4b037ea57ec6ba133a61d355f0ccf1366b14195a8ccb13d7bb585264cdd1d528f2cf2d9 SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
-EBUILD libftdi-0.19.ebuild 1234 BLAKE2B 6d3b3c223704cf104efb709c64106887962e2a2f5138586e2f3a8f2178dd87886a4993ed01b337f622c4efded07c857a4368c6a95f2682f1a39b84857e86b867 SHA512 3618b73cc502240a88fef090da39abb8e4a71add63f782e79763ef88621438bf0bc95efa45f936463daeb7905d7264d36abd45fd979594e39ad46d3fd8209bea
-EBUILD libftdi-0.20-r1.ebuild 1780 BLAKE2B 48e56d6a4c7e18c18d99a7397dc0acdbef87377394f82b698d06658e4c58bb8f56386810f6cd5e4e75edb0d01d6dccfc20003df6ec856aa3b002e773c272fabe SHA512 b82aa918db8fb28c0185849423cc20eccae76cebfa15a0f49257ca9d0eccb64f3c80188ead3d8056e73f8ce3945de5ccfe114d11f0d224f641779f0ead47768e
-EBUILD libftdi-1.2-r1.ebuild 1711 BLAKE2B d5023c8feae79998eefcad1ddd69bd4da5c7f4433fba511fd7337b527f1bacc6d65a5938a5071ffb1ade1603de8f9169c1b95087eda03e9f17ac8188d7e0b9e6 SHA512 36b0809ec968d944aa253b645cfca615445ea15b092df4afb0bac1f116ae5f77923ee1abf94632fee5c9ab9ebe553b3c6602be854e5903b94bfb3a95b9ddfc9e
-EBUILD libftdi-1.2-r2.ebuild 1721 BLAKE2B 82321eb4a9f3fda05c2b3d3ac89c5dd36016dc6b543c19f4f2a05e121d4d0eea9d1bc6a52762264d4f02070997a911ee5670389ab32780ed15b3bc54d787a0d8 SHA512 ab24bcde6120173308fa144bee5fe9e12e3e93f33c6370707a39d5f4f092c1fe6c2115c9464a3060ebbe3dca69759986cd21eb1150fb9ce5fb6b340f8a5d9aee
-EBUILD libftdi-9999.ebuild 1721 BLAKE2B 82321eb4a9f3fda05c2b3d3ac89c5dd36016dc6b543c19f4f2a05e121d4d0eea9d1bc6a52762264d4f02070997a911ee5670389ab32780ed15b3bc54d787a0d8 SHA512 ab24bcde6120173308fa144bee5fe9e12e3e93f33c6370707a39d5f4f092c1fe6c2115c9464a3060ebbe3dca69759986cd21eb1150fb9ce5fb6b340f8a5d9aee
+EBUILD libftdi-0.19.ebuild 1235 BLAKE2B 2c76a4080ad380355b24c9f2fe1c40ece41e80f8fad57c5c93233c9c13feabe1370263bda92f1ab55124bf0881b4bdb85bc5dcf20d8f52abb8c8b854fbd17e96 SHA512 35b81492bacdcf1ddf9fd8d2aea8e9149a83264d9da2cd524e7ff90497fbfd5132e17c47a5105ca73c26dc7f5826d4b4d81413d65169194bea6d1a1ac38791f4
+EBUILD libftdi-0.20-r1.ebuild 1834 BLAKE2B 048da8d61f6959bf6cb91f86ea573a44a912152c4703be5a8326970e7bec93fdb010d1abf001b4b6b749d06b65a9e9f8358db19b790916fa355cf8536e9a3713 SHA512 3ce94d14f19e250c1ecff203f4be72a96438ce473d308f291f485338c3bddfe54b6d78362cc9f95108b8f750ec15fcfbb6d69ac4f9eb9692a9f5c55e5135e5e7
+EBUILD libftdi-1.2-r1.ebuild 1717 BLAKE2B fa33c5993b734ae0eddbd87e3bf098d392ae8e808608ba435713b94bc77323aed77a26c8eed13a4578966a3723b780633bae9c40cc1d644a2c35f683a201421c SHA512 fd235ee3c492ca0a119ff616719f29776637e09362c0c14b64be3eb8dbabd6cd763b05ffc8bdce64d736e198d78cabd905987eb72c1bc492f029aae3f6ae3eb3
+EBUILD libftdi-1.2-r2.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
+EBUILD libftdi-9999.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-0.19.ebuild b/dev-embedded/libftdi/libftdi-0.19.ebuild
index 69ea48c31b00..71475c707666 100644
--- a/dev-embedded/libftdi/libftdi-0.19.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.19.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
 
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2 autotools
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
 	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 87f52c9e3e58..8aed5262ba38 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit cmake-utils python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
@@ -20,6 +20,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="cxx doc examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:0
 	cxx? ( dev-libs/boost )
@@ -28,7 +29,10 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-include.patch
+	"${FILESDIR}"/${P}-cmake-version.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -44,12 +48,11 @@ src_prepare() {
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
 
-	eapply "${FILESDIR}"/${P}-cmake-{include,version}.patch
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
index 8c4d73cf0ed8..9ca55beeaad6 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
index c52061be670e..e35ae39feab1 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index c52061be670e..e35ae39feab1 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)