gentoo resync : 07.01.2018

11 files changed, 7 insertions, 136 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3d42fb64f4ad..d8cc02651dcf 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5a82c044d15c..c04241d2b96e 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,7 +10,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
 EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1562 BLAKE2B e1a458209939aab920d4a25c4e9e7d34f974bbaebdac4698c2455951f5b5c27d96534784ce953e92279d98e5a4f950e415798c2576d2f3835d71abc544bf0741 SHA512 9ace3492275b950d8b197db4495fa3b8b027801c37572fc0bf50b71f609b6c258c0bf41fbb9adcbc7eb3d246910648c876cbac0a794fc76c8dbf76777bed3448
+EBUILD autoconf-2.69-r4.ebuild 1559 BLAKE2B 485c6148286adc9814ff0e8dd9cb6f1e7bb36c5f47a75041cecfe4c131e6679c10a195038d6af1763bb4491c4627a681017cb33351481d0ba82f479a2a5bd4d8 SHA512 d114c9bcd4f4acfba91b270ee3191d22d0bfd5579374859182701e56c855940a6ff315e0996b55adef475cea9367ffac2ce355b89e81d999b5fbfaeec36331ae
 EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
 EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index de99da3e030e..f908b5d23b9e 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 1a950b0e11f4..0f5be59eaad0 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -3,6 +3,6 @@ AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e85
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 EBUILD bc-1.06.95-r1.ebuild 1510 BLAKE2B 2d4e498eebe76077986a82c249c6bcbd2fcf6628b27c499cdab4952822b992d11854cac88832f30c5a7b618f96bc9b2063fdce9bb3f118d8df5b0400f7f0a52f SHA512 d246ee01a277848789ac860c52d4b1bbab93246b02e5baf09099ba1e88978f824e34abaefa732a4cdf7b41bc7186f959c622fbe2b9fceb14af41e0a313f3b1f4
-EBUILD bc-1.06.95-r2.ebuild 1633 BLAKE2B 682fe710dd128ec98a264ec31f5444d71f95cb264d34df211e64b94edbbddddd46b127f70e5bd9c4290b5c1866ce4430310920bba1611f3e7ab2b5faf2cf0f07 SHA512 11e823917b4103b007ecf0601bc28d7e5d2525a12b1e935d470baf472db55a711a32416765bdbf9282cd913da1f8c9bd9696672220135a35a612350487455171
+EBUILD bc-1.06.95-r2.ebuild 1632 BLAKE2B be6bc243ba2b93300e87504104887302668fbdbab46856d49f4374a8f1246c037e61f574a5b9851875cc65c925785d9acd0bf2e6ef03689e82811b013172f8d3 SHA512 f6e62843c7b14b7290ca90716bb4be09a358fa66e8692a67a556159affb123acc4b390c41a42b3a6c044f04001665f2540c32fed827dca162ff60cf73b3c9876
 EBUILD bc-1.07.1-r1.ebuild 1273 BLAKE2B afc42976eb7c32847e0979a9d551c4504e3fc702781c7dea59efafb21937d8a824bfa6bfa67880aead8c3fb129e5bf2a4c065d28108f64bb0cda33ce730dadf3 SHA512 16bd0dc631c798e1ff3a1a42b887a149204bb48ec9efdd097a6ebfe8d31a1fa163530dbc7fa77b9ab174cacc96cb31ae1f9dac298cf51a13aff89d0c127fc964
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 76c624078a9f..f0ce2e80705f 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index a61cadcd46b3..8a37de9d65f3 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,13 +1,6 @@
-AUX use-new-path-for-functions.sh.patch 302 BLAKE2B 9aff99c39e97553c8d23ee141f354d0a27138a715d2ee13ee2cfc700d33d99d4f51b501d7edbe8333c68f1c4259f97c6479b6ec9f26e9f837d158d4e2d82cc1c SHA512 539d3bfaaef536958fd2018fd957c83ecf98eaf0b0a5a5360088ae4896a4bf0f51b417d73d21a21f946e8a84ac38115cb4c1700b5b6c1b0480b49f229469a5d3
-DIST crossdev-20151026.tar.xz 22160 BLAKE2B 36cd292ffc9e8051d2684315a1546260ea3de9ff6c1324d8c0463501c1ab2671a998f176220220f8050d3d816bff48d1e263b35fcc50139e6149965d4d163b30 SHA512 f60efd4ad867efd0eb33de5fe327ccbfe73b574c97507bc0edd7ef141ad74c035ae2a0d446180e6a9eb5f43197f44933a452245feec849bacfb03fc07067edd0
-DIST crossdev-20171119.tar.xz 22596 BLAKE2B 4e606f63aad234684b6400203fc22a9ff7dbd9f14dca5e2f2055f08207e412a3a3352921109100b32b4f6fb51cc0836ada4e8db8011d781e9e7c990d6c92d3d1 SHA512 3b8d7b89adf06d5ffef169ed1015532220c997731e083fd73c27d80ea09a6a7efd456734104aa58ef386426f9a04fed3147f37aefe4106c378a0b865bfffb2f0
-DIST crossdev-20171227.tar.xz 22780 BLAKE2B 983dd5da66c1e467b622867c9d474c7e1b7befd4fb91e1e008f7d7d8416bb077bcd06274fe8145ec9338f652e780d2ddd3a501f79b46af280cb5dbb4c8324965 SHA512 bc91e95aa9a927416f2b97b989657de5a740707bb4f4cbfc3d9e0626c3977b3091040104a52205762ef9cc0d3cd7933fb527efa20086dedfd9b390dc2be167a0
 DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
 DIST crossdev-20180105.tar.xz 23056 BLAKE2B 66618f312b6f9492b1ccbdc7142e6b38035bb52f864a53d5b6afed702f31dcad11d647af68239dd6cb1af06b7eee5046507cffb03aabb27f758d0513ae9aa888 SHA512 f10ac454a996268e0bf798e2e322961873f3666c032f0ea3a0bc88eabd0428d894726726b089ca180ff9b718b5041be136c28a572ffb31fde76b8ac58a8fc1f2
