stabilization sweep

13 files changed, 4 insertions, 306 deletions

diff --git a/dev-util/dcd/Manifest b/dev-util/dcd/Manifest
index b6b90ba..18e9d3b 100644
--- a/dev-util/dcd/Manifest
+++ b/dev-util/dcd/Manifest
@@ -1,9 +1,6 @@
-DIST DCD-0.10.2.tar.gz 131108 BLAKE2B d83982767011ef8ebf04e22533725dd18d0fe27513b72d185adce255813eb620fa79d86645862aac352dbef70bd747e049eec01bd7eb45e1869921916166bca1 SHA512 c034a9196e5261b637073f02448081423c82285a8838c412bc1396807c85813554d35d4f9ce21c3abb9a53a9fcb37d0b7ca139c45b68ea0bd89c77ae4ff2f399
 DIST DCD-0.11.0.tar.gz 132185 BLAKE2B f74dd181caf65a6e251595b96cd66d6d720724f9ad6375ba5763bdba5e622fe2b8f5ce2bbb5f2309f8fbfbe753041b046f0adb39943d0e1f6221a0da9f111beb SHA512 0004f795d06dce23ec988fed74f7103ac4940080c8e416430f9654aa9462635b318582c3cd78b320aa2b8fcc4747a7ce29b85c328f18c92164f2954955194492
 DIST containers-836a0cc93a98815ac309294c45aab0ba98018073.tar.gz 54321 BLAKE2B 28791344e4fa5de7b5cedf6e077131542ec31ea9bfef363edb7cd398a10599d8dd2c830c5b4ac8cbbfbd203e3c8b0579dda3e67b4e5d3e154f27aee0cc139368 SHA512 d46277e3bc73bcabdacf24635be650fb8c5c5134ae39160605dd1152a427f5a7e1b4218bd34636fa7c7e3058f4c6b31c984823ea8e2927a16d0d16ecda3cc0d4
-DIST dsymbol-4606b1608e77af7df58e5d03e18327f623ec25e9.tar.gz 30279 BLAKE2B eef438e20f2eed8770d96eafaa0cba5d705cc3ef4cce9af4988f20b05450ffc918446dcab83a8d4ec3e189c127875a2d0bc9ef524cb26ef565b83c07a1a586f2 SHA512 1044916b66bfeacd09f0817f1169595dff286b314125d6dd05b828bdd544114c15c58549e28a6a423522fa821e09e5d70f9b40d19c261f1dba0dae4564c0b5ab
 DIST dsymbol-de7389be5dda532ef7cd431d03efbfe6b9522687.tar.gz 30881 BLAKE2B 6baa8f4545684a1007b059da33514dbdba886518f2f96253f4960a23c50b5b82755040e99a6f62f3a5951992ce65a9334bfc85ec7f2be385d1a6d674d0fe6d5f SHA512 7174c386b0e562e3fcbe12539f206851dc4841b5a42e9fb5fffd7fcd852c328b0c1ba849cd74915be4b1b363e10b6bbed7b6839eab43226d3c21201a81842956
 DIST libdparse-23b20de4ee48ed3f0e8729f6318405543cb3a611.tar.gz 122297 BLAKE2B b2aab10e923a9682dc9a87209ed7492b91df01aa0a2ebf29d4735e1357013346f713a75c7fd96e1039d122a8fa8460d87c2516d7fdcd10611790dfdcb9cfc6ee SHA512 4d6615364c24ca9ffaef3bf66717fab3a593da868bb351750c8be57ca3ffd78435dde4752d6fd90c67efe9b229c7be7c86aea67e732003771ef779541996a099
