commit: 6cb9a9949c367d0f23cd3ff6469cf6efac5c3b00 Author: Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me> AuthorDate: Thu Feb 1 00:12:26 2024 +0000 Commit: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me> CommitDate: Thu Feb 1 00:12:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=6cb9a994
dev-util/dscanner: add 0.15.2 Additional changes: - add github upstream remote to metadata.xml - keyword for ~arm64 - bump EAPI 7 -> 8 Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me> dev-util/dscanner/Manifest | 5 + dev-util/dscanner/dscanner-0.15.2.ebuild | 114 +++++++++++++++++++++ .../dscanner/files/0.15.2-makefile-fixes.patch | 26 +++++ dev-util/dscanner/metadata.xml | 6 +- 4 files changed, 150 insertions(+), 1 deletion(-) diff --git a/dev-util/dscanner/Manifest b/dev-util/dscanner/Manifest index fe9edeb..80818f3 100644 --- a/dev-util/dscanner/Manifest +++ b/dev-util/dscanner/Manifest @@ -1,7 +1,12 @@ +DIST DCD-1c60c5480f70db568279e4637a5033953c777406.tar.gz 199435 BLAKE2B d32410769e210d1eebf70c9007e4cf939df7e2104d5535f913c22a08503cd048b0b6a82563ee15fe47ce87e55fbbeef1d7e9893714d75f8ffd4beaeaf87ec5de SHA512 9f445134a97a58079e4805f3584bf9816e9c158db07c5409e63f2b5f371769b2fe66b2d66b1c4883279960d9d4fb020a6f20b83e4d32ad9c9c2d180940d7cb4e +DIST containers-116a02872039efbd0289828cd5eeff6f60bdf539.tar.gz 55518 BLAKE2B 466c2452724b3d377ca2cec8793e27b8599e4388644ef7058de4e535d5f095f6e713e6aaf7e934f944b68726f9a96aed3f093100f993cfe4db1efd5dbd9e6cd4 SHA512 e98ecc56b7dac12c347b591f65b33fc213a183e22c455e6bd2727d9797922069db70143240d935d72c38738fc43b579ede33c4a6d8e7ac0e5194001d3b0d773f DIST containers-fc1625a5a0c253272b80addfb4107928495fd647.tar.gz 55220 BLAKE2B 67851802c64c2e22c40688e050e8ba3825d6152df0fed2130d3585b77264ddd0ff0444c199d95330116887d6711935b82cdba392e557acf22d353b094c4be8a4 SHA512 ff13091bd8ccd2fbfdb18284d81cf3789f208cc3e9f07f36cfb87122efb36b364c3201c695c9b0267705576561270a6f2a9ec91ce8776a7d683db4bf36ca328b DIST dscanner-0.11.1.tar.gz 90803 BLAKE2B b90ed5b8067d675c2e25d35e967fdd7313fa5dd5758e179aa687c228aa91d099f2231758cbb12941cb73594d6024f8baf7f8b4ebc0f1c730a6e7d18eb8b16b73 SHA512 321ded16f9cf35835fb779ad0fd5bf2b89b861842798100e0b28d0b70027b01e92500621e6d3797ee31eeef86f1deaf36b419b04e4dc7fbae6efe4a292d47a3a +DIST dscanner-0.15.2.tar.gz 103122 BLAKE2B cff0637596cf094a9811bd49721b9328fada3de04d29edb69045d01111482f7dbf8631f6db296054d23d2ad66ca94a4c1fe8d23e4bae5aa3dbb01269ef30c164 SHA512 92ba1be469de5cf1edfa4e6e53b6c4acd6a2e2ef6a451650d5a652ce161b47c88255a8539a9cf716212449e7f6c16aa4950fa1445b287040c83deb54c978dcaf DIST dsymbol-b8920c2a4593e24d1ced91f8f0bce9e50f598e4d.tar.gz 34794 BLAKE2B e863b47e51263c564d38695b35dd8c225c69d657d5aaf7c09eb240d999b91aa2fd3cf0911e4265467b1c314e3c7365bf4a109eac6190c4326a8a12eef4e6d56b SHA512 fcb6dce5c28c87dee1bc850646b739841e3e6c23108d7e47545750cc810b6aede661ae18895459a82518d38864ed6aee1c5bed390a40057b12c54808791bfcd5 DIST inifiled-cecaff8037a60db2a51c9bded4802c87d938a44e.tar.gz 8251 BLAKE2B fa0bb78c11f69e257a0974c16188475d50fcf2a56138fc288d6262be91604b8e706bfab2572b2d0e358c8366b400a2c5a3af6ba87d5243825ddf26a5a03fbfe2 SHA512 9a3c66eca2b48350c798fd0a54d37c8714d6a499e8412983f1bda2f00cda6fe1439bfbc6766d32529f3d7cc708a0528c52c077f9169727b492616691833c52d0 DIST libddoc-9cf851e4476bdadccd96f3589e16ab9f9881c76d.tar.gz 20108 BLAKE2B 18b98b4fc9fdb409184b3d337147625953c1b78442ca956fcc774857c16006518d746c43cd93ab00fea10bee4beaa72c10d13590064a520877770fd882361684 SHA512 b684d63d4db647f7366154e7631917842ccaac2c95a09ab58065db08b176352a44b674c788bd726e3c83d78dbc5c2134d468cfb7cb212c5dff65b5442174ade6 +DIST libddoc-fbbfb8245728484e5f96d717994d4b404a9789a4.tar.gz 21113 BLAKE2B 419de2c211c609e81e9c65e85ac7ea22beb9490ae953ec8ffa996d538c4777732c21b1dc9bceb0551d5b83da94b493dd3c6b8ad9093fe839e5007dce63dbc036 SHA512 ccf6566da9d668ecb651bd26c17077669e4d9cba4832a424f57f271ef80b8b779c78e3c03b8736f3766d6653a6415ba65bc7de687648e370865127db2571655e DIST libdparse-6f0893f6b07ec561d382f26c81e74f7788056828.tar.gz 145629 BLAKE2B 3fa4801499abfb3ad8b2094d48f68a96338ed994be1f417df4fe9591c9c80bb3a89a3652d623be3a59a2c73054e0ed6a15de11f6e890d8ec7a0294fa517b4c66 SHA512 9329deb2fee5b36e5b7ebfd553f5efc8c190e3a7f79eb2939598ac28391c0e717d96db1c16b825cd838780f31313e48699b3d115f344137131373042f0d9a2d7 +DIST libdparse-fe6d1e38fb4fc04323170389cfec67ed7fd4e24a.tar.gz 158963 BLAKE2B 4fc7b52921d0c163051b4115076a1473fd7138244bad8052e79298beaccb1ed3c737bbf0ae754f2596133d32cede71704e4ac43c486d69a4390e5654c1993bfa SHA512 cb36b7bfc7d33c0c2c9be25bf4bea1abdbad7c7c9860bbbe725be7d5859255f937fb3b4a2241b47eb4131dd1879819e47704eaadeeb660d5b245008f594107cf DIST stdx-allocator-d6e6ce4a838e0dad43ef13f050f96627339cdccd.tar.gz 103648 BLAKE2B c08925df810761bb4825d6058375dcc5415f4838403b3668aeff5c1be93c7d04b49c1994da27aa498cd0f4abd1ff923e8d906ae53c922f94bc63dac334b7f138 SHA512 3a41f95505e92d79a6b966d21d96fe5b5bb2b2f3762b09998b27334684d815a82a3e705935faa1b543a93ffb274c67b9110b2b1b7364f7d405bd65d05b819271 diff --git a/dev-util/dscanner/dscanner-0.15.2.ebuild b/dev-util/dscanner/dscanner-0.15.2.ebuild new file mode 100644 index 0000000..29ec674 --- /dev/null +++ b/dev-util/dscanner/dscanner-0.15.2.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Swiss-army knife for D source code" +HOMEPAGE="https://github.com/dlang-community/D-Scanner"; +LICENSE="Boost-1.0" + +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug" + +CONTAINERS="116a02872039efbd0289828cd5eeff6f60bdf539" +DCD="1c60c5480f70db568279e4637a5033953c777406" +INIFILED="cecaff8037a60db2a51c9bded4802c87d938a44e" +LIBDDOC="fbbfb8245728484e5f96d717994d4b404a9789a4" +LIBDPARSE="fe6d1e38fb4fc04323170389cfec67ed7fd4e24a" +GITHUB_URI="https://codeload.github.com"; +SRC_URI=" + ${GITHUB_URI}/dlang-community/${PN}/tar.gz/v${PV} -> ${P}.tar.gz + ${GITHUB_URI}/dlang-community/containers/tar.gz/${CONTAINERS} -> containers-${CONTAINERS}.tar.gz + ${GITHUB_URI}/dlang-community/DCD/tar.gz/${DCD} -> DCD-${DCD}.tar.gz + ${GITHUB_URI}/burner/inifiled/tar.gz/${INIFILED} -> inifiled-${INIFILED}.tar.gz + ${GITHUB_URI}/dlang-community/libddoc/tar.gz/${LIBDDOC} -> libddoc-${LIBDDOC}.tar.gz + ${GITHUB_URI}/dlang-community/libdparse/tar.gz/${LIBDPARSE} -> libdparse-${LIBDPARSE}.tar.gz + " +S="${WORKDIR}/D-Scanner-${PV}" +PATCHES=( "${FILESDIR}/${PV}-makefile-fixes.patch" ) + +DLANG_VERSION_RANGE="2.100-2.106" +DLANG_PACKAGE_TYPE="single" + +inherit dlang + +src_prepare() { + move_git_submodules + + mkdir "${S}"/bin || die "Failed to create 'bin' directory." + # Stop the makefile from executing git + echo "v${PV}" > "${S}"/bin/githash.txt || die "Could not generate githash" + + # Apply patches + dlang_src_prepare +} + +d_src_compile() { + if use debug; then + # Add a -debug compiler specific flag and enable the dparse_verbose version, + # like the debug target in the makefile except that it doesn't build everything in 1 go. + + # Is ${DLANG_VERSION_FLAG} internal? + DCFLAGS+=" ${DLANG_VERSION_FLAG}=dparse_verbose" + + local debugFlag + case "${DLANG_VENDOR}" in + DigitalMars) + debugFlag="-debug" + ;; + GNU) + debugFlag="-fdebug" + ;; + LDC) + debugFlag="-d-debug" + ;; + esac + DCFLAGS+=" ${debugFlag}" + fi + + emake DFLAGS="${DCFLAGS}" +} + +d_src_test() { + # We can specify user flags in (DMD|LDC|GDC)_TEST_FLAGS + local flagName + case "${DLANG_VENDOR}" in + DigitalMars) + flagName=DMD + ;; + GNU) + flagName=GDC + ;; + LDC) + flagName=LDC + ;; + esac + flagName="${flagName}_TEST_FLAGS" + + emake test "${flagName}=${DCFLAGS}" +} + +d_src_install() { + dobin bin/dscanner + dodoc README.md LICENSE_1_0.txt +} + +move_git_submodules() { + # Move all submodule dependencies into the appropriate folders. + # They have to be moved from ${WORKDIR}/${name}-${hash} to ${S}/${name} + local submodule submodules=( + "containers" "DCD" "inifiled" "libddoc" "libdparse" + ) + for submodule in "${submodules[@]}"; do + # make the name uppercase: inifiled -> INIFILED + local submodule_hash_var="${submodule^^}" + # and extract the hash + local submodule_hash="${!submodule_hash_var}" + + local submodule_directory="${WORKDIR}/${submodule}-${submodule_hash}" + + mv -T "${submodule_directory}" "${S}/${submodule}" \ + || die "Could not move submodule '${submodule}' to its subdirectory" + done +} diff --git a/dev-util/dscanner/files/0.15.2-makefile-fixes.patch b/dev-util/dscanner/files/0.15.2-makefile-fixes.patch new file mode 100644 index 0000000..6dfc29a --- /dev/null +++ b/dev-util/dscanner/files/0.15.2-makefile-fixes.patch @@ -0,0 +1,26 @@ +diff --git a/makefile b/makefile +index 243c450..7b1def6 100644 +--- a/makefile ++++ b/makefile +@@ -55,9 +55,9 @@ GDC_VERSIONS = + GDC_DEBUG_VERSIONS = -fversion=dparse_verbose + + DC_FLAGS += -Jbin +-override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR} +-override LDC_FLAGS += $(DFLAGS) -O5 -release -oq +-override GDC_FLAGS += $(DFLAGS) -O3 -frelease -fall-instantiations ++override DMD_FLAGS += $(DFLAGS) -od${OBJ_DIR} ++override LDC_FLAGS += $(DFLAGS) -oq ++override GDC_FLAGS += $(DFLAGS) -fall-instantiations + + override GDC_TEST_FLAGS += -fall-instantiations + +@@ -66,7 +66,7 @@ override DMD_TEST_FLAGS += -w + + DC_DEBUG_FLAGS := -g -Jbin + +-ifeq ($(DC), $(filter $(DC), dmd ldmd2 gdmd)) ++ifneq (,$(findstring dmd, $(DC))) + VERSIONS := $(DMD_VERSIONS) + DEBUG_VERSIONS := $(DMD_DEBUG_VERSIONS) + DC_FLAGS += $(DMD_FLAGS) diff --git a/dev-util/dscanner/metadata.xml b/dev-util/dscanner/metadata.xml index e27d4d3..0676456 100644 --- a/dev-util/dscanner/metadata.xml +++ b/dev-util/dscanner/metadata.xml @@ -1,3 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata/> +<pkgmetadata> + <upstream> + <remote-id type="github">dlang-community/D-Scanner</remote-id> + </upstream> +</pkgmetadata>
