dmd-2.093 & dub-1.22.0

Signed-off-by: Marco Leise <marco.leise@gmx.de>

5 files changed, 111 insertions, 0 deletions

diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
index e82bd6b..6db3edd 100644
--- a/dev-util/dlang-tools/Manifest
+++ b/dev-util/dlang-tools/Manifest
@@ -27,6 +27,7 @@ DIST dlang-tools-2.089.1.tar.gz 117693 BLAKE2B 6e499fd01bda7a58036b08f30319549ca
 DIST dlang-tools-2.090.1.tar.gz 117709 BLAKE2B 8a714a5bd6860bf4a856fbbde2a7188b404b819e11f9ed815688b9acb5fa6e95a95c0fb4aa407495da89a0e3b19dba584be1d90f3c60c2af95090d6e81f221d6 SHA512 82f6d3fd4a7f6fd013425894ec5f817c960764479649c97139a019802fc5c2a83671102f1b2a9427e88446055e5a1a4fa884a4b86400a84107b2d5ca322b7a32
 DIST dlang-tools-2.091.1.tar.gz 117714 BLAKE2B bd0957f0e70401b1ededf29be7f942da1445c66e3ea4b47f31b136413b506c3dd03faa4cb1962a10ae51edd0cb18b282da072b0ba63f0f0d7e2cd3e460924e3a SHA512 b8fb4f4c1e9aed1e2134644152a32a7c6073d801458bf0a45a23e86cd761a19c4b517365112edc7af73fbef3c26b4106fa0ee7478a78fa41c531a060c25e3955
 DIST dlang-tools-2.092.1.tar.gz 119015 BLAKE2B 35121ccda680297d686b6133b80f27d04c133d3d6add4a335294c203a58475326563b5f81cd90a3d1b261c7799b244b739924ec32a6bbf887a98dcad486b64b4 SHA512 84d69e2b5e073bc038f438304060a490bc41c740eba14599b911aa66cc40b0f4ba1fa55536c77f01c6964210025283a3c6d32768493e9ca1e021eadaaa38f8b2
+DIST dlang-tools-2.093.0.tar.gz 118851 BLAKE2B 8678f91a9a8b9168314cef88abd9896369109a16c3cad85b2cb450ec73d3a73c289fda6bd998979859fff7c07692986b1e16fa10db79373a4bff0fed3360fc41 SHA512 e22cef21b37b05f7abf98e514c836fef1de58eebc219a2c9b6178de336f1b82d4ece87376722dd0a07b6b8803b7bf9cbe9d015a089f709c319f327d7577e35da
 DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9 SHA512 a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf
 DIST dlang.org-2.065.0.tar.gz 1005429 BLAKE2B 01fc8ec0c5148f910e2923be556208c08a18f00453ffa1f1a22d6725db6489b6f9022cd170caa3a05078baddde353ee819984da5efa53547e78006d2f0a97b9c SHA512 0fb185603766b54c3b9dc57824b18ec7ea9f37281610729860543630f4546591f9523bff48eee5414235d2ee656201c444e6d2efc44ba66a052b98a0d9b4729e
 DIST dlang.org-2.066.1.tar.gz 1024075 BLAKE2B cfdb4922c38d9f0ced941eeb4578d71f09d65201d2f89cfc73e46ae73f0939c74fa92d7f003b87a28f814c5b2cc0dda6855b86e64fd86be3920c129f8c20df6a SHA512 d3838cc2ab6236d57c17f92fa5eaef8458176715985aecbea9653cc772725e1b9f813c9ffc8e06490e08c1031826ab84d1fcfbd88008791cac3257db814e3dc8
diff --git a/dev-util/dlang-tools/dlang-tools-2.093.0.ebuild b/dev-util/dlang-tools/dlang-tools-2.093.0.ebuild
new file mode 100644
index 0000000..6b8a8e1
--- /dev/null
+++ b/dev-util/dlang-tools/dlang-tools-2.093.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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.076-"
+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/dub/Manifest b/dev-util/dub/Manifest
index 9ff7ef1..8f9c47b 100644
--- a/dev-util/dub/Manifest
+++ b/dev-util/dub/Manifest
@@ -1 +1,2 @@
 DIST dub-1.21.0.tar.gz 1272369 BLAKE2B afcc92d9c7a9c49497259011d9c70aaeb559c0835d45d7e90c54c2e2361ec3c9ec69928e16c06ace0bb6c03f9e66ecad6717a64df5f83e41d671763296540339 SHA512 d85be6e35f51e34d34afce71fe902b8ef623c6f49ed6f5f755dded5bceda49416f9d625377136b928d0f95496e57999f0dd57a4cea796360edd34c72556debd7
+DIST dub-1.22.0.tar.gz 1275009 BLAKE2B 87bb4235595b4e24a368ede86c9000ef8c605dbc471207e5d8e474647ed3002ba370b3c3c732fcec8ad3082add7c9fb98947df522ece8a6ac727ec4e956b3a63 SHA512 61f923916be1f16e8f77c228c53724e69e532573140674da902c374b63f3ca1f66b0da323a9c3a131f98af48e7755b5d3b70d33433fa0deb733215da2b4cd6b2
diff --git a/dev-util/dub/dub-1.22.0.ebuild b/dev-util/dub/dub-1.22.0.ebuild
new file mode 100644
index 0000000..23205f6
--- /dev/null
+++ b/dev-util/dub/dub-1.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.076-"
+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/files/dub-1.22.0-gdc-dmd-pathfix.patch b/dev-util/dub/files/dub-1.22.0-gdc-dmd-pathfix.patch
new file mode 100644
index 0000000..497ef50
--- /dev/null
+++ b/dev-util/dub/files/dub-1.22.0-gdc-dmd-pathfix.patch
@@ -0,0 +1,16 @@
+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;