-DIST libdparse-f102ea205af7886382b986162158e7da89b73eb0.tar.gz 120003 BLAKE2B fb511877d9e38ebfa0310c9ac6a964a3f722a7c660085a2048e60b689ee228fd21c84b026f005b783280be72b79128c3df079fe7be56a885e2176c6096cf2fc2 SHA512 f10ae44130e911c4cb4df26137fed9e40dba6b01e8ec3a213e5d65d5b652ef5764fedd1d60e6b4fd31c153a4f6ff1ae243d14271677356d0746928d9b3f053b3
 DIST msgpack-d-19d9245e315a85763754ded6912c2375c9226e04.tar.gz 143902 BLAKE2B be7f122a85af0e6313a9590496f6fa1a910ac1f092c378c050efb2ee54e39caf2a8b6200297fcb251b16b27caefd4be78cd16a8542bfa8875fbaca6472c9b6b5 SHA512 3f391c5f1b6c04bfcde96c97d2325d946df3bbeeac752bcca267d2c737f8752342dc415517e61691729787f766384edc796b82fac23b55191b4f84a50f931777
 DIST stdx-allocator-d6e6ce4a838e0dad43ef13f050f96627339cdccd.tar.gz 103648 BLAKE2B c08925df810761bb4825d6058375dcc5415f4838403b3668aeff5c1be93c7d04b49c1994da27aa498cd0f4abd1ff923e8d906ae53c922f94bc63dac334b7f138 SHA512 3a41f95505e92d79a6b966d21d96fe5b5bb2b2f3762b09998b27334684d815a82a3e705935faa1b543a93ffb274c67b9110b2b1b7364f7d405bd65d05b819271
diff --git a/dev-util/dcd/dcd-0.10.2-r1.ebuild b/dev-util/dcd/dcd-0.10.2-r1.ebuild
deleted file mode 100644
index 852806b..0000000
--- a/dev-util/dcd/dcd-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Auto-complete program for the D programming language"
-HOMEPAGE="https://github.com/dlang-community/DCD"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-CONTAINERS="836a0cc93a98815ac309294c45aab0ba98018073"
-DSYMBOL="4606b1608e77af7df58e5d03e18327f623ec25e9"
-LIBDPARSE="f102ea205af7886382b986162158e7da89b73eb0"
-MSGPACK="19d9245e315a85763754ded6912c2375c9226e04"
-ALLOCATOR="d6e6ce4a838e0dad43ef13f050f96627339cdccd"
-SRC_URI="
-	https://github.com/dlang-community/DCD/archive/v${PV}.tar.gz -> DCD-${PV}.tar.gz
-	https://github.com/economicmodeling/containers/archive/${CONTAINERS}.tar.gz -> containers-${CONTAINERS}.tar.gz
-	https://github.com/dlang-community/dsymbol/archive/${DSYMBOL}.tar.gz -> dsymbol-${DSYMBOL}.tar.gz
-	https://github.com/dlang-community/libdparse/archive/${LIBDPARSE}.tar.gz -> libdparse-${LIBDPARSE}.tar.gz
-	https://github.com/dlang-community/stdx-allocator/archive/${ALLOCATOR}.tar.gz -> stdx-allocator-${ALLOCATOR}.tar.gz
-	https://github.com/msgpack/msgpack-d/archive/${MSGPACK}.tar.gz -> msgpack-d-${MSGPACK}.tar.gz
-	"
-S="${WORKDIR}/DCD-${PV}"
-
-DLANG_VERSION_RANGE="2.075-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit dlang systemd bash-completion-r1
-
-src_prepare() {
-	# Default ebuild unpack function places archives side-by-side ...
-	mv -T ../stdx-allocator-${ALLOCATOR} stdx-allocator/source || die
-	mv -T ../containers-${CONTAINERS}    containers            || die
-	mv -T ../dsymbol-${DSYMBOL}          dsymbol               || die
-	mv -T ../libdparse-${LIBDPARSE}      libdparse             || die
-	mv -T ../msgpack-d-${MSGPACK}        msgpack-d             || die
-	# Stop makefile from executing git to write an unused githash.txt
-	echo "v${PV}" > githash.txt || die "Could not generate githash"
-	touch githash || die "Could not generate githash"
-	# Apply patches
-	dlang_src_prepare
-}
-
-d_src_compile() {
-	# Build client & server with the requested Dlang compiler
-	local flags="$DCFLAGS $LDFLAGS -Icontainers/src -Idsymbol/src -Ilibdparse/src -Imsgpack-d/src -Isrc -J."
-	case "$DLANG_VENDOR" in
-	DigitalMars)
-		emake \
-			DMD="$DC" \
-			DMD_CLIENT_FLAGS="$flags -ofbin/dcd-client" \
-			DMD_SERVER_FLAGS="$flags -ofbin/dcd-server" \
-			dmd
-		;;
-	GNU)
-		emake \
-			GDC="$DC" \
-			GDC_CLIENT_FLAGS="$flags -obin/dcd-client" \
-			GDC_SERVER_FLAGS="$flags -obin/dcd-server" \
-			gdc
-		;;
-	LDC)
-		mkdir -p bin || die "Could not create 'bin' output directory."
-		emake \
-			LDC="$DC" \
-			LDC_CLIENT_FLAGS="$flags -g -of=bin/dcd-client" \
-			LDC_SERVER_FLAGS="$flags" \
-			ldc
-		;;
-	*)
-		die "Unsupported compiler vendor: $DLANG_VENDOR"
-		;;
-	esac
-	# Write system include paths of host compiler into dcd.conf
-	dlang_system_imports > dcd.conf
-}
-
-d_src_test() {
-	# The tests don't work too well in a sandbox, e.g. multiple permission denied errors.
-	cd tests
-	#./run_tests.sh || die "Tests failed"
-}
-
-d_src_install() {
-	dobin bin/dcd-server
-	dobin bin/dcd-client
-	use systemd && systemd_douserunit "${FILESDIR}"/dcd-server.service
-	dobashcomp bash-completion/completions/dcd-server
-	dobashcomp bash-completion/completions/dcd-client
-	insinto /etc
-	doins dcd.conf
-	dodoc README.md
-	doman man1/dcd-client.1 man1/dcd-server.1
-}
-
-pkg_postinst() {
-	use systemd && elog "A systemd user service for 'dcd-server' has been installed."
-}
diff --git a/dev-util/dcd/dcd-0.11.0.ebuild b/dev-util/dcd/dcd-0.11.0.ebuild
index 6c99234..48064c4 100644
--- a/dev-util/dcd/dcd-0.11.0.ebuild
+++ b/dev-util/dcd/dcd-0.11.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/dlang-community/DCD"
 LICENSE="GPL-3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systemd"
 
 CONTAINERS="836a0cc93a98815ac309294c45aab0ba98018073"
diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
index 35e074b..fcaa083 100644
--- a/dev-util/dlang-tools/Manifest
+++ b/dev-util/dlang-tools/Manifest
@@ -18,7 +18,6 @@ DIST dlang-tools-2.080.1.tar.gz 110274 BLAKE2B df98d4f50f48e0ee0798898744d2099a2
 DIST dlang-tools-2.081.2.tar.gz 110459 BLAKE2B 550cf921e923235c2f418134f380c2a6ef67b50e0c7df100d7fc314727ab1a2f72f6bd3c53df346bfa6428f82de54eb155f54243601ad455e35cf28a56990fc5 SHA512 cd91fab26e503058aa172880d3b2db74879e49d80a89c4f43f5620f454fde52e48ad4dcd6433a70c6cf180d094d6819bc790d80b849f030e0d080b7a2015bf67
 DIST dlang-tools-2.082.1.tar.gz 113133 BLAKE2B 597e3fa5ace5f6fd56f415920d8ab3db634257a97de94790db5f6a5f50bec21b85e88569a8a7f4172f1201a3b9ded6d4ad6ea6e065d57ac22ffad00c393a0628 SHA512 b4de6303079631601dea83fae94d0a36a4b47ba2af907fbe8c1c6f6a5dec9fd8525f6a52093032b0d3ef53cea6314799e7f435322a6bf10609a3c67ae571b837
 DIST dlang-tools-2.083.1.tar.gz 113127 BLAKE2B abf5491331e9d0c4e24511b94da1c7e76d11a716549984d71e16c4d2d447042a729cecd557441dfde20f146280df16e6b1d7df2e7eb59c5cfa977e2b78efeeae SHA512 a5019507eb505188d64a7504deb9bde9637ddc7c49b8aed38dbc167fb0df81a4854363e5af6a21e10735833c872128861d4edc691565b8763e0cfa7f82a4d5c2
