| 1 |
commit: d8629dcc474754c43359a472d114ded7f4229d6f |
| 2 |
Author: Marco Leise <marco.leise <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Sat May 30 16:39:08 2020 +0000 |
| 4 |
Commit: Marco Leise <marco.leise <AT> gmx <DOT> de> |
| 5 |
CommitDate: Sat May 30 16:39:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=d8629dcc |
| 7 |
|
| 8 |
dmd-2.092.0 & dub-1.21.0 |
| 9 |
|
| 10 |
Signed-off-by: Marco Leise <marco.leise <AT> gmx.de> |
| 11 |
|
| 12 |
dev-lang/dmd/Manifest | 1 + |
| 13 |
dev-lang/dmd/dmd-2.092.0.ebuild | 20 ++++++++ |
| 14 |
dev-util/dlang-tools/Manifest | 1 + |
| 15 |
dev-util/dlang-tools/dlang-tools-2.092.0.ebuild | 54 ++++++++++++++++++++++ |
| 16 |
dev-util/dub/Manifest | 1 + |
| 17 |
dev-util/dub/dub-1.21.0.ebuild | 39 ++++++++++++++++ |
| 18 |
.../dub/files/dub-1.21.0-gdc-dmd-pathfix.patch | 16 +++++++ |
| 19 |
eclass/dmd.eclass | 2 +- |
| 20 |
8 files changed, 133 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest |
| 23 |
index 145b43c..d07522e 100644 |
| 24 |
--- a/dev-lang/dmd/Manifest |
| 25 |
+++ b/dev-lang/dmd/Manifest |
| 26 |
@@ -27,3 +27,4 @@ DIST dmd.2.088.1.linux.tar.xz 25122116 BLAKE2B e573a97cf9f547a3017a0b904523f4877 |
| 27 |
DIST dmd.2.089.1.linux.tar.xz 25877024 BLAKE2B 38fdbac595a6d9ea7548ee331aacefec530594be750a1b3dbfad7af8a5e310d6fb5e774106adfaa0d0c33cfec8e94c7a29f4c3c5c3088cc827f6ccd8a3472e56 SHA512 8a5343060d7f28394be81d8732997d96a23522c87912f2c8d0979375297467068d093ab4ef2b92b0ce8be941b5c65061660eef8d1e9252c626197014ac4331a9 |
| 28 |
DIST dmd.2.090.1.linux.tar.xz 25595804 BLAKE2B addd21fc482aa90d816593312aa6490949e54c3f8f36989eec193e9b09412022afe5d1f7006153f9b258a2c96fed9266ef5a9a94ca9c999cbc3ec1230937dec8 SHA512 ebc769d9c4c784b7e59730606e57bbde8dbfaea07be2492a0e475e0818f0ef4aaf3cb2bc8b1be066cc14479d9a3dd0d9655e0b0025c79383dbbbe9b2f2caf04f |
| 29 |
DIST dmd.2.091.1.linux.tar.xz 23977732 BLAKE2B 4db4c1733ecfdaa79a396039b8be735c217841deefd41b91b72a25e075e0f064892aa07497d840ef738021f66b58071d3d8c228573110614c43036ad51d7f701 SHA512 94db61b8cabd6229b404ce34e1618a710d6780bd7ce6db4ac666221b9bef616046ab9e4e793651e4e976fb4dd0eeedd5445abc9169ca27be753ff5611001e6bb |
| 30 |
+DIST dmd.2.092.0.linux.tar.xz 24272644 BLAKE2B 417d406b071b8ea35ace5a8da303ba4c9e239bd5aae038ac45797383f54df460d3c169f451ea9bd4bde224e33fd1932412b341c057177f39550dab2c575066b1 SHA512 d385f06949a545e35cd93ef4a06ae613648dba641c19cdb66d7650730c8192ef80e4fb0d902e7f948629cc151b3fc940d1a4453056a0b70f901afd1c6de49026 |
| 31 |
|
| 32 |
diff --git a/dev-lang/dmd/dmd-2.092.0.ebuild b/dev-lang/dmd/dmd-2.092.0.ebuild |
| 33 |
new file mode 100644 |
| 34 |
index 0000000..6b582a8 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-lang/dmd/dmd-2.092.0.ebuild |
| 37 |
@@ -0,0 +1,20 @@ |
| 38 |
+# Copyright 1999-2020 Gentoo Authors |
| 39 |
+# Distributed under the terms of the GNU General Public License v2 |
| 40 |
+ |
| 41 |
+EAPI=6 |
| 42 |
+ |
| 43 |
+KEYWORDS="-* ~amd64 ~x86" |
| 44 |
+YEAR=2020 |
| 45 |
+DLANG_VERSION_RANGE="2.076-" |
| 46 |
+ |
| 47 |
+inherit dmd |
| 48 |
+ |
| 49 |
+PATCHES=( |
| 50 |
+ "${FILESDIR}/2.083-link-32-bit-shared-lib-with-ld.bfd.patch" |
| 51 |
+) |
| 52 |
+ |
| 53 |
+dmd_src_prepare_extra() { |
| 54 |
+ # Copy default DDOC theme file into resource directory |
| 55 |
+ mkdir "dmd/res" || die "Failed to create 'dmd/res' directory" |
| 56 |
+ cp "${FILESDIR}/2.086-default_ddoc_theme.ddoc" "dmd/res/default_ddoc_theme.ddoc" || die "Failed to copy 'default_ddoc_theme.ddoc' file into 'src/res' directory." |
| 57 |
+} |
| 58 |
|
| 59 |
diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest |
| 60 |
index 8d581ee..3c090fb 100644 |
| 61 |
--- a/dev-util/dlang-tools/Manifest |
| 62 |
+++ b/dev-util/dlang-tools/Manifest |
| 63 |
@@ -26,6 +26,7 @@ DIST dlang-tools-2.088.1.tar.gz 117104 BLAKE2B 2920cb8950fb0e921665bab161584c35a |
| 64 |
DIST dlang-tools-2.089.1.tar.gz 117693 BLAKE2B 6e499fd01bda7a58036b08f30319549ca2c786ea348ac93d045019fde745a3b30179af0d7c3999af8bd09f15d86876e43927cf069a70dc5120ebc08eb82a84c3 SHA512 ffc1eb9d42f167d2a519a052fdc87fb3db576d9b549dac80c993859f597dfbc492e783129b9c94dc664e33817bacf09b040d0cb2efbc679971ba768163eb4e42 |
| 65 |
DIST dlang-tools-2.090.1.tar.gz 117709 BLAKE2B 8a714a5bd6860bf4a856fbbde2a7188b404b819e11f9ed815688b9acb5fa6e95a95c0fb4aa407495da89a0e3b19dba584be1d90f3c60c2af95090d6e81f221d6 SHA512 82f6d3fd4a7f6fd013425894ec5f817c960764479649c97139a019802fc5c2a83671102f1b2a9427e88446055e5a1a4fa884a4b86400a84107b2d5ca322b7a32 |
| 66 |
DIST dlang-tools-2.091.1.tar.gz 117714 BLAKE2B bd0957f0e70401b1ededf29be7f942da1445c66e3ea4b47f31b136413b506c3dd03faa4cb1962a10ae51edd0cb18b282da072b0ba63f0f0d7e2cd3e460924e3a SHA512 b8fb4f4c1e9aed1e2134644152a32a7c6073d801458bf0a45a23e86cd761a19c4b517365112edc7af73fbef3c26b4106fa0ee7478a78fa41c531a060c25e3955 |
| 67 |
+DIST dlang-tools-2.092.0.tar.gz 119007 BLAKE2B fbcd288973eb12a8f551fb27dc9c567d7a30895bf82c871ad96f47eb0691ec3fef697086ee0c3d202d668707c06716185d859325dae6214a083740bde09f57b1 SHA512 3d3b0f0cc02297119773f54576d350e9124166fad8ed31c6a08eeb1018e1095cebde1ae5056d8d68a6272297cc7ee35d487f4de152536935bac9ca175ffb9e0e |
| 68 |
DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9 SHA512 a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf |
| 69 |
DIST dlang.org-2.065.0.tar.gz 1005429 BLAKE2B 01fc8ec0c5148f910e2923be556208c08a18f00453ffa1f1a22d6725db6489b6f9022cd170caa3a05078baddde353ee819984da5efa53547e78006d2f0a97b9c SHA512 0fb185603766b54c3b9dc57824b18ec7ea9f37281610729860543630f4546591f9523bff48eee5414235d2ee656201c444e6d2efc44ba66a052b98a0d9b4729e |
| 70 |
DIST dlang.org-2.066.1.tar.gz 1024075 BLAKE2B cfdb4922c38d9f0ced941eeb4578d71f09d65201d2f89cfc73e46ae73f0939c74fa92d7f003b87a28f814c5b2cc0dda6855b86e64fd86be3920c129f8c20df6a SHA512 d3838cc2ab6236d57c17f92fa5eaef8458176715985aecbea9653cc772725e1b9f813c9ffc8e06490e08c1031826ab84d1fcfbd88008791cac3257db814e3dc8 |
| 71 |
|
| 72 |
diff --git a/dev-util/dlang-tools/dlang-tools-2.092.0.ebuild b/dev-util/dlang-tools/dlang-tools-2.092.0.ebuild |
| 73 |
new file mode 100644 |
| 74 |
index 0000000..6b8a8e1 |
| 75 |
--- /dev/null |
| 76 |
+++ b/dev-util/dlang-tools/dlang-tools-2.092.0.ebuild |
| 77 |
@@ -0,0 +1,54 @@ |
| 78 |
+# Copyright 1999-2020 Gentoo Authors |
| 79 |
+# Distributed under the terms of the GNU General Public License v2 |
| 80 |
+ |
| 81 |
+EAPI=6 |
| 82 |
+ |
| 83 |
+DESCRIPTION="Ancilliary tools for the D programming language compiler" |
| 84 |
+HOMEPAGE="http://dlang.org/" |
| 85 |
+LICENSE="Boost-1.0" |
| 86 |
+ |
| 87 |
+SLOT="0" |
| 88 |
+KEYWORDS="~amd64 ~x86" |
| 89 |
+TOOLS="ddemangle detab dustmite rdmd" |
| 90 |
+IUSE="+ddemangle detab dustmite +rdmd" |
| 91 |
+REQUIRED_USE="|| ( ${TOOLS} )" |
| 92 |
+ |
| 93 |
+inherit eapi7-ver |
| 94 |
+ |
| 95 |
+DLANG_SLOT="$(ver_cut 1-2)" |
| 96 |
+RESTRICT="mirror" |
| 97 |
+ |
| 98 |
+BETA="$(ver_cut 4)" |
| 99 |
+VERSION="$(ver_cut 1-3)" |
| 100 |
+ |
| 101 |
+if [[ -n "${BETA}" ]]; then |
| 102 |
+ VERSION="${VERSION}-b${BETA:4}" |
| 103 |
+fi |
| 104 |
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz" |
| 105 |
+ |
| 106 |
+DLANG_VERSION_RANGE="2.076-" |
| 107 |
+DLANG_PACKAGE_TYPE="single" |
| 108 |
+ |
| 109 |
+inherit eutils dlang |
| 110 |
+ |
| 111 |
+S="${WORKDIR}/tools-${VERSION}" |
| 112 |
+ |
| 113 |
+d_src_compile() { |
| 114 |
+ use ddemangle && dlang_compile_bin ddemangle ddemangle.d |
| 115 |
+ use detab && dlang_compile_bin detab detab.d |
| 116 |
+ use dustmite && dlang_compile_bin dustmite DustMite/dustmite.d DustMite/splitter.d |
| 117 |
+ use rdmd && dlang_compile_bin rdmd rdmd.d |
| 118 |
+} |
| 119 |
+ |
| 120 |
+d_src_install() { |
| 121 |
+ for tool in ${TOOLS}; do |
| 122 |
+ if use "${tool}"; then |
| 123 |
+ dobin "${tool}" |
| 124 |
+ fi |
| 125 |
+ done |
| 126 |
+ |
| 127 |
+ # file icons |
| 128 |
+ for size in 16 22 24 32 48 256; do |
| 129 |
+ newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png |
| 130 |
+ done |
| 131 |
+} |
| 132 |
|
| 133 |
diff --git a/dev-util/dub/Manifest b/dev-util/dub/Manifest |
| 134 |
index 9544359..23d30bd 100644 |
| 135 |
--- a/dev-util/dub/Manifest |
| 136 |
+++ b/dev-util/dub/Manifest |
| 137 |
@@ -1,2 +1,3 @@ |
| 138 |
DIST dub-1.20.0.tar.gz 1270037 BLAKE2B 33da3da316c2fc2b51b3d0febfd47c7f48e866195b47c6acbe621f46898f72961f78ec4b3cc61d0274f29b51378da77f2e0278b40ddaa8bca2296c4c8df7c6a8 SHA512 4ad750ab8b968005d1510f1ab6125d8167c67e1d2374b0f7df4d3624139430fedfa45d88b0ded64577981e0ffd863554eb4ee2b736eb22354d5ace4b0da589a8 |
| 139 |
DIST dub-1.20.1.tar.gz 1269733 BLAKE2B 15f0e3042249687eb35d9e54b97bb22ba9db4184f54fd5154849aff952d667cd38cbb15a9d349573bd984fd1b30459c22003fab7d647961355c30498fa0b2203 SHA512 9509c5272f72811ddedb840379dc474abc2328b1863464dcc1cba1c4a017f7409c206d38366e68c5e37c602a380c50189d5fe300664015d16e3629aa57e48afb |
| 140 |
+DIST dub-1.21.0.tar.gz 1272369 BLAKE2B afcc92d9c7a9c49497259011d9c70aaeb559c0835d45d7e90c54c2e2361ec3c9ec69928e16c06ace0bb6c03f9e66ecad6717a64df5f83e41d671763296540339 SHA512 d85be6e35f51e34d34afce71fe902b8ef623c6f49ed6f5f755dded5bceda49416f9d625377136b928d0f95496e57999f0dd57a4cea796360edd34c72556debd7 |
| 141 |
|
| 142 |
diff --git a/dev-util/dub/dub-1.21.0.ebuild b/dev-util/dub/dub-1.21.0.ebuild |
| 143 |
new file mode 100644 |
| 144 |
index 0000000..23205f6 |
| 145 |
--- /dev/null |
| 146 |
+++ b/dev-util/dub/dub-1.21.0.ebuild |
| 147 |
@@ -0,0 +1,39 @@ |
| 148 |
+# Copyright 1999-2020 Gentoo Authors |
| 149 |
+# Distributed under the terms of the GNU General Public License v2 |
| 150 |
+ |
| 151 |
+EAPI=7 |
| 152 |
+ |
| 153 |
+DESCRIPTION="Package and build management system for D" |
| 154 |
+HOMEPAGE="http://code.dlang.org/" |
| 155 |
+LICENSE="MIT" |
| 156 |
+ |
| 157 |
+SLOT="0" |
| 158 |
+KEYWORDS="~amd64 ~arm ~x86" |
| 159 |
+IUSE="debug" |
| 160 |
+ |
| 161 |
+GITHUB_URI="https://codeload.github.com/dlang" |
| 162 |
+SRC_URI="${GITHUB_URI}/${PN}/tar.gz/v${PV} -> ${PN}-${PV}.tar.gz" |
| 163 |
+PATCHES="${FILESDIR}/${P}-gdc-dmd-pathfix.patch" |
| 164 |
+ |
| 165 |
+DLANG_VERSION_RANGE="2.076-" |
| 166 |
+DLANG_PACKAGE_TYPE="single" |
| 167 |
+ |
| 168 |
+inherit dlang |
| 169 |
+ |
| 170 |
+DEPEND="net-misc/curl" |
| 171 |
+RDEPEND="${DEPEND}" |
| 172 |
+ |
| 173 |
+d_src_compile() { |
| 174 |
+ local imports=source versions="DubApplication DubUseCurl" libs="curl z" |
| 175 |
+ dlang_compile_bin bin/dub $(<build-files.txt) |
| 176 |
+} |
| 177 |
+ |
| 178 |
+d_src_test() { |
| 179 |
+ echo "Test phase disabled due to multiple problems." |
| 180 |
+ #DUB="${S}/bin/dub" test/run-unittest.sh || die "Test phase failed" |
| 181 |
+} |
| 182 |
+ |
| 183 |
+d_src_install() { |
| 184 |
+ dobin bin/dub |
| 185 |
+ dodoc README.md |
| 186 |
+} |
| 187 |
|
| 188 |
diff --git a/dev-util/dub/files/dub-1.21.0-gdc-dmd-pathfix.patch b/dev-util/dub/files/dub-1.21.0-gdc-dmd-pathfix.patch |
| 189 |
new file mode 100644 |
| 190 |
index 0000000..497ef50 |
| 191 |
--- /dev/null |
| 192 |
+++ b/dev-util/dub/files/dub-1.21.0-gdc-dmd-pathfix.patch |
| 193 |
@@ -0,0 +1,16 @@ |
| 194 |
+diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d |
| 195 |
+--- a/source/dub/generators/build.d |
| 196 |
++++ b/source/dub/generators/build.d |
| 197 |
+@@ -119,10 +119,10 @@ class BuildGenerator : ProjectGenerator { |
| 198 |
+ auto build_id = computeBuildID(config, buildsettings, settings); |
| 199 |
+ |
| 200 |
+ // make all paths relative to shrink the command line |
| 201 |
+- string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); } |
| 202 |
++ /+string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); } |
| 203 |
+ foreach (ref f; buildsettings.sourceFiles) f = makeRelative(f); |
| 204 |
+ foreach (ref p; buildsettings.importPaths) p = makeRelative(p); |
| 205 |
+- foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p); |
| 206 |
++ foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);+/ |
| 207 |
+ |
| 208 |
+ // perform the actual build |
| 209 |
+ bool cached = false; |
| 210 |
|
| 211 |
diff --git a/eclass/dmd.eclass b/eclass/dmd.eclass |
| 212 |
index c77ece4..5e346d6 100644 |
| 213 |
--- a/eclass/dmd.eclass |
| 214 |
+++ b/eclass/dmd.eclass |
| 215 |
@@ -130,7 +130,7 @@ dmd_src_compile() { |
| 216 |
dmd_ge 2.071 && HOST_CXX="HOST_CXX" || HOST_CXX="HOST_CC" |
| 217 |
# 2.072 and 2.073 have support for LTO, but would need a Makefile patch. |
| 218 |
# From 2.088 on, the build fails with it active. |
| 219 |
- dmd_ge 2.074 && ! dmd_eq 2.088 && ! dmd_eq 2.089 && ! dmd_eq 2.090 && ! dmd_eq 2.091 && LTO="ENABLE_LTO=1" |
| 220 |
+ dmd_ge 2.074 && ! dmd_eq 2.088 && ! dmd_eq 2.089 && ! dmd_eq 2.090 && ! dmd_eq 2.091 && ! dmd_eq 2.092 && LTO="ENABLE_LTO=1" |
| 221 |
# 2.080 and below used RELEASE instead of ENABLE_RELEASE |
| 222 |
dmd_ge 2.081 && ENABLE_RELEASE="ENABLE_RELEASE" || ENABLE_RELEASE="RELEASE" |
Archives