stabilization sweep

9 files changed, 3 insertions, 254 deletions

diff --git a/dev-util/dcd/Manifest b/dev-util/dcd/Manifest
index 2d75eb0..248cf55 100644
--- a/dev-util/dcd/Manifest
+++ b/dev-util/dcd/Manifest
@@ -1,10 +1,6 @@
-DIST DCD-0.11.0.tar.gz 132185 BLAKE2B f74dd181caf65a6e251595b96cd66d6d720724f9ad6375ba5763bdba5e622fe2b8f5ce2bbb5f2309f8fbfbe753041b046f0adb39943d0e1f6221a0da9f111beb SHA512 0004f795d06dce23ec988fed74f7103ac4940080c8e416430f9654aa9462635b318582c3cd78b320aa2b8fcc4747a7ce29b85c328f18c92164f2954955194492
 DIST DCD-0.11.1.tar.gz 132806 BLAKE2B df3465c69747e244c2ab4ed85e0919493b257ebc603a0edfb7445512ba5c38c784534716c329698d6548d8a889028a37c17b0fdc6f6cbe6514efe7d1f3bab215 SHA512 95a330493c677109129af98d06ce0e25801b1b56ae10e5ed54f4875882868bcbe1e7d7fe11b250c00aabdb149286d7f232fc249cf8d2514a1c42f45f3f89f355
 DIST containers-257c0418f34709dd667f95b5dffabedc2b3099e4.tar.gz 54611 BLAKE2B c70ceff5ab3fd627db62922b978d41687fccb1986904cdef2cebfe2998262137f2d0b4d10665a5ffc6885f6c76eba842e50f91f43b477ac2ca26bbd23e754d89 SHA512 08e954e0e2434e130d1fe3a93364b3c18b92419bc7a9760a729f1302d6c41c6a78cd941a0129397a5351da880715e2761f7b2c8f69917706a2f3b4e0f5dce70c
-DIST containers-836a0cc93a98815ac309294c45aab0ba98018073.tar.gz 54321 BLAKE2B 28791344e4fa5de7b5cedf6e077131542ec31ea9bfef363edb7cd398a10599d8dd2c830c5b4ac8cbbfbd203e3c8b0579dda3e67b4e5d3e154f27aee0cc139368 SHA512 d46277e3bc73bcabdacf24635be650fb8c5c5134ae39160605dd1152a427f5a7e1b4218bd34636fa7c7e3058f4c6b31c984823ea8e2927a16d0d16ecda3cc0d4
 DIST dsymbol-5b7f06ff005c63a2bf22db0736097ef35b9d36e7.tar.gz 31518 BLAKE2B bbcf984ac5a0ef06e41254318b38da821755df450198576e68d4d7c3c462bbe1d5412ecbf7fb08ae5ac10c1a370b66fe1df7af48de2a65afde3cb2d0cfbcd92d SHA512 2c46020244cb2ebbe2f1a2f984dd4379facc61afd66376da320ad68f73f2264ac95e847e6e5b07c1350f6a9a99bc5229a23c0fbf9b500681254734dcb95a1e0b
-DIST dsymbol-de7389be5dda532ef7cd431d03efbfe6b9522687.tar.gz 30881 BLAKE2B 6baa8f4545684a1007b059da33514dbdba886518f2f96253f4960a23c50b5b82755040e99a6f62f3a5951992ce65a9334bfc85ec7f2be385d1a6d674d0fe6d5f SHA512 7174c386b0e562e3fcbe12539f206851dc4841b5a42e9fb5fffd7fcd852c328b0c1ba849cd74915be4b1b363e10b6bbed7b6839eab43226d3c21201a81842956
-DIST libdparse-23b20de4ee48ed3f0e8729f6318405543cb3a611.tar.gz 122297 BLAKE2B b2aab10e923a9682dc9a87209ed7492b91df01aa0a2ebf29d4735e1357013346f713a75c7fd96e1039d122a8fa8460d87c2516d7fdcd10611790dfdcb9cfc6ee SHA512 4d6615364c24ca9ffaef3bf66717fab3a593da868bb351750c8be57ca3ffd78435dde4752d6fd90c67efe9b229c7be7c86aea67e732003771ef779541996a099
 DIST libdparse-aae371931a99027465952cd6fdaede4eb4743e76.tar.gz 122507 BLAKE2B ae0b500875fad7929ac5450303fe8fd1064299fb2bfd3378fd97f41aa3ca4a3d0a3c4df3be66985489a31fa56d613c031621f630b16668f7747bd8fb198c11bd SHA512 2aa54664bcaf8a974a00559354fb0115b8cc98b6cb299644b48086c70fa28ae12c90c573f030e2028ff33db7f8bb654813a8c7d1ec5078f1980a5b29ef35dda0
 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.11.0.ebuild b/dev-util/dcd/dcd-0.11.0.ebuild