-DIST dlang-tools-2.084.0.tar.gz 113127 BLAKE2B 1741ecdca67ded6c6155ffc3ec4344d1e8cd8a0d4e6bcde426d9591a9c4797432819057d6aa128145832138ecac71bcb536dfb0dc08c147edfa5af1f265e970d SHA512 a2f0d48f63d3af162415445ce967e64fe8abf0f8ce4b06b094bdb9bf55dc866c4561bd7a9dd6419e6829cf7e4fdbd3e8b2c71c3b6b9dfc9cb27be72aff68029b
 DIST dlang-tools-2.084.1.tar.gz 113129 BLAKE2B eaa013e5d4c05561d3c91a2b597b3cc9858bb3447f08beb5c7ecc143a397592872878663d27ed187973bb2861c8f2f432377c1f3be71988db4063296dbc53f74 SHA512 30ffaed79d61b4f1080b6a1c53824517ee5ed4c9d55ae10146c9f200bad6c73ca8e30d84e8e70f3798027e99b472014e0e38e307ccc3caf70031e02f23dc9927
 DIST dlang-tools-2.085.0.tar.gz 116352 BLAKE2B 12aadde6b683063030be8557405149f0d626b8da6e4f6f17c7a99bd6a01d7dbfe6d4447f21951a09d43a6ec970859828baf777e28d6da7199236924634474913 SHA512 cac2a70eaf75ee3b542d43ac23dfc606e5300a5fd3790f1770057665786eb959f903bbd271e8d6e8a2d32e7408ec16e78315c64c6347024ca1791ec50bedc368
 DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9 SHA512 a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf
diff --git a/dev-util/dlang-tools/dlang-tools-2.084.0.ebuild b/dev-util/dlang-tools/dlang-tools-2.084.0.ebuild
deleted file mode 100644
index 1eb457e..0000000
--- a/dev-util/dlang-tools/dlang-tools-2.084.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Ancilliary tools for the D programming language compiler"
-HOMEPAGE="http://dlang.org/"
-LICENSE="Boost-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-TOOLS="ddemangle detab dustmite rdmd"
-IUSE="+ddemangle detab dustmite +rdmd"
-REQUIRED_USE="|| ( ${TOOLS} )"
-
-inherit eapi7-ver
-
-DLANG_SLOT="$(ver_cut 1-2)"
-RESTRICT="mirror"
-
-BETA="$(ver_cut 4)"
-VERSION="$(ver_cut 1-3)"
-
-if [[ -n "${BETA}" ]]; then
-	VERSION="${VERSION}-b${BETA:4}"
-fi
-SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
-
-DLANG_VERSION_RANGE="2.075-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit eutils dlang
-
-S="${WORKDIR}/tools-${VERSION}"
-
-d_src_compile() {
-	use ddemangle && dlang_compile_bin ddemangle ddemangle.d
-	use detab     && dlang_compile_bin detab     detab.d
-	use dustmite  && dlang_compile_bin dustmite  DustMite/dustmite.d DustMite/splitter.d
-	use rdmd      && dlang_compile_bin rdmd      rdmd.d
-}
-
-d_src_install() {
-	for tool in ${TOOLS}; do
-		if use "${tool}"; then
-			dobin "${tool}"
-		fi
-	done
-
-	# file icons
-	for size in 16 22 24 32 48 256; do
-		newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
-	done
-}
diff --git a/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild b/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
index f4042c9..1eb457e 100644
--- a/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
+++ b/dev-util/dlang-tools/dlang-tools-2.084.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://dlang.org/"
 LICENSE="Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 TOOLS="ddemangle detab dustmite rdmd"
 IUSE="+ddemangle detab dustmite +rdmd"
 REQUIRED_USE="|| ( ${TOOLS} )"
