commit: 4ea9bacc261f2b470f85bd76c644f05c025e8a21
Author: Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Sun Apr 27 20:59:16 2025 +0000
Commit: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me>
CommitDate: Sun May 11 16:03:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=4ea9bacc
dev-util/gdmd: backport gdmd-15 fixes
Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me>
.../gdmd/{gdmd-14.ebuild => gdmd-11-r1.ebuild} | 21 +++++++++++++----
dev-util/gdmd/gdmd-11.ebuild | 27 ----------------------
.../gdmd/{gdmd-14.ebuild => gdmd-12-r1.ebuild} | 21 +++++++++++++----
dev-util/gdmd/gdmd-12.ebuild | 27 ----------------------
.../gdmd/{gdmd-14.ebuild => gdmd-13-r1.ebuild} | 21 +++++++++++++----
dev-util/gdmd/gdmd-13.ebuild | 27 ----------------------
.../gdmd/{gdmd-14.ebuild => gdmd-14-r1.ebuild} | 19 ++++++++++++---
7 files changed, 67 insertions(+), 96 deletions(-)
diff --git a/dev-util/gdmd/gdmd-14.ebuild b/dev-util/gdmd/gdmd-11-r1.ebuild
similarity index 81%
copy from dev-util/gdmd/gdmd-14.ebuild
copy to dev-util/gdmd/gdmd-11-r1.ebuild
index fc256ad..f5a08a8 100644
--- a/dev-util/gdmd/gdmd-14.ebuild
+++ b/dev-util/gdmd/gdmd-11-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit prefix
+
DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
HOMEPAGE="https://www.gdcproject.org/";
@@ -12,13 +14,21 @@ S="${WORKDIR}/gdmd-script-${RELEASE}"
LICENSE="GPL-3+"
SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
RESTRICT="test" # no tests
-RDEPEND="sys-devel/gcc:${PV}[d]"
+RDEPEND="
+ dev-lang/perl
+ sys-devel/gcc:${PV}[d]
+"
PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
+src_prepare() {
+ hprefixify dmd-script
+ default
+}
+
src_compile() {
:
}
@@ -28,6 +38,9 @@ src_install() {
exeinto "${binPath}"
newexe dmd-script "${CHOST}-gdmd"
dosym "${CHOST}-gdmd" "${binPath}/gdmd"
+
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/${CHOST}-gdmd-${SLOT}"
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/gdmd-${SLOT}"
}
pkg_postinst() {
@@ -52,7 +65,7 @@ maybe_update_gcc_config() {
local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}')
local curr_specs=$(gcc-config -S ${curr_config} | awk '{print $3}')
- if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
+ if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
# We should call gcc-config to make sure the addition of gdmd is
# propagated in $PATH. Don't do anything if not on a traditional
# layout, the risk of breaking something outweights having the
diff --git a/dev-util/gdmd/gdmd-11.ebuild b/dev-util/gdmd/gdmd-11.ebuild
deleted file mode 100644
index 57d23e3..0000000
--- a/dev-util/gdmd/gdmd-11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
-HOMEPAGE="https://www.gdcproject.org/";
-LICENSE="GPL-3+"
-
-SLOT="${PV}"
-KEYWORDS="amd64 arm64 x86"
-RDEPEND="sys-devel/gcc:${PV}[d]"
-RELEASE="0.1.0"
-SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/script-${RELEASE}
-> gdmd-${RELEASE}.tar.gz"
-PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
-S="${WORKDIR}/gdmd-script-${RELEASE}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local binPath="usr/${CHOST}/gcc-bin/${PV}"
- exeinto "${binPath}"
- newexe dmd-script "${CHOST}-gdmd"
- ln -f "${D}/${binPath}/${CHOST}-gdmd" "${D}/${binPath}/gdmd" || die
"Could not create 'gdmd' hardlink"
-}
diff --git a/dev-util/gdmd/gdmd-14.ebuild b/dev-util/gdmd/gdmd-12-r1.ebuild
similarity index 81%
copy from dev-util/gdmd/gdmd-14.ebuild
copy to dev-util/gdmd/gdmd-12-r1.ebuild
index fc256ad..f5a08a8 100644
--- a/dev-util/gdmd/gdmd-14.ebuild
+++ b/dev-util/gdmd/gdmd-12-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit prefix
+
DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
HOMEPAGE="https://www.gdcproject.org/";
@@ -12,13 +14,21 @@ S="${WORKDIR}/gdmd-script-${RELEASE}"
LICENSE="GPL-3+"
SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
RESTRICT="test" # no tests
-RDEPEND="sys-devel/gcc:${PV}[d]"
+RDEPEND="
+ dev-lang/perl
+ sys-devel/gcc:${PV}[d]
+"
PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
+src_prepare() {
+ hprefixify dmd-script
+ default
+}
+
src_compile() {
:
}
@@ -28,6 +38,9 @@ src_install() {
exeinto "${binPath}"
newexe dmd-script "${CHOST}-gdmd"
dosym "${CHOST}-gdmd" "${binPath}/gdmd"
+
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/${CHOST}-gdmd-${SLOT}"
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/gdmd-${SLOT}"
}
pkg_postinst() {
@@ -52,7 +65,7 @@ maybe_update_gcc_config() {
local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}')
local curr_specs=$(gcc-config -S ${curr_config} | awk '{print $3}')
- if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
+ if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
# We should call gcc-config to make sure the addition of gdmd is
# propagated in $PATH. Don't do anything if not on a traditional
# layout, the risk of breaking something outweights having the
diff --git a/dev-util/gdmd/gdmd-12.ebuild b/dev-util/gdmd/gdmd-12.ebuild
deleted file mode 100644
index 57d23e3..0000000
--- a/dev-util/gdmd/gdmd-12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
-HOMEPAGE="https://www.gdcproject.org/";
-LICENSE="GPL-3+"
-
-SLOT="${PV}"
-KEYWORDS="amd64 arm64 x86"
-RDEPEND="sys-devel/gcc:${PV}[d]"
-RELEASE="0.1.0"
-SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/script-${RELEASE}
-> gdmd-${RELEASE}.tar.gz"
-PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
-S="${WORKDIR}/gdmd-script-${RELEASE}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local binPath="usr/${CHOST}/gcc-bin/${PV}"
- exeinto "${binPath}"
- newexe dmd-script "${CHOST}-gdmd"
- ln -f "${D}/${binPath}/${CHOST}-gdmd" "${D}/${binPath}/gdmd" || die
"Could not create 'gdmd' hardlink"
-}
diff --git a/dev-util/gdmd/gdmd-14.ebuild b/dev-util/gdmd/gdmd-13-r1.ebuild
similarity index 81%
copy from dev-util/gdmd/gdmd-14.ebuild
copy to dev-util/gdmd/gdmd-13-r1.ebuild
index fc256ad..f5a08a8 100644
--- a/dev-util/gdmd/gdmd-14.ebuild
+++ b/dev-util/gdmd/gdmd-13-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit prefix
+
DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
HOMEPAGE="https://www.gdcproject.org/";
@@ -12,13 +14,21 @@ S="${WORKDIR}/gdmd-script-${RELEASE}"
LICENSE="GPL-3+"
SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
RESTRICT="test" # no tests
-RDEPEND="sys-devel/gcc:${PV}[d]"
+RDEPEND="
+ dev-lang/perl
+ sys-devel/gcc:${PV}[d]
+"
PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
+src_prepare() {
+ hprefixify dmd-script
+ default
+}
+
src_compile() {
:
}
@@ -28,6 +38,9 @@ src_install() {
exeinto "${binPath}"
newexe dmd-script "${CHOST}-gdmd"
dosym "${CHOST}-gdmd" "${binPath}/gdmd"
+
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/${CHOST}-gdmd-${SLOT}"
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/gdmd-${SLOT}"
}
pkg_postinst() {
@@ -52,7 +65,7 @@ maybe_update_gcc_config() {
local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}')
local curr_specs=$(gcc-config -S ${curr_config} | awk '{print $3}')
- if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
+ if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
# We should call gcc-config to make sure the addition of gdmd is
# propagated in $PATH. Don't do anything if not on a traditional
# layout, the risk of breaking something outweights having the
diff --git a/dev-util/gdmd/gdmd-13.ebuild b/dev-util/gdmd/gdmd-13.ebuild
deleted file mode 100644
index 57d23e3..0000000
--- a/dev-util/gdmd/gdmd-13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
-HOMEPAGE="https://www.gdcproject.org/";
-LICENSE="GPL-3+"
-
-SLOT="${PV}"
-KEYWORDS="amd64 arm64 x86"
-RDEPEND="sys-devel/gcc:${PV}[d]"
-RELEASE="0.1.0"
-SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/script-${RELEASE}
-> gdmd-${RELEASE}.tar.gz"
-PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
-S="${WORKDIR}/gdmd-script-${RELEASE}"
-
-src_compile() {
- :
-}
-
-src_install() {
- local binPath="usr/${CHOST}/gcc-bin/${PV}"
- exeinto "${binPath}"
- newexe dmd-script "${CHOST}-gdmd"
- ln -f "${D}/${binPath}/${CHOST}-gdmd" "${D}/${binPath}/gdmd" || die
"Could not create 'gdmd' hardlink"
-}
diff --git a/dev-util/gdmd/gdmd-14.ebuild b/dev-util/gdmd/gdmd-14-r1.ebuild
similarity index 82%
rename from dev-util/gdmd/gdmd-14.ebuild
rename to dev-util/gdmd/gdmd-14-r1.ebuild
index fc256ad..d543b38 100644
--- a/dev-util/gdmd/gdmd-14.ebuild
+++ b/dev-util/gdmd/gdmd-14-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+inherit prefix
+
DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
HOMEPAGE="https://www.gdcproject.org/";
@@ -15,10 +17,18 @@ SLOT="${PV}"
KEYWORDS="~amd64 ~arm64 ~x86"
RESTRICT="test" # no tests
-RDEPEND="sys-devel/gcc:${PV}[d]"
+RDEPEND="
+ dev-lang/perl
+ sys-devel/gcc:${PV}[d]
+"
PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
+src_prepare() {
+ hprefixify dmd-script
+ default
+}
+
src_compile() {
:
}
@@ -28,6 +38,9 @@ src_install() {
exeinto "${binPath}"
newexe dmd-script "${CHOST}-gdmd"
dosym "${CHOST}-gdmd" "${binPath}/gdmd"
+
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/${CHOST}-gdmd-${SLOT}"
+ dosym -r "${binPath}/${CHOST}-gdmd" "/usr/bin/gdmd-${SLOT}"
}
pkg_postinst() {
@@ -52,7 +65,7 @@ maybe_update_gcc_config() {
local curr_config_ver=$(gcc-config -S ${curr_config} | awk '{print $2}')
local curr_specs=$(gcc-config -S ${curr_config} | awk '{print $3}')
- if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
+ if [[ ${curr_config_ver} == ${SLOT} && ! ${curr_specs} ]]; then
# We should call gcc-config to make sure the addition of gdmd is
# propagated in $PATH. Don't do anything if not on a traditional
# layout, the risk of breaking something outweights having the