deleted file mode 100644
index 48064c4..0000000
--- a/dev-util/dcd/dcd-0.11.0.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="de7389be5dda532ef7cd431d03efbfe6b9522687"
-LIBDPARSE="23b20de4ee48ed3f0e8729f6318405543cb3a611"
-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.1.ebuild b/dev-util/dcd/dcd-0.11.1.ebuild
index eb661ba..fc04ee0 100644
--- a/dev-util/dcd/dcd-0.11.1.ebuild
+++ b/dev-util/dcd/dcd-0.11.1.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="257c0418f34709dd667f95b5dffabedc2b3099e4"
diff --git a/dev-util/dfmt/Manifest b/dev-util/dfmt/Manifest
index d8ba090..c992de4 100644
--- a/dev-util/dfmt/Manifest
+++ b/dev-util/dfmt/Manifest
@@ -1,6 +1,3 @@
 DIST dfmt-0.10.1.tar.gz 85212 BLAKE2B f37bead92ef35beb404461093faaa495b88f59b53f07ae9c5e6b529d7998ad6cd662e5ff8f9d62405a1df61569612482c26de5065b1351bb1a8e0f5ecfde9b73 SHA512 9304051e2892696f35a596642b09fe8f177f1a02a9b1d7f56388f6f04d21ab015286aa8e1357fe9ea69a4b6c48572b204958a4811cff4507eef41ce68aa3d664
-DIST dfmt-0.9.0.tar.gz 81100 BLAKE2B 1c19ad11d8b02091114b5c1650db5befa0318db09caea6c53f358598c0d0d61ebb3b300f3905ab8c48e78872b5b2d779b01d233e6ec4d29dc7fcfe10fb8e9ac6 SHA512 68d0b3eeecc0c2971c4b3da4b76b9e5466650fc84749b6f247a3c7b66cce25416f49722942e209b92a441e570d5f340bad584ca6ddcf4372a971d544d7df8467
 DIST libdparse-aae371931a99027465952cd6fdaede4eb4743e76.tar.gz 122507 BLAKE2B ae0b500875fad7929ac5450303fe8fd1064299fb2bfd3378fd97f41aa3ca4a3d0a3c4df3be66985489a31fa56d613c031621f630b16668f7747bd8fb198c11bd SHA512 2aa54664bcaf8a974a00559354fb0115b8cc98b6cb299644b48086c70fa28ae12c90c573f030e2028ff33db7f8bb654813a8c7d1ec5078f1980a5b29ef35dda0
-DIST libdparse-ea63487efde96b6f169065d801bbcb8d7ed5dbb4.tar.gz 120550 BLAKE2B d7114362fdb5ba582ff8a6de35f689c00ed436ba9575e1cf373a7d8688e8487f9c4759f77102760beb859856e1cc02a90babc2c94a19a7fd5b5592e851feca6c SHA512 860b6c38d7fc7a2b5da981390e1c4b10cedb2da7419df6bbb3fc1fa46ac647235ee07baa532ca7bdf8095b0d7a2cdabcf20bc8efb73f5fc8491af6b57b3ed216
 DIST stdx-allocator-ae237cabd1843774cc78aad0729c914a3dd579db.tar.gz 103650 BLAKE2B 8d03c2dc76194b18da92261c533c402b87bda1964662070d02ceacbab3dda91a834c0c8bfe45feb1d9a3d7669f96a2a1f7b9a6b7eff7ea53069480d8de8fe15e SHA512 893e5ecefac86a64b3a91f034cc9f42aabc264d111b40accf890b505ec9d077fcaac0b29fc202400448994e4ff021263beef7716798734cb9b71b6aad1aaf394
