commit: 98c458b5c4757890a5c8dd7bedc87290bf780a0d
Author: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Sat Sep 30 10:33:49 2023 +0000
Commit: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me>
CommitDate: Sun Oct 1 11:01:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=98c458b5
dev-lang/dmd: add 2.101.2
Signed-off-by: Horodniceanu Andrei <a.horodniceanu <AT> proton.me>
dev-lang/dmd/Manifest | 1 +
dev-lang/dmd/dmd-2.099.1.ebuild | 4 +-
dev-lang/dmd/dmd-2.100.2.ebuild | 2 +-
.../dmd/{dmd-2.100.2.ebuild => dmd-2.101.2.ebuild} | 4 +-
.../2.101-phobos-change-DMD_DIR-meaning.patch | 34 ++++++++++++
dev-util/dlang-tools/Manifest | 1 +
dev-util/dlang-tools/dlang-tools-2.101.2.ebuild | 63 ++++++++++++++++++++++
eclass/dlang-compilers.eclass | 1 +
profiles/use.desc | 1 +
9 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index b1562b7..e90b3d7 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -35,3 +35,4 @@ DIST dmd.2.097.2.linux.tar.xz 23260840 BLAKE2B
9f19a396ca468806bde4c4af855f233b2
DIST dmd.2.098.1.linux.tar.xz 23790368 BLAKE2B
12edf0e14af17bae1ca728bad47b9858eaf0c94e74b3fdd5158e9e083bad22c4241573ec07163bc70f7f7c2c735635b1d4779425b65401124d1d2200d2a27b02
SHA512
7f4838d2c82284c595c6f7cd3919e6c696862e6dc8b84ec6ac76ea06e11d449f6f80e9821fcb3df7184368fc905dbe473b276eb31438a84da0bf220beb1340be
DIST dmd.2.099.1.linux.tar.xz 21846416 BLAKE2B
e5c3baa981af46ce980c80c42729a2db99a44d3f8f464a711c299c0d7c2354c6ba8d607b57a7f6d79d7a99793cd727f1f7e9fd33c49517ea5c9783efcda00518
SHA512
20fbf33dae8e79d07993ca2b1032e86db40dd21e06dcca2ed3f7cfa8921ba25799e0dc534f989ca535d274f2984f7873a186227854d54c21aadfdd671febc43d
DIST dmd.2.100.2.linux.tar.xz 22013684 BLAKE2B
e7e10ebc91a4baeda917b91e40b7b5d271caa0fee23d9c98f53c8239a0666c388d45a7290e338054b7b59dae6dbca9e5b1f03511783f59f92cc398a81e225390
SHA512
fd1615aa962b72f0f6e4c6d1276b101b8aa234206eb7162690267f674c9c788a5743fe42cf7415ff8d54514cd08b8844be1bca59ceafca753d1bac488e7e1661
+DIST dmd.2.101.2.linux.tar.xz 22666828 BLAKE2B
8233d9f375291d73530a677cd5180153bc758076fd135c420cbb088bf84147fa1f0dc1cd563e94737e781823db26e4e0250af31d68819c3375224a92e53876b6
SHA512
7e1ce980fce7a2a995af92b2e05acdfcb2d8abc14780e11d8234792b80edead68c455e644e1830d360651bdacefa1aace963ce652fbfd3b0951dd9002fcfb87f
diff --git a/dev-lang/dmd/dmd-2.099.1.ebuild b/dev-lang/dmd/dmd-2.099.1.ebuild
index 08c01fe..f1afefa 100644
--- a/dev-lang/dmd/dmd-2.099.1.ebuild
+++ b/dev-lang/dmd/dmd-2.099.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
KEYWORDS="-* amd64 x86"
YEAR=2022
-DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-"
+DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.100"
inherit dmd
diff --git a/dev-lang/dmd/dmd-2.100.2.ebuild b/dev-lang/dmd/dmd-2.100.2.ebuild
index 744b993..c39940f 100644
--- a/dev-lang/dmd/dmd-2.100.2.ebuild
+++ b/dev-lang/dmd/dmd-2.100.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
KEYWORDS="-* ~amd64 ~x86"
YEAR=2022
-DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.102"
+DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.100"
inherit dmd
diff --git a/dev-lang/dmd/dmd-2.100.2.ebuild b/dev-lang/dmd/dmd-2.101.2.ebuild
similarity index 70%
copy from dev-lang/dmd/dmd-2.100.2.ebuild
copy to dev-lang/dmd/dmd-2.101.2.ebuild
index 744b993..b347904 100644
--- a/dev-lang/dmd/dmd-2.100.2.ebuild
+++ b/dev-lang/dmd/dmd-2.101.2.ebuild
@@ -4,11 +4,13 @@
EAPI=6
KEYWORDS="-* ~amd64 ~x86"
-YEAR=2022
+YEAR=2023
DLANG_VERSION_RANGE="2.076-2.080 2.082 2.084-2.102"
inherit dmd
PATCHES=(
"${FILESDIR}/2.097-link-32-bit-shared-lib-with-ld.bfd.patch"
+ # See https://github.com/dlang/phobos/pull/8820
+ "${FILESDIR}/2.101-phobos-change-DMD_DIR-meaning.patch"
)
diff --git a/dev-lang/dmd/files/2.101-phobos-change-DMD_DIR-meaning.patch
b/dev-lang/dmd/files/2.101-phobos-change-DMD_DIR-meaning.patch
new file mode 100644
index 0000000..67d64df
--- /dev/null
+++ b/dev-lang/dmd/files/2.101-phobos-change-DMD_DIR-meaning.patch
@@ -0,0 +1,34 @@
+diff --git a/posix.mak b/posix.mak
+index f246c0c9e..0fb08876e 100644
+--- dmd2/phobos/posix.mak
++++ dmd2/phobos/posix.mak
+@@ -32,9 +32,9 @@ QUIET:=@
+
+ DEBUGGER=gdb
+ GIT_HOME=https://github.com/dlang
+-DMD_DIR=../dmd
++DMD_DIR=../dmd/compiler
+
+-include $(DMD_DIR)/compiler/src/osmodel.mak
++include $(DMD_DIR)/src/osmodel.mak
+
+ ifeq (osx,$(OS))
+ export MACOSX_DEPLOYMENT_TARGET=10.9
+@@ -94,7 +94,7 @@ ifeq ($(OS),win32wine)
+ DMD = wine dmd.exe
+ RUN = wine
+ else
+- DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
++ DMD = $(DMD_DIR)/../generated/$(OS)/$(BUILD)/$(MODEL)/dmd
+ ifeq ($(OS),win32)
+ CC = dmc
+ else
+@@ -182,7 +182,7 @@ LINKDL:=$(if $(findstring $(OS),linux),-L-ldl,)
+ TIMELIMIT:=$(if $(shell which timelimit 2>/dev/null || true),timelimit -t 90
,)
+
+ # Set VERSION, where the file is that contains the version string
+-VERSION=$(DMD_DIR)/VERSION
++VERSION=$(DMD_DIR)/../VERSION
+
+ # Set LIB, the ultimate target
+ ifeq (,$(findstring win,$(OS)))
diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
index 41290d0..94524ef 100644
--- a/dev-util/dlang-tools/Manifest
+++ b/dev-util/dlang-tools/Manifest
@@ -35,6 +35,7 @@ DIST dlang-tools-2.097.2.tar.gz 129531 BLAKE2B
ac1ad83e2e0f8fe715acd78eb13a75625
DIST dlang-tools-2.098.1.tar.gz 129699 BLAKE2B
b7902b2cdcb6f9bbf6e71356cfdaaf8e3cbd05125818b13b10357226745065034cccf20618307f4a9a57ad5a35f4ba170ce7c184967e8c795546b8030bbe4f26
SHA512
a7e96cb38c95d910307c0fefa3840f8315799d4713e6c7ec591bd37863683962aede4359c7114b715a760b438df540dfc42e8da8394b1f4c892384e21fe7575e
DIST dlang-tools-2.099.1.tar.gz 129867 BLAKE2B
6f37d08921a1532a7d5875df99e4037fb52a5ac59585bbc98d09d225afd2ce564963cc30f1ebaad093238ca758d7db2a874f9aa357fe23dce6a9a6c9ebcb6d21
SHA512
68cde8853bac2f3c92a2fbbe3f658e29b475bea2aeb5f5ffb96f2b3e85aca693b1d14c8fa248bad882461e55957c1de5cba9ac7a02b3a28be070e4869b6a4171
DIST dlang-tools-2.100.2.tar.gz 129438 BLAKE2B
16784d5ec33cbc31dfefad2b3a5a4f776f65aa61f83392de08944651bf06f15325e8be0a6a006aed0dfac9aa4b4307c60b317a1c9cb6b2eb4ec04e59373f2009
SHA512
1a42e4c9d871debcdd8a6342770d92da3de42e9e80dfc4f62ac3610bfa2903fc28964fde820512233fe22d86045191ef08e3fa82a51f63bc023f8c404b6b349b
+DIST dlang-tools-2.101.2.tar.gz 129467 BLAKE2B
04a2240693ba9e04f796d367e2f10e11d8a777c26a6acba6c1fd2f59481583fae653fdb75b4a335f2ddbec962469954b056ec365fabaa7d5f4a7dd7f26b8a06f
SHA512
1d16e3c40b7a29703bfa66a58b8f5ee00421f982b5b14de05f8edd1f4504385b0a84726fd618908c235ebeb49c1ad53a8034f5dad6057c2701884023608581fc
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.101.2.ebuild
b/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild
new file mode 100644
index 0000000..77e9b0d
--- /dev/null
+++ b/dev-util/dlang-tools/dlang-tools-2.101.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 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
+ # We want to convert a Gentoo version string into an upstream one:
2.097.0_rc1 -> 2.097.0-rc.1
+ VERSION="$(ver_rs 3 "-" 4 ".")"
+fi
+SRC_URI="https://codeload.github.com/dlang/tools/tar.gz/v${VERSION} ->
dlang-tools-${VERSION}.tar.gz"
+
+DLANG_VERSION_RANGE="2.075-2.102"
+DLANG_PACKAGE_TYPE="single"
+
+inherit eutils dlang xdg-utils
+
+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 DustMite/polyhash.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
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/eclass/dlang-compilers.eclass b/eclass/dlang-compilers.eclass
index 4f2281f..84326a0 100644
--- a/eclass/dlang-compilers.eclass
+++ b/eclass/dlang-compilers.eclass
@@ -61,6 +61,7 @@ dlang-compilers_declare_versions() {
["2.098"]="2.098 x86 amd64"
["2.099"]="2.099 x86 amd64"
["2.100"]="2.100 ~x86 ~amd64"
+ ["2.101"]="2.101 ~x86 ~amd64"
)
# GDC (hppa, sparc: masked "d" USE-flag)
diff --git a/profiles/use.desc b/profiles/use.desc
index a0538db..d0396ba 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -35,6 +35,7 @@ dmd-2_097 - Build for DMD 2.097
dmd-2_098 - Build for DMD 2.098
dmd-2_099 - Build for DMD 2.099
dmd-2_100 - Build for DMD 2.100
+dmd-2_101 - Build for DMD 2.101
gdc-11_3_1_p20230427 - Build for GCC 11.3.1_p20230427
gdc-11_4_0 - Build for GCC 11.4.0
gdc-11_4_1_p20230622 - Build for GCC 11.4.1_p20230622