diff --git a/dev-util/dscanner/Manifest b/dev-util/dscanner/Manifest
index d6e0683..ad93d56 100644
--- a/dev-util/dscanner/Manifest
+++ b/dev-util/dscanner/Manifest
@@ -1,12 +1,7 @@
 DIST containers-22fe1e5b385fbf64fb9647731291f377bdb117d3.tar.gz 54341 BLAKE2B dc66cf9f8c49078d955b1382ec5d685cf345aba570af1c3610ab89f2d3fa3334310eef358d7c5719ffdc4482e00616bcd4f45c9a4aca82c12006ba4ec243c870 SHA512 fe7744bfb4ff15570749b00c6b0df1ef5a3f76321b75076936815351322df60e0c0cf3facd51e71ad8aa0dea18c457ed7eb62760897a61b4484c1af34b61d99b
-DIST containers-5d85484707d9bb6bae374f352231e633518efe5a.tar.gz 53410 BLAKE2B 3aa4dfd1fca92232846de3b101fee53c114cdd744d69a7a05c85dca2e4b52cdb50295b25f45225cd5b1a2c46e4124d8807bfb7ae46e59933d508d0357186e009 SHA512 139df75a56d71789fb17a7740d975680f0dc88c860cbb1b46ef9cd9fa75afe4e09cc42f0e9e77a1cefd56929f5aba684e6148a76c20d399e9238abf581aebada
-DIST dscanner-0.6.0.tar.gz 85558 BLAKE2B cf40875faff71cb1060ebd3867b421b4916bfce015992877b015baf86e3a24ae24bc462c8ca370f48646b2a3aa61b17bc92c084936df4225b4a7cc30a26de6e4 SHA512 cf02ee2d4cb5a8ca58d3eedb5fe421d474623d4b987845600d64c72e9596d796cde20c53147bc3e66e774afc6a758a462724382d8cc2135fa8b11f389c2ed96d
 DIST dscanner-0.7.0.tar.gz 85626 BLAKE2B 046240ea2f1f85f673854b10cfd0424de1451c470792545bb948f2aa995fafebe9a9fffbb430113186a31ce9ea927cdf75f552c640aa175a0498c76e1637297b SHA512 76f061db0c8a6f4dd53bad783d40cf6904306f1f12e4e0efebc7912ecba4d893c2152280fca54e270e04c406ed724eba083d129a1aa7eee1d17dac9230cd33c8
-DIST dsymbol-211a3cf8c8a22f4329aabacbde4251cedbccdf8c.tar.gz 29862 BLAKE2B c81ebf87bf4eeb5b9e219268633887dd971c2a681712c191cb8e383e8a313f412c8ec48c02afac9f3b432fbe8c445db43a1865a0cc143e25725b268285891c6a SHA512 f7f18eb20bf83ab08fdca1835ba317a0bacea0830931b9e5d36b92ee407cd798b5550c1a707f0673c6a1d0901f63e8ff702b676450e4060a6a61dde23261d951
 DIST dsymbol-7eb7a3b5c57593b51d002ae4369501a1a395f31a.tar.gz 30896 BLAKE2B c3bd8908487b8e7b1eb9334e358d34e00d50e39c16f25bb89d1a349af326139602c30049deebefba3715e67e48a5f72209993924a3121544ab144d9833564b5a SHA512 e1d614e88f1d7e3fa732e01c0d4e6232fe9d06ce5d38683159d736d222fcd9d9a2e4fbf37639ddefd65d5030493d383b5f8b8fc21f902ddde67fc6f667486b2d
 DIST inifiled-cecaff8037a60db2a51c9bded4802c87d938a44e.tar.gz 8251 BLAKE2B fa0bb78c11f69e257a0974c16188475d50fcf2a56138fc288d6262be91604b8e706bfab2572b2d0e358c8366b400a2c5a3af6ba87d5243825ddf26a5a03fbfe2 SHA512 9a3c66eca2b48350c798fd0a54d37c8714d6a499e8412983f1bda2f00cda6fe1439bfbc6766d32529f3d7cc708a0528c52c077f9169727b492616691833c52d0
 DIST libddoc-beff9b8f11ddc71ffcdfa7108a3c12e5aa8e2825.tar.gz 19770 BLAKE2B 62ee95bcc0bcf3d6b34154e359a5ad305c3c570d27f7ff5401572b44a4b5ba2bce3077363b3cf21c0021f095f804d1a03875ee5b18451a7f0fc75eea076de323 SHA512 6c78d4912c84eb3875f94c50fb5b496fde9f42e92fb381219694887b9dc9599254c7a448af67d59b063c9f32c78d816ee3a64b3da218846114bf5ac68d696357