-DIST stdx-allocator-b7778fd6bf5f9aaaa87dd27f989cefbf9b3b365f.tar.gz 103550 BLAKE2B be33b0df3a9be5a718c0f2286805946f2c20841bdf7032a4f454b7be76958a5789afaca94f430023918c25764f67fa5966f34fef1d7ca023e04a27735d5eda1b SHA512 d9a7688a45649a39d6a464a2f6a3acb0ee29b3aa17065afccc79d905701fc38fe48dd329687c065a016fc5f5291bb18e3e5b2877a286fd3e509766c7d9962e25
diff --git a/dev-util/dfmt/dfmt-0.10.1.ebuild b/dev-util/dfmt/dfmt-0.10.1.ebuild
index 6cf7a98..0af3801 100644
--- a/dev-util/dfmt/dfmt-0.10.1.ebuild
+++ b/dev-util/dfmt/dfmt-0.10.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/dlang-community/dfmt"
 LICENSE="Boost-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LIBDPARSE="aae371931a99027465952cd6fdaede4eb4743e76"
 ALLOCATOR="ae237cabd1843774cc78aad0729c914a3dd579db"
 SRC_URI="
diff --git a/dev-util/dfmt/dfmt-0.9.0.ebuild b/dev-util/dfmt/dfmt-0.9.0.ebuild
deleted file mode 100644
index 34fbbe8..0000000
--- a/dev-util/dfmt/dfmt-0.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dfmt is a formatter for D source code"
-HOMEPAGE="https://github.com/dlang-community/dfmt"
-LICENSE="Boost-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LIBDPARSE="ea63487efde96b6f169065d801bbcb8d7ed5dbb4"
-ALLOCATOR="b7778fd6bf5f9aaaa87dd27f989cefbf9b3b365f"
-SRC_URI="
-	https://github.com/dlang-community/dfmt/archive/v${PV}.tar.gz -> ${PN}-${PV}.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
-	"
-
-DLANG_VERSION_RANGE="2.075-"
-DLANG_PACKAGE_TYPE="single"
-
-inherit dlang bash-completion-r1
-
-src_prepare() {
-	mkdir bin || die "Failed to create 'bin' directory."
-	cat > bin/githash.txt << EOF
-v${PV}
-EOF
-	dlang_src_prepare
-}
-
-d_src_compile() {
-	local libdparse_src="../libdparse-${LIBDPARSE}/src"
-	local allocator_src="../stdx-allocator-${ALLOCATOR}/source"
-	local imports="src ${libdparse_src} ${allocator_src}"
-	local string_imports="bin"
-
-	dlang_compile_bin "bin/dfmt" "src/dfmt/main.d" "src/dfmt/config.d" "src/dfmt/editorconfig.d" \
-		"src/dfmt/ast_info.d" "src/dfmt/indentation.d" "src/dfmt/tokens.d" "src/dfmt/wrapping.d" \
-		"src/dfmt/formatter.d" "src/dfmt/globmatch_editorconfig.d" \
-		${libdparse_src}/dparse/lexer.d ${libdparse_src}/dparse/parser.d ${libdparse_src}/dparse/ast.d \
-		${libdparse_src}/dparse/rollback_allocator.d ${libdparse_src}/dparse/stack_buffer.d \
-		${libdparse_src}/std/experimental/lexer.d \
-		${allocator_src}/stdx/allocator/common.d ${allocator_src}/stdx/allocator/mallocator.d \
-		${allocator_src}/stdx/allocator/package.d ${allocator_src}/stdx/allocator/gc_allocator.d
-}
-
-d_src_test() {
-	cd tests && ./test.sh
-}
-
-d_src_install() {
-	dobin bin/dfmt
-	dodoc README.md LICENSE.txt
-	dobashcomp bash-completion/completions/dfmt
-}
diff --git a/dev-util/dscanner/Manifest b/dev-util/dscanner/Manifest
index 263e8a9..8e64f6e 100644
--- a/dev-util/dscanner/Manifest
+++ b/dev-util/dscanner/Manifest
@@ -1,11 +1,7 @@
-DIST containers-22fe1e5b385fbf64fb9647731291f377bdb117d3.tar.gz 54341 BLAKE2B dc66cf9f8c49078d955b1382ec5d685cf345aba570af1c3610ab89f2d3fa3334310eef358d7c5719ffdc4482e00616bcd4f45c9a4aca82c12006ba4ec243c870 SHA512 fe7744bfb4ff15570749b00c6b0df1ef5a3f76321b75076936815351322df60e0c0cf3facd51e71ad8aa0dea18c457ed7eb62760897a61b4484c1af34b61d99b
 DIST containers-257c0418f34709dd667f95b5dffabedc2b3099e4.tar.gz 54611 BLAKE2B c70ceff5ab3fd627db62922b978d41687fccb1986904cdef2cebfe2998262137f2d0b4d10665a5ffc6885f6c76eba842e50f91f43b477ac2ca26bbd23e754d89 SHA512 08e954e0e2434e130d1fe3a93364b3c18b92419bc7a9760a729f1302d6c41c6a78cd941a0129397a5351da880715e2761f7b2c8f69917706a2f3b4e0f5dce70c
