Gentoo Archives: gentoo-commits

From: Marco Leise <marco.leise@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/dlang:master commit in: dev-util/dub/files/, dev-lang/dmd/, x11-terms/tilix/, dev-util/dub/, eclass/, ...
Date: Sun, 17 Nov 2019 15:38:52
Message-Id: 1574005058.594dd1fb1b361c1d3f779602606d142ce9055b25.mleise@gentoo
1 commit: 594dd1fb1b361c1d3f779602606d142ce9055b25
2 Author: Marco Leise <marco.leise <AT> gmx <DOT> de>
3 AuthorDate: Sun Nov 3 01:00:25 2019 +0000
4 Commit: Marco Leise <marco.leise <AT> gmx <DOT> de>
5 CommitDate: Sun Nov 17 15:37:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=594dd1fb
7
8 dmd-2.089.0 & dub-1.18.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.089.0.ebuild | 24 ++++++++++
14 dev-util/dlang-tools/Manifest | 1 +
15 dev-util/dlang-tools/dlang-tools-2.089.0.ebuild | 54 ++++++++++++++++++++++
16 dev-util/dub/Manifest | 1 +
17 dev-util/dub/dub-1.18.0.ebuild | 39 ++++++++++++++++
18 .../dub/files/dub-1.18.0-gdc-dmd-pathfix.patch | 16 +++++++
19 eclass/dmd.eclass | 2 +-
20 x11-terms/tilix/tilix-1.9.3-r1.ebuild | 2 +-
21 9 files changed, 138 insertions(+), 2 deletions(-)
22
23 diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
24 index 8d5fc09..fe2c4b7 100644
25 --- a/dev-lang/dmd/Manifest
26 +++ b/dev-lang/dmd/Manifest
27 @@ -25,3 +25,4 @@ DIST dmd.2.086.1.linux.tar.xz 24643816 BLAKE2B fc6703f6c7f8724e06bb75278df584698
28 DIST dmd.2.087.1.linux.tar.xz 25120264 BLAKE2B fb6aed0ebf1547565f99717830acfe450bc7db260070b77d37491a8d216acbe7ac1b07d320a42d7df706e0f18c6644ab18925273455b7949160c99af83645053 SHA512 8c44aa61b7fb1605a98f49db2e45d9e115626ad4bca9a1cdf3e61a116538e893d2504f524234bcd060ad3a1dda67b8813adf256055f24a0289b4f9630fc7ce63
29 DIST dmd.2.088.0.linux.tar.xz 25131504 BLAKE2B 9a52c7ff2a34ef3bf5f792709f71da852a19c5c48b79ee843c2d46b2017cff2e31d7bd4d375d665fe0d5027a1397c6f05c4b3c442d6a57196bd8d548e61135fc SHA512 dcacbb48de87c312b1032306e6b33888ec779f45d33fca08a37d2341fc1f2061ae43ea95467a46bc961ee2841795e559d9c8e3ea41cf06a6e14a9c789f044c17
30 DIST dmd.2.088.1.linux.tar.xz 25122116 BLAKE2B e573a97cf9f547a3017a0b904523f4877782bef98144744f064a539e87fac8c0938b2963308a0e4046b934a700273338cbea32467b472daf665c9c5673ee5e06 SHA512 e98183870cab35b67967b73149a10025b257ba9ce9aafabdbdd1d91cc3009b90d13d0b5173fb5e32d53da890de7b7bd41deddec19774baaafa84c6efef4717a8
31 +DIST dmd.2.089.0.linux.tar.xz 25693688 BLAKE2B 034d90b18e32d382d3e9c78654560b20cfc89f53cf4395b46c2b0f09db9be75c008017ff843b49912a43a40020d857a6654890b8293df305c012058369e45f78 SHA512 91e03f706ff91172a64fb9ab06544e39fcec90890074fbf72758b3bbc4d8664f66a7f714ccac5d3d236464485abef85d7936aba1612559a5c1dd78a505abd328
32
33 diff --git a/dev-lang/dmd/dmd-2.089.0.ebuild b/dev-lang/dmd/dmd-2.089.0.ebuild
34 new file mode 100644
35 index 0000000..1350dea
36 --- /dev/null
37 +++ b/dev-lang/dmd/dmd-2.089.0.ebuild
38 @@ -0,0 +1,24 @@
39 +# Copyright 1999-2019 Gentoo Authors
40 +# Distributed under the terms of the GNU General Public License v2
41 +
42 +EAPI=6
43 +
44 +KEYWORDS="-* ~amd64 ~x86"
45 +YEAR=2019
46 +DLANG_VERSION_RANGE="2.075-"
47 +
48 +inherit dmd
49 +
50 +PATCHES=(
51 + "${FILESDIR}/2.081-allow-deprecations.patch"
52 + "${FILESDIR}/2.083-link-32-bit-shared-lib-with-ld.bfd.patch"
53 +)
54 +
55 +dmd_src_prepare_extra() {
56 + # Copy default DDOC theme file into resource directory
57 + mkdir "dmd/res" || die "Failed to create 'dmd/res' directory"
58 + 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."
59 +
60 + # Copy missing config.d
61 + cp "${FILESDIR}/2.086-config.d" "dmd/config.d" || die "Failed to copy 'config.d' file into 'dmd' directory."
62 +}
63
64 diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
65 index bc6884c..f23d817 100644
66 --- a/dev-util/dlang-tools/Manifest
67 +++ b/dev-util/dlang-tools/Manifest
68 @@ -24,6 +24,7 @@ DIST dlang-tools-2.086.1.tar.gz 116540 BLAKE2B 5a2e19f72fd8dd608e15dd5d5d4d6fe22
69 DIST dlang-tools-2.087.1.tar.gz 117096 BLAKE2B 3384882ff647c459d2a2380d35cf355eaeb0828d0b965ce4aa2bc7b8652662b3f38b137b01f60d33df0400982ec1c96a1d2d3b6363ccbfe4f52d01d88dccbb93 SHA512 af5adf9971ed818ca93f7d0e462d7d3f91920caacc77c4b26cc828ef00ee28ee2bb56574c4c7f8692853af2e2d32495e49bf1fca4956652df4452eac099b52cd
70 DIST dlang-tools-2.088.0.tar.gz 117098 BLAKE2B 1b202aa34c0a0d34a9b415cd450da2310cb0d4fbf4d32c4ebe9d6d56dbff6534e026cb7260cfed68630be21b118c79c953109818948afc543b1bb075d9cee250 SHA512 767fa0e7c66a5e1932d96c2fadc49846db623501c62a59c3679e1c76a21154a9e03fa5d4ca9acecf8ef0bcb4c7f4e252a271e9f474b34627a28a6e643b8aeb7d
71 DIST dlang-tools-2.088.1.tar.gz 117104 BLAKE2B 2920cb8950fb0e921665bab161584c35a267acbc4a34713afabfab2edc40c6d391a2a55ae2bb3a0f28f2be2ef5ddbeec767b9afcea510d9b35d57d1cf9e5ca52 SHA512 288739656404e345e683e6692a6478a03af8455d3e3ad56d3ba22e1d7d9cb1e5156f70116e4444138c798bfa28cf4b38263b6cd32a8d2483417e8ae51192ea65
72 +DIST dlang-tools-2.089.0.tar.gz 117576 BLAKE2B 73ff760a86bd537e8ae818287bd337c25a865c2a103ad7334f66abc02725b064b1190c2bdc29b32d6b3759adc69a36a2ac499285aef3f1c4b260f4d747750418 SHA512 a64bed8d0b24a33fd86ca1375895f85cd86b34d2b9eb871e7d3df34235e634be058addd6b1056c5a3b010050eb0593e5ef45d907720e07b081140fd265bc00e3
73 DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9 SHA512 a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf
74 DIST dlang.org-2.065.0.tar.gz 1005429 BLAKE2B 01fc8ec0c5148f910e2923be556208c08a18f00453ffa1f1a22d6725db6489b6f9022cd170caa3a05078baddde353ee819984da5efa53547e78006d2f0a97b9c SHA512 0fb185603766b54c3b9dc57824b18ec7ea9f37281610729860543630f4546591f9523bff48eee5414235d2ee656201c444e6d2efc44ba66a052b98a0d9b4729e
75 DIST dlang.org-2.066.1.tar.gz 1024075 BLAKE2B cfdb4922c38d9f0ced941eeb4578d71f09d65201d2f89cfc73e46ae73f0939c74fa92d7f003b87a28f814c5b2cc0dda6855b86e64fd86be3920c129f8c20df6a SHA512 d3838cc2ab6236d57c17f92fa5eaef8458176715985aecbea9653cc772725e1b9f813c9ffc8e06490e08c1031826ab84d1fcfbd88008791cac3257db814e3dc8
76
77 diff --git a/dev-util/dlang-tools/dlang-tools-2.089.0.ebuild b/dev-util/dlang-tools/dlang-tools-2.089.0.ebuild
78 new file mode 100644
79 index 0000000..16a8df2
80 --- /dev/null
81 +++ b/dev-util/dlang-tools/dlang-tools-2.089.0.ebuild
82 @@ -0,0 +1,54 @@
83 +# Copyright 1999-2019 Gentoo Authors
84 +# Distributed under the terms of the GNU General Public License v2
85 +
86 +EAPI=6
87 +
88 +DESCRIPTION="Ancilliary tools for the D programming language compiler"
89 +HOMEPAGE="http://dlang.org/"
90 +LICENSE="Boost-1.0"
91 +
92 +SLOT="0"
93 +KEYWORDS="~amd64 ~x86"
94 +TOOLS="ddemangle detab dustmite rdmd"
95 +IUSE="+ddemangle detab dustmite +rdmd"
96 +REQUIRED_USE="|| ( ${TOOLS} )"
97 +
98 +inherit eapi7-ver
99 +
100 +DLANG_SLOT="$(ver_cut 1-2)"
101 +RESTRICT="mirror"
102 +
103 +BETA="$(ver_cut 4)"
104 +VERSION="$(ver_cut 1-3)"
105 +
106 +if [[ -n "${BETA}" ]]; then
107 + VERSION="${VERSION}-b${BETA:4}"
108 +fi
109 +SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} -> dlang-tools-${VERSION}.tar.gz"
110 +
111 +DLANG_VERSION_RANGE="2.076-"
112 +DLANG_PACKAGE_TYPE="single"
113 +
114 +inherit eutils dlang
115 +
116 +S="${WORKDIR}/tools-${VERSION}"
117 +
118 +d_src_compile() {
119 + use ddemangle && dlang_compile_bin ddemangle ddemangle.d
120 + use detab && dlang_compile_bin detab detab.d
121 + use dustmite && dlang_compile_bin dustmite DustMite/dustmite.d DustMite/splitter.d
122 + use rdmd && dlang_compile_bin rdmd rdmd.d
123 +}
124 +
125 +d_src_install() {
126 + for tool in ${TOOLS}; do
127 + if use "${tool}"; then
128 + dobin "${tool}"
129 + fi
130 + done
131 +
132 + # file icons
133 + for size in 16 22 24 32 48 256; do
134 + newicon --size "${size}" --context mimetypes "${FILESDIR}/icons/${size}/dmd-source.png" text-x-dsrc.png
135 + done
136 +}
137
138 diff --git a/dev-util/dub/Manifest b/dev-util/dub/Manifest
139 index aefe6c2..36decb3 100644
140 --- a/dev-util/dub/Manifest
141 +++ b/dev-util/dub/Manifest
142 @@ -1 +1,2 @@
143 DIST dub-1.17.0.tar.gz 1280689 BLAKE2B b7236bce2e2cc1218a8043ae95087876e6fa67e696e3320c2ba089451870eccc3f7d7aafb89d7ec192fad4bc5de89eab15f79c1e128ca7c12c1c906b4151ba1c SHA512 8907e7b66d5a5c3d6013a2073a61cdab2a9276454b9c63628b30bb787cee2a7f785bf5ee1db781bf241fe4196a792f74682872ad55bb42349ae5452ce0ffec92
144 +DIST dub-1.18.0.tar.gz 1281488 BLAKE2B 69c1c2c10c4f3ede1fd30f31d87d135c0bc7435fddd14491ec86fc8a86e61e91a89b678ee32f11dbe180ed710859917a6c7a3de8900b4a0f7696bb3a4ffd13b4 SHA512 c8eff9e9fe1edf5f2cb01119463dade936f32f53971e9d58dad6e3d27cc2a013cd9bb6976d2d42c999b7c98a4bd8f9846a2064ba6496c9c1a6dc5e15421c9cfa
145
146 diff --git a/dev-util/dub/dub-1.18.0.ebuild b/dev-util/dub/dub-1.18.0.ebuild
147 new file mode 100644
148 index 0000000..237a2db
149 --- /dev/null
150 +++ b/dev-util/dub/dub-1.18.0.ebuild
151 @@ -0,0 +1,39 @@
152 +# Copyright 1999-2019 Gentoo Authors
153 +# Distributed under the terms of the GNU General Public License v2
154 +
155 +EAPI=6
156 +
157 +DESCRIPTION="Package and build management system for D"
158 +HOMEPAGE="http://code.dlang.org/"
159 +LICENSE="MIT"
160 +
161 +SLOT="0"
162 +KEYWORDS="~amd64 ~arm ~x86"
163 +IUSE="debug"
164 +
165 +GITHUB_URI="https://codeload.github.com/dlang"
166 +SRC_URI="${GITHUB_URI}/${PN}/tar.gz/v${PV} -> ${PN}-${PV}.tar.gz"
167 +PATCHES="${FILESDIR}/${P}-gdc-dmd-pathfix.patch"
168 +
169 +DLANG_VERSION_RANGE="2.076-"
170 +DLANG_PACKAGE_TYPE="single"
171 +
172 +inherit dlang
173 +
174 +DEPEND="net-misc/curl"
175 +RDEPEND="${DEPEND}"
176 +
177 +d_src_compile() {
178 + local imports=source versions="DubApplication DubUseCurl" libs="curl z"
179 + dlang_compile_bin bin/dub $(<build-files.txt)
180 +}
181 +
182 +d_src_test() {
183 + echo "Test phase disabled due to multiple problems."
184 + #DUB="${S}/bin/dub" test/run-unittest.sh || die "Test phase failed"
185 +}
186 +
187 +d_src_install() {
188 + dobin bin/dub
189 + dodoc README.md
190 +}
191
192 diff --git a/dev-util/dub/files/dub-1.18.0-gdc-dmd-pathfix.patch b/dev-util/dub/files/dub-1.18.0-gdc-dmd-pathfix.patch
193 new file mode 100644
194 index 0000000..497ef50
195 --- /dev/null
196 +++ b/dev-util/dub/files/dub-1.18.0-gdc-dmd-pathfix.patch
197 @@ -0,0 +1,16 @@
198 +diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
199 +--- a/source/dub/generators/build.d
200 ++++ b/source/dub/generators/build.d
201 +@@ -119,10 +119,10 @@ class BuildGenerator : ProjectGenerator {
202 + auto build_id = computeBuildID(config, buildsettings, settings);
203 +
204 + // make all paths relative to shrink the command line
205 +- string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
206 ++ /+string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }
207 + foreach (ref f; buildsettings.sourceFiles) f = makeRelative(f);
208 + foreach (ref p; buildsettings.importPaths) p = makeRelative(p);
209 +- foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);
210 ++ foreach (ref p; buildsettings.stringImportPaths) p = makeRelative(p);+/
211 +
212 + // perform the actual build
213 + bool cached = false;
214
215 diff --git a/eclass/dmd.eclass b/eclass/dmd.eclass
216 index 39242f0..c0be7fc 100644
217 --- a/eclass/dmd.eclass
218 +++ b/eclass/dmd.eclass
219 @@ -130,7 +130,7 @@ dmd_src_compile() {
220 dmd_ge 2.071 && HOST_CXX="HOST_CXX" || HOST_CXX="HOST_CC"
221 # 2.072 and 2.073 have support for LTO, but would need a Makefile patch.
222 # From 2.088 on, the build fails with it active.
223 - dmd_ge 2.074 && ! dmd_eq 2.088 && LTO="ENABLE_LTO=1"
224 + dmd_ge 2.074 && ! dmd_eq 2.088 && ! dmd_eq 2.089 && LTO="ENABLE_LTO=1"
225 # 2.080 and below used RELEASE instead of ENABLE_RELEASE
226 dmd_ge 2.081 && ENABLE_RELEASE="ENABLE_RELEASE" || ENABLE_RELEASE="RELEASE"
227
228
229 diff --git a/x11-terms/tilix/tilix-1.9.3-r1.ebuild b/x11-terms/tilix/tilix-1.9.3-r1.ebuild
230 index 3d24881..81192b1 100644
231 --- a/x11-terms/tilix/tilix-1.9.3-r1.ebuild
232 +++ b/x11-terms/tilix/tilix-1.9.3-r1.ebuild
233 @@ -11,7 +11,7 @@ SLOT="0"
234 KEYWORDS="amd64 x86"
235 IUSE="+crypt"
236
237 -DLANG_VERSION_RANGE="2.075-"
238 +DLANG_VERSION_RANGE="2.075-2.086"
239 DLANG_PACKAGE_TYPE="single"
240
241 inherit gnome2 dlang