-EBUILD crossdev-20151026-r1.ebuild 965 BLAKE2B e32a6498622e7e95cad638e4e98e769a6b3490181f9f6b5f436edc7ad7df0e15d5ea312a9450e87dbe6811e8ae95847fc6ff81231822d7625cf7dd4ae5de2320 SHA512 cd4084c2dcf43b410e35d4a99bc04b3fec726b3665834acb5dfd6403ec1cad86632a424fcac8afc72f98b3ab37f15e4de8ebb783c9dee81d4a472902a08b9da5
-EBUILD crossdev-20171119.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
-EBUILD crossdev-20171227.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
-EBUILD crossdev-20171230.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
+EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33
 EBUILD crossdev-20180105.ebuild 867 BLAKE2B 5f004170eb7dd1b3ab4d1e95227d2ce85df8dd4370252e57b40581843372bc82126b69cf6eb81be6597d7b535b0fd6ffe28333b4a50131506047cc47024ed677 SHA512 27a6f7bcc07db27cff19b0b894c976a0dc2d1acffda8a76708233f9acbe8c6b8024f5665087b470593890bbab47ed154a5866cf698591ee471b5d73733b4aaae
 EBUILD crossdev-99999999.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20151026-r1.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
deleted file mode 100644
index e13edd3253a3..000000000000
--- a/sys-devel/crossdev/crossdev-20151026-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
-	default
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171119.ebuild b/sys-devel/crossdev/crossdev-20171119.ebuild
deleted file mode 100644
index 73d9c4690063..000000000000
--- a/sys-devel/crossdev/crossdev-20171119.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171227.ebuild b/sys-devel/crossdev/crossdev-20171227.ebuild
deleted file mode 100644
index 73d9c4690063..000000000000
--- a/sys-devel/crossdev/crossdev-20171227.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171230.ebuild b/sys-devel/crossdev/crossdev-20171230.ebuild
index 73d9c4690063..23a0747eb414 100644
--- a/sys-devel/crossdev/crossdev-20171230.ebuild
+++ b/sys-devel/crossdev/crossdev-20171230.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 6d45575a7d9d..000000000000
--- a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crossdev.orig	2016-02-18 12:28:49.926442767 -0200
-+++ b/crossdev	2016-02-18 12:32:25.962433210 -0200
-@@ -15,7 +15,7 @@
- 
- CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
- 
--source /etc/init.d/functions.sh || exit 1
-+source /lib/gentoo/functions.sh || exit 1
- esyslog() { :; }
- die_logs() {
- 	echo