-DIST libddoc-bf0472714f435452c253fd7755d838e383cee987.tar.gz 19647 BLAKE2B 8a74ef2d24f97c8e45c1ed0f3ff5b306501d25a09ff2d38115952a4864fba9fc689681975d0e6639973f42074b5ff6c0ec186f9841a223a78f92fca0435f5756 SHA512 3b7f7f376baa9e83b9b782fa0642c3b6da3f481eb7b5bbe2a6dfc2f2ec4c1adc8bc9127916c147da08a201f79b33429c305583e9a47271bf65846c716810da27
 DIST libdparse-23b20de4ee48ed3f0e8729f6318405543cb3a611.tar.gz 122297 BLAKE2B b2aab10e923a9682dc9a87209ed7492b91df01aa0a2ebf29d4735e1357013346f713a75c7fd96e1039d122a8fa8460d87c2516d7fdcd10611790dfdcb9cfc6ee SHA512 4d6615364c24ca9ffaef3bf66717fab3a593da868bb351750c8be57ca3ffd78435dde4752d6fd90c67efe9b229c7be7c86aea67e732003771ef779541996a099
-DIST libdparse-ea63487efde96b6f169065d801bbcb8d7ed5dbb4.tar.gz 120550 BLAKE2B d7114362fdb5ba582ff8a6de35f689c00ed436ba9575e1cf373a7d8688e8487f9c4759f77102760beb859856e1cc02a90babc2c94a19a7fd5b5592e851feca6c SHA512 860b6c38d7fc7a2b5da981390e1c4b10cedb2da7419df6bbb3fc1fa46ac647235ee07baa532ca7bdf8095b0d7a2cdabcf20bc8efb73f5fc8491af6b57b3ed216
 DIST stdx-allocator-d6e6ce4a838e0dad43ef13f050f96627339cdccd.tar.gz 103648 BLAKE2B c08925df810761bb4825d6058375dcc5415f4838403b3668aeff5c1be93c7d04b49c1994da27aa498cd0f4abd1ff923e8d906ae53c922f94bc63dac334b7f138 SHA512 3a41f95505e92d79a6b966d21d96fe5b5bb2b2f3762b09998b27334684d815a82a3e705935faa1b543a93ffb274c67b9110b2b1b7364f7d405bd65d05b819271
