commit: 8b33f89cdabe5a9eb583a9dfb8e1145f672ceb78 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Thu Jul 25 09:16:30 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Thu Jul 25 09:18:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8b33f89c
Revert "*/*: ExcessiveLineLength fix most of them" This reverts commit 79341e9f046f373509b9ab9d14ef711797d5bfa5. Signed-off-by: David Roman <davidroman96 <AT> gmail.com> app-admin/bitwarden-cli/bitwarden-cli-2024.2.1.ebuild | 5 ++--- app-crypt/autofirma/autofirma-1.8.3.ebuild | 2 +- .../configuradorfnmt/configuradorfnmt-1.0.1.ebuild | 4 +--- app-editors/pulsar-bin/pulsar-bin-1.118.0.ebuild | 5 ++--- app-misc/apidb/apidb-5.13.6_beta.ebuild | 7 +------ app-misc/apidb/apidb-5.8.0_beta.ebuild | 7 +------ dev-lang/opencilk/opencilk-1.1.ebuild | 8 +++----- dev-lang/opencilk/opencilk-2.1.ebuild | 8 +++----- dev-libs/StringiFor/StringiFor-1.1.4.ebuild | 4 +--- dev-python/auditok/auditok-0.1.5.ebuild | 2 +- dev-python/auditok/auditok-0.2.0-r1.ebuild | 2 +- .../DirectXShaderCompiler-1.7.2207-r1.ebuild | 6 ++---- .../DirectXShaderCompiler-1.7.2212-r1.ebuild | 9 +++------ dev-zig/zls/zls-0.10.0-r1.ebuild | 9 ++++----- games-emulation/rpcs3/rpcs3-9999.ebuild | 19 +++++++++---------- .../source-han-serif/source-han-serif-2.001.ebuild | 10 ++++------ .../source-han-serif/source-han-serif-2.002.ebuild | 10 ++++------ net-dns/AdGuardHome/AdGuardHome-0.107.49.ebuild | 19 ++++--------------- net-dns/blocky/blocky-0.22.ebuild | 9 +-------- net-irc/thelounge/thelounge-4.4.3.ebuild | 5 ++--- .../frama-c-aorai/frama-c-aorai-23.1.ebuild | 7 +------ .../frama-c-callgraph/frama-c-callgraph-23.1.ebuild | 12 ++---------- .../frama-c-callgraph/frama-c-callgraph-24.0.ebuild | 12 ++---------- .../frama-c-callgraph/frama-c-callgraph-25.0.ebuild | 11 ++--------- .../frama-c-constant-folding-23.1.ebuild | 14 +++++--------- .../frama-c-constant-folding-24.0.ebuild | 12 +++++------- .../frama-c-constant-folding-25.0.ebuild | 12 +++++------- .../frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild | 7 +------ .../frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild | 6 +----- .../frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild | 6 +----- sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild | 12 +++++------- sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild | 12 +++++------- sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild | 12 +++++------- sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild | 12 +++++------- sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild | 12 +++++------- sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild | 12 +++++------- .../frama-c-impact/frama-c-impact-23.1.ebuild | 12 +++++------- .../frama-c-impact/frama-c-impact-24.0.ebuild | 12 +++++------- .../frama-c-impact/frama-c-impact-25.0.ebuild | 12 +++++------- .../frama-c-inout/frama-c-inout-23.1.ebuild | 12 +++++------- .../frama-c-inout/frama-c-inout-24.0.ebuild | 12 +++++------- .../frama-c-inout/frama-c-inout-25.0.ebuild | 12 +++++------- .../frama-c-metrics/frama-c-metrics-23.1.ebuild | 6 +----- .../frama-c-metrics/frama-c-metrics-24.0.ebuild | 6 +----- .../frama-c-metrics/frama-c-metrics-25.0.ebuild | 6 +----- .../frama-c-occurrence/frama-c-occurrence-23.1.ebuild | 6 +----- .../frama-c-occurrence/frama-c-occurrence-24.0.ebuild | 6 +----- .../frama-c-occurrence/frama-c-occurrence-25.0.ebuild | 6 +----- 48 files changed, 141 insertions(+), 288 deletions(-) diff --git a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.1.ebuild b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.1.ebuild index 0f35e7dda..ec43c4616 100644 --- a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.1.ebuild +++ b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.1.ebuild @@ -9,11 +9,10 @@ DESCRIPTION="CLI frontend client connects to Bitwarden comapatible password mana HOMEPAGE="https://github.com/bitwarden/clients/tree/main/apps/cli"; BW_CLIENTS_COMMIT="82998d8" -distfiles=https://github.com/rahilarious/gentoo-distfiles/releases/download/ SRC_URI=" https://github.com/bitwarden/clients/archive/refs/tags/cli-v${PV}.tar.gz -> ${P}.tar.gz - ${distfiles}bitwarden-clients-${BW_CLIENTS_COMMIT}/deps.tar.xz -> bitwarden-clients-${BW_CLIENTS_COMMIT}.tar.xz - ${distfiles}${PN}-2024.2.0/pkg-cache.tar.xz -> ${PN}-2024.2.0-pkg-cache.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/bitwarden-clients-${BW_CLIENTS_COMMIT}/deps.tar.xz -> bitwarden-clients-${BW_CLIENTS_COMMIT}.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-2024.2.0/pkg-cache.tar.xz -> ${PN}-2024.2.0-pkg-cache.tar.xz " S="${WORKDIR}/clients-cli-v${PV}" diff --git a/app-crypt/autofirma/autofirma-1.8.3.ebuild b/app-crypt/autofirma/autofirma-1.8.3.ebuild index 327d3d7d2..2b82b2135 100644 --- a/app-crypt/autofirma/autofirma-1.8.3.ebuild +++ b/app-crypt/autofirma/autofirma-1.8.3.ebuild @@ -11,7 +11,7 @@ HOMEPAGE=" https://github.com/ctt-gob-es/clienteafirma " -# Upstream blocks wget with no User Agent. It can be addressed globally, see https://wiki.gentoo.org/wiki/FETCHCOMMAND. +# Upstream blocks wget with no User Agent. It can be addressed globally (see https://wiki.gentoo.org/wiki/FETCHCOMMAND). # If Gentoo's default configuration is in place, pkg_pretend() and pkg_nofetch() provide fallback options. SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${PF}.zip" diff --git a/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild b/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild index d91dff27c..82d5ded55 100644 --- a/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild +++ b/app-crypt/configuradorfnmt/configuradorfnmt-1.0.1.ebuild @@ -22,7 +22,5 @@ src_install() { java-pkg_dojar "usr/lib64/${PN}/${PN}.jar" java-pkg_dolauncher doicon "usr/lib64/${PN}/${PN}.png" - - make_desktop_entry "${PN} %u" "Configurador FNMT" "${PN}" "Utility" "Comment[es]=Generador de certificados de la FNMT -MimeType=x-scheme-handler/fnmtcr" + make_desktop_entry "${PN} %u" "Configurador FNMT" "${PN}" "Utility" "Comment[es]=Generador de certificados de la FNMT\nMimeType=x-scheme-handler/fnmtcr" } diff --git a/app-editors/pulsar-bin/pulsar-bin-1.118.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.118.0.ebuild index ed8a180fb..3802a88a3 100644 --- a/app-editors/pulsar-bin/pulsar-bin-1.118.0.ebuild +++ b/app-editors/pulsar-bin/pulsar-bin-1.118.0.ebuild @@ -8,10 +8,9 @@ inherit desktop xdg DESCRIPTION="A Community-led Hyper-Hackable Text Editor" HOMEPAGE="https://pulsar-edit.dev/"; -ur=https://github.com/pulsar-edit/pulsar/releases/download SRC_URI=" - amd64? ( ${ur}/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}-amd64.tar.gz ) - arm64? ( ${ur}/v${PV}/ARM.Linux.pulsar-${PV}-arm64.tar.gz -> ${P}-arm64.tar.gz ) + amd64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}-amd64.tar.gz ) + arm64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/ARM.Linux.pulsar-${PV}-arm64.tar.gz -> ${P}-arm64.tar.gz ) " S="${WORKDIR}/pulsar-${PV}" diff --git a/app-misc/apidb/apidb-5.13.6_beta.ebuild b/app-misc/apidb/apidb-5.13.6_beta.ebuild index 57587040f..f068f7a67 100644 --- a/app-misc/apidb/apidb-5.13.6_beta.ebuild +++ b/app-misc/apidb/apidb-5.13.6_beta.ebuild @@ -75,11 +75,6 @@ src_configure() { if use gtk ;then APIDBINSTALL="$APIDBINSTALL;GTK3" fi - local mycmakeargs=( - -DAPIDB_VERSION_STAGE=alpha - -DPLATFORM=LINUX_GENTOO - -DAPIDBBUILD=$APIDBBUILD - -DAPIDBINSTALL=$APIDBINSTALL - ) + local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL) cmake_src_configure } diff --git a/app-misc/apidb/apidb-5.8.0_beta.ebuild b/app-misc/apidb/apidb-5.8.0_beta.ebuild index 72dfe15d9..193ef6e22 100644 --- a/app-misc/apidb/apidb-5.8.0_beta.ebuild +++ b/app-misc/apidb/apidb-5.8.0_beta.ebuild @@ -70,11 +70,6 @@ src_configure() { if use gtk ;then APIDBINSTALL="$APIDBINSTALL;GTK3" fi - local mycmakeargs=( - -DAPIDB_VERSION_STAGE=alpha - -DPLATFORM=LINUX_GENTOO - -DAPIDBBUILD=$APIDBBUILD - -DAPIDBINSTALL=$APIDBINSTALL - ) + local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL) cmake_src_configure } diff --git a/dev-lang/opencilk/opencilk-1.1.ebuild b/dev-lang/opencilk/opencilk-1.1.ebuild index e80f7cd3d..b27f5cb59 100644 --- a/dev-lang/opencilk/opencilk-1.1.ebuild +++ b/dev-lang/opencilk/opencilk-1.1.ebuild @@ -9,12 +9,10 @@ MY_POSTFIX="${PN}-v${PV}" DESCRIPTION="The OpenCilk concurrency platform for parallel programming" HOMEPAGE="https://opencilk.org/"; - -p=https://github.com/OpenCilk SRC_URI=" - ${p}/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-project-${PV}.tar.gz - ${p}/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-cheetah-${PV}.tar.gz - ${p}/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-productivity-tools-${PV}.tar.gz + https://github.com/OpenCilk/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-project-${PV}.tar.gz + https://github.com/OpenCilk/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-cheetah-${PV}.tar.gz + https://github.com/OpenCilk/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-productivity-tools-${PV}.tar.gz " S="${WORKDIR}/${PN}-project-${MY_POSTFIX}" diff --git a/dev-lang/opencilk/opencilk-2.1.ebuild b/dev-lang/opencilk/opencilk-2.1.ebuild index 3ae9826a4..9a8159298 100644 --- a/dev-lang/opencilk/opencilk-2.1.ebuild +++ b/dev-lang/opencilk/opencilk-2.1.ebuild @@ -9,12 +9,10 @@ MY_POSTFIX="${PN}-v${PV}" DESCRIPTION="The OpenCilk concurrency platform for parallel programming" HOMEPAGE="https://opencilk.org/"; - -p=https://github.com/OpenCilk SRC_URI=" - ${p}/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-project-${PV}.tar.gz - ${p}/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-cheetah-${PV}.tar.gz - ${p}/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-productivity-tools-${PV}.tar.gz + https://github.com/OpenCilk/opencilk-project/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-project-${PV}.tar.gz + https://github.com/OpenCilk/cheetah/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-cheetah-${PV}.tar.gz + https://github.com/OpenCilk/productivity-tools/archive/refs/tags/opencilk/v${PV}.tar.gz -> ${PN}-productivity-tools-${PV}.tar.gz " S="${WORKDIR}/${PN}-project-${MY_POSTFIX}" diff --git a/dev-libs/StringiFor/StringiFor-1.1.4.ebuild b/dev-libs/StringiFor/StringiFor-1.1.4.ebuild index 55f3ab069..6373db809 100644 --- a/dev-libs/StringiFor/StringiFor-1.1.4.ebuild +++ b/dev-libs/StringiFor/StringiFor-1.1.4.ebuild @@ -64,9 +64,7 @@ src_prepare() { src_compile() { ${EPYTHON} FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED} || die - use static-libs && { - ${EPYTHON} FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC} || die; - } + use static-libs && { ${EPYTHON} FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC} || die; } } src_test() { diff --git a/dev-python/auditok/auditok-0.1.5.ebuild b/dev-python/auditok/auditok-0.1.5.ebuild index 27c48550b..c1b04c9a3 100644 --- a/dev-python/auditok/auditok-0.1.5.ebuild +++ b/dev-python/auditok/auditok-0.1.5.ebuild @@ -31,7 +31,7 @@ python_test() { } pkg_postinst() { - optfeature "reading audio in popular audio formats (ogg, mp3, etc.) or extracting from a video" dev-python/pydub + optfeature "reading audio files in popular audio formats (ogg, mp3, etc.) or extracting audio from a video file" dev-python/pydub optfeature "reading audio data from the microphone and playing audio back" dev-python/pyaudio optfeature "plotting audio signal and detections" dev-python/matplotlib optfeature "matplotlib. Also used for some math operations instead of standard python if available" dev-python/numpy diff --git a/dev-python/auditok/auditok-0.2.0-r1.ebuild b/dev-python/auditok/auditok-0.2.0-r1.ebuild index 17fb9ab65..7203619b4 100644 --- a/dev-python/auditok/auditok-0.2.0-r1.ebuild +++ b/dev-python/auditok/auditok-0.2.0-r1.ebuild @@ -38,7 +38,7 @@ python_test() { } pkg_postinst() { - optfeature "reading audio in popular formats (ogg, mp3, etc.) or extracting from a video" dev-python/pydub + optfeature "reading audio files in popular audio formats (ogg, mp3, etc.) or extracting audio from a video file" dev-python/pydub optfeature "reading audio data from the microphone and playing audio back" dev-python/pyaudio optfeature "showing progress bar while playing audio clips" dev-python/tqdm optfeature "plotting audio signal and detections" dev-python/matplotlib diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild index 6d4c23d92..dab40c6d8 100644 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild +++ b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild @@ -12,10 +12,8 @@ HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler"; SPIRV_HEADERS_COMMIT_MAGIC="0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" SPIRV_TOOLS_COMMIT_MAGIC="71b2aee6c868a673ec82d1385f97593aa2881316" SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> - DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> - DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz" +https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz +https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" SLOT="0" diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild index c5dadc64b..42f1100fa 100644 --- a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild +++ b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2212-r1.ebuild @@ -13,12 +13,9 @@ SPIRV_HEADERS_COMMIT_MAGIC="d13b52222c39a7e9a401b44646f0ca3a640fbd47" SPIRV_TOOLS_COMMIT_MAGIC="f36a8d47f738cc612c7dd89f145a15465ab437cd" DIRECTX_HEADERS_COMMIT_MAGIC="980971e835876dc0cde415e8f9bc646e64667bf7" SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> - DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> - DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> - DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz" +https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz +https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz +https://github.com/microsoft/DirectX-Headers/archive/${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-directxheaders-${DIRECTX_HEADERS_COMMIT_MAGIC}.tar.gz" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" SLOT="0" diff --git a/dev-zig/zls/zls-0.10.0-r1.ebuild b/dev-zig/zls/zls-0.10.0-r1.ebuild index 58a1e18c8..da659404c 100644 --- a/dev-zig/zls/zls-0.10.0-r1.ebuild +++ b/dev-zig/zls/zls-0.10.0-r1.ebuild @@ -6,15 +6,14 @@ EAPI=8 inherit edo DESCRIPTION="The officially unofficial Ziglang language server" -g="https://github.com"; -HOMEPAGE="${p}/zigtools/zls" +HOMEPAGE="https://github.com/zigtools/zls"; KNOWN_FOLDERS_COMMIT="24845b0103e611c108d6bc334231c464e699742c" TRACY_COMMIT="f493d4aa8ba8141d9680473fad007d8a6348628e" SRC_URI=" - ${g}/ziglibs/known-folders/archive/${KNOWN_FOLDERS_COMMIT}.tar.gz -> known-folders-${KNOWN_FOLDERS_COMMIT}.tar.gz - ${p}/wolfpld/tracy/archive/${TRACY_COMMIT}.tar.gz -> tracy-${TRACY_COMMIT}.tar.gz - ${p}/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz + https://github.com/ziglibs/known-folders/archive/${KNOWN_FOLDERS_COMMIT}.tar.gz -> known-folders-${KNOWN_FOLDERS_COMMIT}.tar.gz + https://github.com/wolfpld/tracy/archive/${TRACY_COMMIT}.tar.gz -> tracy-${TRACY_COMMIT}.tar.gz + https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz " LICENSE="MIT" diff --git a/games-emulation/rpcs3/rpcs3-9999.ebuild b/games-emulation/rpcs3/rpcs3-9999.ebuild index b04d7f509..8e9ac66c7 100644 --- a/games-emulation/rpcs3/rpcs3-9999.ebuild +++ b/games-emulation/rpcs3/rpcs3-9999.ebuild @@ -15,9 +15,8 @@ YAMLCPP_COMMIT="456c68f452da09d8ca84b375faa2b1397713eaba" DESCRIPTION="PS3 emulator/debugger" HOMEPAGE="https://rpcs3.net/"; -g="https://github.com"; if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="${g}/RPCS3/rpcs3" + EGIT_REPO_URI="https://github.com/RPCS3/rpcs3"; EGIT_SUBMODULES=( 'asmjit' '3rdparty/glslang' '3rdparty/miniupnp/miniupnp' '3rdparty/rtmidi/rtmidi' '3rdparty/wolfssl' '3rdparty/SoundTouch/soundtouch' '3rdparty/zstd/zstd' '3rdparty/stblib/stb' '3rdparty/OpenAL/openal-soft' @@ -27,14 +26,14 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI=" - ${g}/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${g}/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz - ${g}/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz - ${g}/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz - ${g}/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz - ${g}/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz - ${g}/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz - ${g}/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz + https://github.com/RPCS3/rpcs3/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/asmjit/asmjit/archive/${ASMJIT_COMMIT}.tar.gz -> ${PN}-asmjit-${ASMJIT_COMMIT}.tar.gz + https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz -> ${PN}-glslang-${GLSLANG_COMMIT}.tar.gz + https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_COMMIT}.tar.gz -> ${PN}-miniupnp-${MINIUPNP_COMMIT}.tar.gz + https://github.com/thestk/rtmidi/archive/${RTMIDI_COMMIT}.tar.gz -> ${PN}-rtmidi-${RTMIDI_COMMIT}.tar.gz + https://github.com/wolfSSL/wolfssl/archive/${WOLFSSL_COMMIT}.tar.gz -> ${PN}-wolfssl-${WOLFSSL_COMMIT}.tar.gz + https://github.com/RPCS3/soundtouch/archive/${SOUNDTOUCH_COMMIT}.tar.gz -> ${PN}-soundtouch-${SOUNDTOUCH_COMMIT}.tar.gz + https://github.com/RPCS3/yaml-cpp/archive/${YAMLCPP_COMMIT}.tar.gz -> ${PN}-yaml-cpp-${SOUNDTOUCH_COMMIT}-.tar.gz " KEYWORDS="~amd64" fi diff --git a/media-fonts/source-han-serif/source-han-serif-2.001.ebuild b/media-fonts/source-han-serif/source-han-serif-2.001.ebuild index 2e0765cf5..db5455711 100644 --- a/media-fonts/source-han-serif/source-han-serif-2.001.ebuild +++ b/media-fonts/source-han-serif/source-han-serif-2.001.ebuild @@ -10,13 +10,11 @@ inherit font DESCRIPTION="Pan-CJK OpenType/CFF font family" HOMEPAGE="https://github.com/adobe-fonts/source-han-serif/"; - -p="https://github.com/adobe-fonts"; SRC_URI=" - l10n_ja? ( ${p}/${PN}/releases/download/${PV}R/12_SourceHanSerifJP.zip -> ${PN}-ja-${PV}.zip ) - l10n_ko? ( ${p}/${PN}/releases/download/${PV}R/13_SourceHanSerifKR.zip -> ${PN}-ko-${PV}.zip ) - l10n_zh-CN? ( ${p}/${PN}/releases/download/${PV}R/14_SourceHanSerifCN.zip -> ${PN}-zh_CN-${PV}.zip ) - l10n_zh-TW? ( ${p}/${PN}/releases/download/${PV}R/15_SourceHanSerifTW.zip -> ${PN}-zh_TW-${PV}.zip ) + l10n_ja? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/12_SourceHanSerifJP.zip -> ${PN}-ja-${PV}.zip ) + l10n_ko? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/13_SourceHanSerifKR.zip -> ${PN}-ko-${PV}.zip ) + l10n_zh-CN? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/14_SourceHanSerifCN.zip -> ${PN}-zh_CN-${PV}.zip ) + l10n_zh-TW? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/15_SourceHanSerifTW.zip -> ${PN}-zh_TW-${PV}.zip ) " S=${WORKDIR} diff --git a/media-fonts/source-han-serif/source-han-serif-2.002.ebuild b/media-fonts/source-han-serif/source-han-serif-2.002.ebuild index 09619c098..52911fafd 100644 --- a/media-fonts/source-han-serif/source-han-serif-2.002.ebuild +++ b/media-fonts/source-han-serif/source-han-serif-2.002.ebuild @@ -10,13 +10,11 @@ inherit font DESCRIPTION="Pan-CJK OpenType/CFF font family" HOMEPAGE="https://github.com/adobe-fonts/source-han-serif/"; - -g="https://github.com/adobe-fonts"; SRC_URI=" - l10n_ja? ( ${g}/${PN}/releases/download/${PV}R/12_SourceHanSerifJP.zip -> ${PN}-ja-${PV}.zip ) - l10n_ko? ( ${g}/${PN}/releases/download/${PV}R/13_SourceHanSerifKR.zip -> ${PN}-ko-${PV}.zip ) - l10n_zh-CN? ( ${g}/${PN}/releases/download/${PV}R/14_SourceHanSerifCN.zip -> ${PN}-zh_CN-${PV}.zip ) - l10n_zh-TW? ( ${g}/${PN}/releases/download/${PV}R/15_SourceHanSerifTW.zip -> ${PN}-zh_TW-${PV}.zip ) + l10n_ja? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/12_SourceHanSerifJP.zip -> ${PN}-ja-${PV}.zip ) + l10n_ko? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/13_SourceHanSerifKR.zip -> ${PN}-ko-${PV}.zip ) + l10n_zh-CN? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/14_SourceHanSerifCN.zip -> ${PN}-zh_CN-${PV}.zip ) + l10n_zh-TW? ( https://github.com/adobe-fonts/${PN}/releases/download/${PV}R/15_SourceHanSerifTW.zip -> ${PN}-zh_TW-${PV}.zip ) " S=${WORKDIR} diff --git a/net-dns/AdGuardHome/AdGuardHome-0.107.49.ebuild b/net-dns/AdGuardHome/AdGuardHome-0.107.49.ebuild index 6e408cc73..698ff424f 100644 --- a/net-dns/AdGuardHome/AdGuardHome-0.107.49.ebuild +++ b/net-dns/AdGuardHome/AdGuardHome-0.107.49.ebuild @@ -9,13 +9,11 @@ DESCRIPTION="Network-wide ads & trackers blocking DNS server like Pi-Hole with w HOMEPAGE="https://github.com/AdguardTeam/AdGuardHome/"; WIKI_COMMIT="3b27176" - -dist="https://github.com/rahilarious/gentoo-distfiles"; SRC_URI=" https://github.com/AdguardTeam/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - ${dist}/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz - ${dist}/releases/download/${P}/wiki.tar.xz -> ${PN}-wiki-${WIKI_COMMIT}.tar.xz - web? ( ${dist}/releases/download/${P}/npm-deps.tar.xz -> ${P}-npm-deps.tar.xz ) + https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz + https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/wiki.tar.xz -> ${PN}-wiki-${WIKI_COMMIT}.tar.xz + web? ( https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/npm-deps.tar.xz -> ${P}-npm-deps.tar.xz ) " # main @@ -65,16 +63,7 @@ src_prepare() { if use web; then # mimicking `make js-deps` export npm_config_cache="${WORKDIR}/npm-cache" NODE_OPTIONS=--openssl-legacy-provider || die - npm \ - --verbose \ - --offline \ - --prefix client/ \ - --no-progress \ - --ignore-engines \ - --ignore-optional \ - --ignore-platform \ - --ignore-scripts ci \ - || die + npm --verbose --offline --prefix client/ --no-progress --ignore-engines --ignore-optional --ignore-platform --ignore-scripts ci || die fi } diff --git a/net-dns/blocky/blocky-0.22.ebuild b/net-dns/blocky/blocky-0.22.ebuild index df35da576..5b601c882 100644 --- a/net-dns/blocky/blocky-0.22.ebuild +++ b/net-dns/blocky/blocky-0.22.ebuild @@ -72,14 +72,7 @@ src_compile() { src_test() { # mimcking make test - ego run github.com/onsi/ginkgo/v2/ginkgo \ - --label-filter="!e2e" \ - --coverprofile=coverage.txt \ - --covermode=atomic \ - --cover \ - -r \ - -p - + ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic --cover -r -p ego tool cover -html coverage.txt -o coverage.html } diff --git a/net-irc/thelounge/thelounge-4.4.3.ebuild b/net-irc/thelounge/thelounge-4.4.3.ebuild index 852709237..cee63295e 100644 --- a/net-irc/thelounge/thelounge-4.4.3.ebuild +++ b/net-irc/thelounge/thelounge-4.4.3.ebuild @@ -10,11 +10,10 @@ inherit python-any-r1 readme.gentoo-r1 systemd tmpfiles DESCRIPTION="Modern, responsive, cross-platform, self-hosted web IRC client" HOMEPAGE="https://thelounge.chat/"; -dist="https://github.com/rahilarious/gentoo-distfiles"; SRC_URI=" https://github.com/thelounge/thelounge/archive/refs/tags/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz - ${dist}/releases/download/${PN}-4.4.2_rc1/deps.tar.xz -> ${PN}-4.4.2_rc1-deps.tar.xz - sqlite? ( ${dist}/releases/download/${PN}-4.4.2_rc1/sqlite.tar.xz -> ${PN}-4.4.2_rc1-sqlite.tar.xz ) + https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-4.4.2_rc1/deps.tar.xz -> ${PN}-4.4.2_rc1-deps.tar.xz + sqlite? ( https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-4.4.2_rc1/sqlite.tar.xz -> ${PN}-4.4.2_rc1-sqlite.tar.xz ) " S="${WORKDIR}/${PN}-${PV/_rc/-rc.}" diff --git a/sci-mathematics/frama-c-aorai/frama-c-aorai-23.1.ebuild b/sci-mathematics/frama-c-aorai/frama-c-aorai-23.1.ebuild index 461536320..bcc6251c7 100644 --- a/sci-mathematics/frama-c-aorai/frama-c-aorai-23.1.ebuild +++ b/sci-mathematics/frama-c-aorai/frama-c-aorai-23.1.ebuild @@ -41,10 +41,5 @@ src_compile() { } src_install() { - emake \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - ENABLE_EVA="${ENABLE_EVA}" \ - DESTDIR="${ED}" \ - install + emake FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" ENABLE_EVA="${ENABLE_EVA}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-23.1.ebuild b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-23.1.ebuild index 05f94d403..34d6e414a 100644 --- a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-23.1.ebuild +++ b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-23.1.ebuild @@ -49,17 +49,9 @@ src_configure() { src_compile() { tc-export AR use gtk && emake src/plugins/callgraph/cg_viewer.ml - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" } src_install() { - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" \ - DESTDIR="${ED}" - install + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-24.0.ebuild b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-24.0.ebuild index c9af6aaad..715aec3e0 100644 --- a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-24.0.ebuild +++ b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-24.0.ebuild @@ -49,17 +49,9 @@ src_configure() { src_compile() { tc-export AR use gtk && emake src/plugins/callgraph/cg_viewer.ml - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" } src_install() { - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" \ - DESTDIR="${ED}" - install + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-25.0.ebuild b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-25.0.ebuild index 231d431df..fb83c78b1 100644 --- a/sci-mathematics/frama-c-callgraph/frama-c-callgraph-25.0.ebuild +++ b/sci-mathematics/frama-c-callgraph/frama-c-callgraph-25.0.ebuild @@ -48,16 +48,9 @@ src_configure() { src_compile() { use gtk && emake src/plugins/callgraph/cg_viewer.ml - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" } src_install() { - emake -f src/plugins/callgraph/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - HAS_DGRAPH="${HAS_DGRAPH}" \ - DESTDIR="${ED}" install + emake -f src/plugins/callgraph/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" HAS_DGRAPH="${HAS_DGRAPH}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-23.1.ebuild b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-23.1.ebuild index 537939af7..fac225c18 100644 --- a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-23.1.ebuild +++ b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-23.1.ebuild @@ -22,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/constant_propagation/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -41,11 +39,9 @@ src_configure() { --enable-eva \ --enable-callgraph \ --enable-server - - - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/constant_propagation/Makefile || die + sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/constant_propagation/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/constant_propagation/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" export ENABLE_EVA=yes @@ -55,9 +51,9 @@ src_configure() { src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-24.0.ebuild b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-24.0.ebuild index 346b52c56..5f3078343 100644 --- a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-24.0.ebuild +++ b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-24.0.ebuild @@ -22,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/constant_propagation/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -41,9 +39,9 @@ src_configure() { --enable-eva \ --enable-callgraph \ --enable-server - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/constant_propagation/Makefile || die + sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/constant_propagation/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/constant_propagation/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" export ENABLE_EVA=yes @@ -53,9 +51,9 @@ src_configure() { src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-25.0.ebuild b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-25.0.ebuild index ef5204deb..47760202b 100644 --- a/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-25.0.ebuild +++ b/sci-mathematics/frama-c-constant-folding/frama-c-constant-folding-25.0.ebuild @@ -22,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/constant_propagation/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -40,9 +38,9 @@ src_configure() { --enable-semantic-constant-folding \ --enable-eva \ --enable-server - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/constant_propagation/Makefile || die + sed -e '/^# *Constant propagation/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/constant_propagation/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/constant_propagation/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" export ENABLE_EVA=yes @@ -50,9 +48,9 @@ src_configure() { } src_compile() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/constant_propagation/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild index 04e7de431..a54789d18 100644 --- a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild +++ b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild @@ -43,10 +43,5 @@ src_compile() { src_install() { export EACSL_INSTALL_LIB_DIR="${ED}/usr/$(get_libdir)/frama-c/e-acsl" - emake \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" \ - install + emake FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" install } diff --git a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild index 7994cc630..40bdfacc3 100644 --- a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild +++ b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild @@ -43,9 +43,5 @@ src_compile() { src_install() { export EACSL_INSTALL_LIB_DIR="${ED}/usr/$(get_libdir)/frama-c/e-acsl" - emake FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" \ - install + emake FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" install } diff --git a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild index 694812f33..b88ba88ed 100644 --- a/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild +++ b/sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild @@ -43,9 +43,5 @@ src_compile() { src_install() { export EACSL_INSTALL_LIB_DIR="${ED}/usr/$(get_libdir)/frama-c/e-acsl" - emake FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" \ - install + emake FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" EACSL_INSTALL_LIB_DIR="${EACSL_INSTALL_LIB_DIR}" install } diff --git a/sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild b/sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild index 1a665f2fe..085313df5 100644 --- a/sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild +++ b/sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild @@ -28,8 +28,6 @@ DEPEND="${RDEPEND}" # But it is not needed for compilation, and would introduce a mutual dependency PDEPEND="~sci-mathematics/frama-c-scope-${PV}:=[ocamlopt?]" -p="src/plugins/value/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -46,18 +44,18 @@ src_configure() { --enable-callgraph \ --enable-server \ --enable-eva - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/value/Makefile || die + sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/value/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/value/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild b/sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild index 303c58a5a..0769c4f19 100644 --- a/sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild +++ b/sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild @@ -28,8 +28,6 @@ DEPEND="${RDEPEND}" # But it is not needed for compilation, and would introduce a mutual dependency PDEPEND="~sci-mathematics/frama-c-scope-${PV}:=[ocamlopt?]" -p="src/plugins/value/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -46,18 +44,18 @@ src_configure() { --enable-callgraph \ --enable-server \ --enable-eva - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/value/Makefile || die + sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/value/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/value/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild b/sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild index d1afd7312..602ab45cd 100644 --- a/sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild +++ b/sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild @@ -22,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/value/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -39,17 +37,17 @@ src_configure() { $(use_enable gtk gui) \ --enable-server \ --enable-eva - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/value/Makefile || die + sed -e '/^# *Evolved Value Analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/value/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/value/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/value/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild b/sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild index c7fb283f1..7456d1285 100644 --- a/sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild +++ b/sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/from/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -44,18 +42,18 @@ src_configure() { --enable-eva \ --enable-server \ --enable-postdominators - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/from/Makefile || die + sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/from/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/from/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild b/sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild index b0b6f6873..4596bf8d5 100644 --- a/sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild +++ b/sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/from/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -44,18 +42,18 @@ src_configure() { --enable-eva \ --enable-server \ --enable-postdominators - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/from/Makefile || die + sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/from/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/from/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild b/sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild index def98b5eb..479044a32 100644 --- a/sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild +++ b/sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/from/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -44,17 +42,17 @@ src_configure() { --enable-eva \ --enable-server \ --enable-postdominators - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/from/Makefile || die + sed -e '/^# *From analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/from/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/from/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/from/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-impact/frama-c-impact-23.1.ebuild b/sci-mathematics/frama-c-impact/frama-c-impact-23.1.ebuild index 592232ea8..9084eac33 100644 --- a/sci-mathematics/frama-c-impact/frama-c-impact-23.1.ebuild +++ b/sci-mathematics/frama-c-impact/frama-c-impact-23.1.ebuild @@ -25,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/impact/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -51,18 +49,18 @@ src_configure() { --enable-pdg \ --enable-sparecode \ --enable-users - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/impact/Makefile || die + sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/impact/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/impact/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-impact/frama-c-impact-24.0.ebuild b/sci-mathematics/frama-c-impact/frama-c-impact-24.0.ebuild index 845843be0..d68a5285c 100644 --- a/sci-mathematics/frama-c-impact/frama-c-impact-24.0.ebuild +++ b/sci-mathematics/frama-c-impact/frama-c-impact-24.0.ebuild @@ -25,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/impact/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -51,18 +49,18 @@ src_configure() { --enable-pdg \ --enable-sparecode \ --enable-users - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/impact/Makefile || die + sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/impact/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/impact/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-impact/frama-c-impact-25.0.ebuild b/sci-mathematics/frama-c-impact/frama-c-impact-25.0.ebuild index 3189af6e6..cd3a4b91e 100644 --- a/sci-mathematics/frama-c-impact/frama-c-impact-25.0.ebuild +++ b/sci-mathematics/frama-c-impact/frama-c-impact-25.0.ebuild @@ -25,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/impact/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -51,17 +49,17 @@ src_configure() { --enable-pdg \ --enable-sparecode \ --enable-users - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/impact/Makefile || die + sed -e '/^# *Impact analysis/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/impact/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/impact/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/impact/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-inout/frama-c-inout-23.1.ebuild b/sci-mathematics/frama-c-inout/frama-c-inout-23.1.ebuild index 721bd27e0..e556dddc5 100644 --- a/sci-mathematics/frama-c-inout/frama-c-inout-23.1.ebuild +++ b/sci-mathematics/frama-c-inout/frama-c-inout-23.1.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/inout/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -44,18 +42,18 @@ src_configure() { --enable-callgraph \ --enable-eva \ --enable-server - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/inout/Makefile || die + sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/inout/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/inout/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-inout/frama-c-inout-24.0.ebuild b/sci-mathematics/frama-c-inout/frama-c-inout-24.0.ebuild index 003e46ebd..297c2c4fc 100644 --- a/sci-mathematics/frama-c-inout/frama-c-inout-24.0.ebuild +++ b/sci-mathematics/frama-c-inout/frama-c-inout-24.0.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/inout/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -44,18 +42,18 @@ src_configure() { --enable-callgraph \ --enable-eva \ --enable-server - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/inout/Makefile || die + sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/inout/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/inout/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { tc-export AR - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-inout/frama-c-inout-25.0.ebuild b/sci-mathematics/frama-c-inout/frama-c-inout-25.0.ebuild index aa5c41ae4..7b836b6c6 100644 --- a/sci-mathematics/frama-c-inout/frama-c-inout-25.0.ebuild +++ b/sci-mathematics/frama-c-inout/frama-c-inout-25.0.ebuild @@ -24,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -p="src/plugins/inout/Makefile" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die @@ -45,17 +43,17 @@ src_configure() { --enable-callgraph \ --enable-eva \ --enable-server - printf 'include share/Makefile.config\n' > ${p} || die - sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> ${p} || die - printf 'include share/Makefile.dynamic\n' >> ${p} || die + printf 'include share/Makefile.config\n' > src/plugins/inout/Makefile || die + sed -e '/^# *inout/bl;d' -e ':l' -e '/^\$(eval/Q;n;bl' < Makefile >> src/plugins/inout/Makefile || die + printf 'include share/Makefile.dynamic\n' >> src/plugins/inout/Makefile || die export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" } src_compile() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" } src_install() { - emake -f ${p} FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install + emake -f src/plugins/inout/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-metrics/frama-c-metrics-23.1.ebuild b/sci-mathematics/frama-c-metrics/frama-c-metrics-23.1.ebuild index 179a0ab7e..feacafd82 100644 --- a/sci-mathematics/frama-c-metrics/frama-c-metrics-23.1.ebuild +++ b/sci-mathematics/frama-c-metrics/frama-c-metrics-23.1.ebuild @@ -52,9 +52,5 @@ src_compile() { } src_install() { - emake -f src/plugins/metrics/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/metrics/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-metrics/frama-c-metrics-24.0.ebuild b/sci-mathematics/frama-c-metrics/frama-c-metrics-24.0.ebuild index 350a92be2..ed4026208 100644 --- a/sci-mathematics/frama-c-metrics/frama-c-metrics-24.0.ebuild +++ b/sci-mathematics/frama-c-metrics/frama-c-metrics-24.0.ebuild @@ -52,9 +52,5 @@ src_compile() { } src_install() { - emake -f src/plugins/metrics/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/metrics/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-metrics/frama-c-metrics-25.0.ebuild b/sci-mathematics/frama-c-metrics/frama-c-metrics-25.0.ebuild index 0f3d218c3..f8ba14fed 100644 --- a/sci-mathematics/frama-c-metrics/frama-c-metrics-25.0.ebuild +++ b/sci-mathematics/frama-c-metrics/frama-c-metrics-25.0.ebuild @@ -51,9 +51,5 @@ src_compile() { } src_install() { - emake -f src/plugins/metrics/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/metrics/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-23.1.ebuild b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-23.1.ebuild index 629a5e685..460b24533 100644 --- a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-23.1.ebuild +++ b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-23.1.ebuild @@ -52,9 +52,5 @@ src_compile() { } src_install() { - emake -f src/plugins/occurrence/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/occurrence/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-24.0.ebuild b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-24.0.ebuild index 88e6ad807..c3efc55f6 100644 --- a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-24.0.ebuild +++ b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-24.0.ebuild @@ -52,9 +52,5 @@ src_compile() { } src_install() { - emake -f src/plugins/occurrence/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/occurrence/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install } diff --git a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-25.0.ebuild b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-25.0.ebuild index 174b5f71d..65bd705b0 100644 --- a/sci-mathematics/frama-c-occurrence/frama-c-occurrence-25.0.ebuild +++ b/sci-mathematics/frama-c-occurrence/frama-c-occurrence-25.0.ebuild @@ -50,9 +50,5 @@ src_compile() { } src_install() { - emake -f src/plugins/occurrence/Makefile \ - FRAMAC_SHARE="${FRAMAC_SHARE}" \ - FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" \ - DESTDIR="${ED}" \ - install + emake -f src/plugins/occurrence/Makefile FRAMAC_SHARE="${FRAMAC_SHARE}" FRAMAC_LIBDIR="${FRAMAC_LIBDIR}" DESTDIR="${ED}" install }