-DIST dscanner-0.7.0.tar.gz 85626 BLAKE2B 046240ea2f1f85f673854b10cfd0424de1451c470792545bb948f2aa995fafebe9a9fffbb430113186a31ce9ea927cdf75f552c640aa175a0498c76e1637297b SHA512 76f061db0c8a6f4dd53bad783d40cf6904306f1f12e4e0efebc7912ecba4d893c2152280fca54e270e04c406ed724eba083d129a1aa7eee1d17dac9230cd33c8
 DIST dscanner-0.7.1.tar.gz 85669 BLAKE2B 528bbfff1b1dc04e57e4919c42a780739a0232ebfcb70412c14c711f1b42ab1a87e21121648820a8ca41baea0232d206134a042f20c28089b1930395cfd33a3f SHA512 d096e91af4f54138c690e49b0d489d919ef87e7291962ec604d23109bb4c4c423244f22161fda1da47e2fcd14d57dc2ce7ae22f421b8872dbf58d95a1229ff3e
 DIST dsymbol-5b7f06ff005c63a2bf22db0736097ef35b9d36e7.tar.gz 31518 BLAKE2B bbcf984ac5a0ef06e41254318b38da821755df450198576e68d4d7c3c462bbe1d5412ecbf7fb08ae5ac10c1a370b66fe1df7af48de2a65afde3cb2d0cfbcd92d SHA512 2c46020244cb2ebbe2f1a2f984dd4379facc61afd66376da320ad68f73f2264ac95e847e6e5b07c1350f6a9a99bc5229a23c0fbf9b500681254734dcb95a1e0b
-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 libdparse-23b20de4ee48ed3f0e8729f6318405543cb3a611.tar.gz 122297 BLAKE2B b2aab10e923a9682dc9a87209ed7492b91df01aa0a2ebf29d4735e1357013346f713a75c7fd96e1039d122a8fa8460d87c2516d7fdcd10611790dfdcb9cfc6ee SHA512 4d6615364c24ca9ffaef3bf66717fab3a593da868bb351750c8be57ca3ffd78435dde4752d6fd90c67efe9b229c7be7c86aea67e732003771ef779541996a099
 DIST libdparse-aae371931a99027465952cd6fdaede4eb4743e76.tar.gz 122507 BLAKE2B ae0b500875fad7929ac5450303fe8fd1064299fb2bfd3378fd97f41aa3ca4a3d0a3c4df3be66985489a31fa56d613c031621f630b16668f7747bd8fb198c11bd SHA512 2aa54664bcaf8a974a00559354fb0115b8cc98b6cb299644b48086c70fa28ae12c90c573f030e2028ff33db7f8bb654813a8c7d1ec5078f1980a5b29ef35dda0
 DIST stdx-allocator-d6e6ce4a838e0dad43ef13f050f96627339cdccd.tar.gz 103648 BLAKE2B c08925df810761bb4825d6058375dcc5415f4838403b3668aeff5c1be93c7d04b49c1994da27aa498cd0f4abd1ff923e8d906ae53c922f94bc63dac334b7f138 SHA512 3a41f95505e92d79a6b966d21d96fe5b5bb2b2f3762b09998b27334684d815a82a3e705935faa1b543a93ffb274c67b9110b2b1b7364f7d405bd65d05b819271
diff --git a/dev-util/dscanner/dscanner-0.7.0.ebuild b/dev-util/dscanner/dscanner-0.7.0.ebuild
deleted file mode 100644
index 611ba9e..0000000
--- a/dev-util/dscanner/dscanner-0.7.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="22fe1e5b385fbf64fb9647731291f377bdb117d3"
-DSYMBOL="7eb7a3b5c57593b51d002ae4369501a1a395f31a"
-INIFILED="cecaff8037a60db2a51c9bded4802c87d938a44e"
-LIBDDOC="beff9b8f11ddc71ffcdfa7108a3c12e5aa8e2825"
-LIBDPARSE="23b20de4ee48ed3f0e8729f6318405543cb3a611"
-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.1.ebuild b/dev-util/dscanner/dscanner-0.7.1.ebuild
index 0069eb6..947ad2e 100644
--- a/dev-util/dscanner/dscanner-0.7.1.ebuild
+++ b/dev-util/dscanner/dscanner-0.7.1.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="257c0418f34709dd667f95b5dffabedc2b3099e4"