diff --git a/dev-util/dscanner/dscanner-0.6.0.ebuild b/dev-util/dscanner/dscanner-0.6.0.ebuild
deleted file mode 100644
index 43f8913..0000000
--- a/dev-util/dscanner/dscanner-0.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Swiss-army knife for D source code"
-HOMEPAGE="https://github.com/dlang-community/D-Scanner"
-LICENSE="Boost-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-CONTAINERS="5d85484707d9bb6bae374f352231e633518efe5a"
-DSYMBOL="211a3cf8c8a22f4329aabacbde4251cedbccdf8c"
-INIFILED="cecaff8037a60db2a51c9bded4802c87d938a44e"
-LIBDDOC="bf0472714f435452c253fd7755d838e383cee987"
-LIBDPARSE="ea63487efde96b6f169065d801bbcb8d7ed5dbb4"
-ALLOCATOR="d6e6ce4a838e0dad43ef13f050f96627339cdccd"
-GITHUB_URI="https://codeload.github.com"
-SRC_URI="
-	${GITHUB_URI}/dlang-community/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
-	${GITHUB_URI}/dlang-community/containers/tar.gz/${CONTAINERS} -> containers-${CONTAINERS}.tar.gz
-	${GITHUB_URI}/dlang-community/dsymbol/tar.gz/${DSYMBOL} -> dsymbol-${DSYMBOL}.tar.gz
-	${GITHUB_URI}/burner/inifiled/tar.gz/${INIFILED} -> inifiled-${INIFILED}.tar.gz
-	${GITHUB_URI}/economicmodeling/libddoc/tar.gz/${LIBDDOC} -> libddoc-${LIBDDOC}.tar.gz
-	${GITHUB_URI}/dlang-community/libdparse/tar.gz/${LIBDPARSE} -> libdparse-${LIBDPARSE}.tar.gz
-	${GITHUB_URI}/dlang-community/stdx-allocator/tar.gz/${ALLOCATOR} -> stdx-allocator-${ALLOCATOR}.tar.gz
-	"
-S="${WORKDIR}/D-Scanner-${PV}"
-
-DLANG_VERSION_RANGE="2.075-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit dlang
-
-src_prepare() {
-	mkdir bin || die "Failed to create 'bin' directory."
-	# Stop makefile from executing git to write an unused githash.txt
-	echo "v${PV}" > githash.txt || die "Could not generate githash"
-	touch githash || die "Could not generate githash"
-	# Apply patches
-	dlang_src_prepare
-}
-
-compile_dscanner() {
-	local container_src="../containers-${CONTAINERS}/src"
-	local dsymbol_src="../dsymbol-${DSYMBOL}/src"
-	local inifiled_src="../inifiled-${INIFILED}/source"
-	local libddoc_src="../libddoc-${LIBDDOC}/src"
-	local libdparse_src="../libdparse-${LIBDPARSE}/src"
-	local allocator_src="../stdx-allocator-${ALLOCATOR}/source"
-	local imports="src ${container_src} ${dsymbol_src} ${inifiled_src} ${libddoc_src} ${libdparse_src} ${allocator_src}"
-	local string_imports="."
-	local versions="StdLoggerDisableWarning"
-	use debug && versions="${versions} dparse_verbose"
-
-	local src=`find src -name "*.d" -printf "%p "`
-	local lib_src=`find ${container_src} ${dsymbol_src} ${inifiled_src} ${libddoc_src} ${libdparse_src} ${allocator_src} -name "*.d" -printf "%p "`
-
-	if [ "$1" == "unittest" ]; then
-		dlang_compile_lib_a bin/dscanner-unittest-lib.a "${lib_src}"
-		DCFLAGS="${DCFLAGS} ${DLANG_UNITTEST_FLAG}" dlang_compile_bin bin/dscanner-unittest bin/dscanner-unittest-lib.a "${src}"
-	else
-		dlang_compile_bin bin/dscanner "${src} ${lib_src}"
-	fi
-}
-
-d_src_compile() {
-	compile_dscanner
-}
-
-d_src_test() {
-	compile_dscanner unittest
-	bin/dscanner-unittest || die
-}
-
-d_src_install() {
-	dobin bin/dscanner
-	dodoc README.md LICENSE_1_0.txt
-}
diff --git a/dev-util/dscanner/dscanner-0.7.0.ebuild b/dev-util/dscanner/dscanner-0.7.0.ebuild
index 3b390bf..611ba9e 100644
--- a/dev-util/dscanner/dscanner-0.7.0.ebuild
+++ b/dev-util/dscanner/dscanner-0.7.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/dlang-community/D-Scanner"
 LICENSE="Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 CONTAINERS="22fe1e5b385fbf64fb9647731291f377bdb117d3"
diff --git a/dev-util/dub/Manifest b/dev-util/dub/Manifest
index d2b308a..4ff2f8b 100644
--- a/dev-util/dub/Manifest
+++ b/dev-util/dub/Manifest
@@ -1,2 +1 @@
-DIST dub-1.13.0.tar.gz 1271379 BLAKE2B 749ac67e99ab3959451cbd316f6936d50c25e68c32cbbc5075c17444b23f41e863a929d42f520a1bef2f7c6eff510814bf021e08baca1c73918435fb38b0ac70 SHA512 9d9a3f22ef4ae28e117e2d14b6837a975b66316e99dad4de9c9def278a40e567d1f6d73f56381a49a4ddd2d96b86910eccb335171439701a282e4f1ce8630422
 DIST dub-1.14.0.tar.gz 1277574 BLAKE2B 7b1bac4dc5789202eac150d63e230dbb10efdc0a32e9d33b778498c212fbdd974bca9c1f53602a9ee0cbab55d3d8bcb741f847be132674fe2c28846f5ab7c707 SHA512 aa1ef282021c6d090b5f6b485904b3e207b0acd67b42dd169c817ee7e9af24a69055b3eb1e1bad3c61f37ac47ce63bc1cf590b5d5dfd838abbcfe054f192be49
diff --git a/dev-util/dub/dub-1.13.0.ebuild b/dev-util/dub/dub-1.13.0.ebuild
deleted file mode 100644
index 455b7e5..0000000
--- a/dev-util/dub/dub-1.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Package and build management system for D"
-HOMEPAGE="http://code.dlang.org/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug"
-
-GITHUB_URI="https://codeload.github.com/dlang"
-SRC_URI="${GITHUB_URI}/${PN}/tar.gz/v${PV} -> ${PN}-${PV}.tar.gz"
-PATCHES="${FILESDIR}/${P}-gdc-dmd-pathfix.patch"
-
-DLANG_VERSION_RANGE="2.072-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit dlang
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-d_src_compile() {
-	local imports=source versions="DubApplication DubUseCurl" libs="curl z"
-	dlang_compile_bin bin/dub $(<build-files.txt)
-}
-
-d_src_test() {
-	echo "Test phase disabled due to multiple problems."
-	#DUB="${S}/bin/dub" test/run-unittest.sh || die "Test phase failed"
-}
-
-d_src_install() {
-	dobin bin/dub
-	dodoc README.md
-}
diff --git a/dev-util/dub/dub-1.14.0.ebuild b/dev-util/dub/dub-1.14.0.ebuild
index dc1000d..455b7e5 100644
--- a/dev-util/dub/dub-1.14.0.ebuild
+++ b/dev-util/dub/dub-1.14.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://code.dlang.org/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 GITHUB_URI="https://codeload.github.com/dlang"
diff --git a/dev-util/dub/files/dub-1.13.0-gdc-dmd-pathfix.patch b/dev-util/dub/files/dub-1.13.0-gdc-dmd-pathfix.patch
deleted file mode 100644
index 497ef50..0000000
--- a/dev-util/dub/files/dub-1.13.0-gdc-dmd-pathfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
---- a/source/dub/generators/build.d
-+++ b/source/dub/generators/build.d
-@@ -119,10 +119,10 @@ class BuildGenerator : ProjectGenerator {
- 		auto build_id = computeBuildID(config, buildsettings, settings);
- 
- 		// make all paths relative to shrink the command line
--		string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
-+		/+string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
- 		foreach (ref f; buildsettings.sourceFiles) f = makeRelative(f);
- 		foreach (ref p; buildsettings.importPaths) p = makeRelative(p);
--		foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);
-+		foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);+/
- 
- 		// perform the actual build
- 		bool cached = false;