From b41084798596ef12a11d449cd55d3bdba5886738 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:15:04 +0200 Subject: [PATCH 01/36] sys-apps/hex: speed up cargo SRC_URI generation Signed-off-by: Lucio Sauer --- sys-apps/hex/hex-0.4.2.ebuild | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/sys-apps/hex/hex-0.4.2.ebuild b/sys-apps/hex/hex-0.4.2.ebuild index a17b1d1bfc..4b765bcc50 100644 --- a/sys-apps/hex/hex-0.4.2.ebuild +++ b/sys-apps/hex/hex-0.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Auto-Generated by cargo-ebuild 0.4.0 @@ -6,39 +6,40 @@ EAPI=8 CRATES=" - ansi_term-0.11.0 - ansi_term-0.12.1 - assert_cmd-1.0.1 - atty-0.2.11 - bitflags-1.0.4 - clap-2.33.3 - difference-2.0.0 - doc-comment-0.3.3 - libc-0.2.47 - no_color-0.1.0 - predicates-1.0.5 - predicates-core-1.0.0 - predicates-tree-1.0.0 - redox_syscall-0.1.50 - redox_termios-0.1.1 - strsim-0.8.0 - termion-1.5.1 - textwrap-0.11.0 - treeline-0.1.0 - unicode-width-0.1.5 - vec_map-0.8.1 - wait-timeout-0.2.0 - winapi-0.3.6 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-x86_64-pc-windows-gnu-0.4.0 + ansi_term@0.11.0 + ansi_term@0.12.1 + assert_cmd@1.0.1 + atty@0.2.11 + bitflags@1.0.4 + clap@2.33.3 + difference@2.0.0 + doc-comment@0.3.3 + libc@0.2.47 + no_color@0.1.0 + predicates@1.0.5 + predicates-core@1.0.0 + predicates-tree@1.0.0 + redox_syscall@0.1.50 + redox_termios@0.1.1 + strsim@0.8.0 + termion@1.5.1 + textwrap@0.11.0 + treeline@0.1.0 + unicode-width@0.1.5 + vec_map@0.8.1 + wait-timeout@0.2.0 + winapi@0.3.6 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 " inherit cargo DESCRIPTION="Futuristic take on hexdump" HOMEPAGE="https://github.com/sitkevij/hex" -SRC_URI="https://github.com/sitkevij/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" +SRC_URI="https://github.com/sitkevij/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" # Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored. RESTRICT="mirror" LICENSE="MIT" From 5a02060483df1909530d564a4b43659f012023d2 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:26:05 +0200 Subject: [PATCH 02/36] sys-apps/hex: remove incorrect RESTRICT=mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the PMS: > mirror > The package’s SRC_URI entries may not be mirrored, and > mirrors should not be checked when fetching. The crate dependencies may very well be mirrored, judging by their licenses. To fetch distfiles from their original locations immediately, set `GENTOO_MIRRORS=`. https://devmanual.gentoo.org/general-concepts/manifest/#generating-the-manifest Signed-off-by: Lucio Sauer --- sys-apps/hex/hex-0.4.2.ebuild | 2 -- sys-apps/hex/hex-0.5.0.ebuild | 4 +--- sys-apps/hex/hex-0.6.0.ebuild | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sys-apps/hex/hex-0.4.2.ebuild b/sys-apps/hex/hex-0.4.2.ebuild index 4b765bcc50..26b759365f 100644 --- a/sys-apps/hex/hex-0.4.2.ebuild +++ b/sys-apps/hex/hex-0.4.2.ebuild @@ -40,8 +40,6 @@ HOMEPAGE="https://github.com/sitkevij/hex" SRC_URI="https://github.com/sitkevij/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " -# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored. -RESTRICT="mirror" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/sys-apps/hex/hex-0.5.0.ebuild b/sys-apps/hex/hex-0.5.0.ebuild index 888db8eae7..381f4a390f 100644 --- a/sys-apps/hex/hex-0.5.0.ebuild +++ b/sys-apps/hex/hex-0.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Auto-Generated by cargo-ebuild 0.5.4-r1 @@ -74,8 +74,6 @@ DESCRIPTION="Futuristic take on hexdump" HOMEPAGE="https://github.com/sitkevij/hex" SRC_URI="https://github.com/sitkevij/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" ${CARGO_CRATE_URIS}" -# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored. -RESTRICT="mirror" LICENSE="Apache-2.0 MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/sys-apps/hex/hex-0.6.0.ebuild b/sys-apps/hex/hex-0.6.0.ebuild index 04ee5d2add..cf21b951a0 100644 --- a/sys-apps/hex/hex-0.6.0.ebuild +++ b/sys-apps/hex/hex-0.6.0.ebuild @@ -71,8 +71,6 @@ HOMEPAGE="https://github.com/sitkevij/hex" SRC_URI="https://github.com/sitkevij/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" ${CARGO_CRATE_URIS}" -# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored. -RESTRICT="mirror" LICENSE="Apache-2.0 MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64 ~x86" From 0ac3589eba0b6c853701f36905f726fda1a70977 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:16:16 -0400 Subject: [PATCH 03/36] dev-python/mobi: enable py3.12 Closes: https://bugs.gentoo.org/931382 Signed-off-by: Julien Roy --- dev-python/mobi/mobi-0.3.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/mobi/mobi-0.3.3.ebuild b/dev-python/mobi/mobi-0.3.3.ebuild index 7bf67a6d3f..a7db4c99ea 100644 --- a/dev-python/mobi/mobi-0.3.3.ebuild +++ b/dev-python/mobi/mobi-0.3.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=poetry inherit distutils-r1 From 890feb964539d55a3c0e9d290daacb9eee5d7f3e Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:28:28 -0400 Subject: [PATCH 04/36] games-fps/crispy-doom: enable py3.12, py3.13 Closes: https://bugs.gentoo.org/931450 Signed-off-by: Julien Roy --- games-fps/crispy-doom/crispy-doom-5.12.0.ebuild | 4 ++-- games-fps/crispy-doom/crispy-doom-6.0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild index d5d62b6326..60823967d7 100644 --- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild +++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10,11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools prefix python-any-r1 xdg diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild b/games-fps/crispy-doom/crispy-doom-6.0.ebuild index f132f01132..f4dfd01919 100644 --- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild +++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools prefix python-any-r1 xdg From 2a352a2193a35adf1b1176b3c07058e08000a450 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:30:02 -0400 Subject: [PATCH 05/36] dev-python/material-color-utilities: enable py3.12, py3.13 Closes: https://bugs.gentoo.org/931383 Signed-off-by: Julien Roy --- dev-python/material-color-utilities/Manifest | 2 +- .../material-color-utilities-0.1.5.ebuild | 10 ++++++---- .../material-color-utilities-9999.ebuild | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-python/material-color-utilities/Manifest b/dev-python/material-color-utilities/Manifest index 81cf2c70bf..5a202bca65 100644 --- a/dev-python/material-color-utilities/Manifest +++ b/dev-python/material-color-utilities/Manifest @@ -1 +1 @@ -DIST material-color-utilities-0.1.5.tar.gz 25702 BLAKE2B cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f SHA512 f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4 +DIST material-color-utilities-python-0.1.5.tar.gz 25702 BLAKE2B cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f SHA512 f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4 diff --git a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild index ac144e4502..d2000125b4 100644 --- a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild +++ b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild @@ -1,11 +1,14 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{10..11}) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=poetry -inherit distutils-r1 +PYPI_NO_NORMALIZE=1 +PYPI_PN="${PN}-python" + +inherit distutils-r1 pypi MY_PN="${PN}-python" MY_P="${MY_PN}-${PV}" @@ -19,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git" else - SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/${MY_P}" fi diff --git a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild index ac144e4502..bbc6793fa6 100644 --- a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild +++ b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild @@ -1,10 +1,11 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{10..11}) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=poetry + inherit distutils-r1 MY_PN="${PN}-python" @@ -19,7 +20,6 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git" else - SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/${MY_P}" fi From 7e3d569b858530ad23dfe207b24583b24922225c Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:34:16 -0400 Subject: [PATCH 06/36] games-util/chiaki: enable py3.12 Closes: https://bugs.gentoo.org/833313 Closes: https://bugs.gentoo.org/931452 Signed-off-by: Julien Roy --- games-util/chiaki/chiaki-2.1.1-r2.ebuild | 5 +++-- games-util/chiaki/chiaki-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/games-util/chiaki/chiaki-2.1.1-r2.ebuild b/games-util/chiaki/chiaki-2.1.1-r2.ebuild index 60fe2127ec..ed1a05c397 100644 --- a/games-util/chiaki/chiaki-2.1.1-r2.ebuild +++ b/games-util/chiaki/chiaki-2.1.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 xdg DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play" @@ -33,6 +33,7 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 + dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/libsdl2 diff --git a/games-util/chiaki/chiaki-9999.ebuild b/games-util/chiaki/chiaki-9999.ebuild index 60fe2127ec..ed1a05c397 100644 --- a/games-util/chiaki/chiaki-9999.ebuild +++ b/games-util/chiaki/chiaki-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 xdg DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play" @@ -33,6 +33,7 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 + dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/libsdl2 From e1922b7f8cc9249823a0d99319d9fd1ce230aa6c Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:42:26 -0400 Subject: [PATCH 07/36] dev-python/oscrypto: enable py3.12 fix build on dev-libs/openssl-3.0.10 Closes: https://bugs.gentoo.org/931393 Signed-off-by: Julien Roy --- .../oscrypto/files/openssl-3.0.10-fix.patch | 38 + dev-python/oscrypto/files/py3.12.patch | 902 ++++++++++++++++++ ...3.0-r1.ebuild => oscrypto-1.3.0-r2.ebuild} | 7 +- 3 files changed, 946 insertions(+), 1 deletion(-) create mode 100644 dev-python/oscrypto/files/openssl-3.0.10-fix.patch create mode 100644 dev-python/oscrypto/files/py3.12.patch rename dev-python/oscrypto/{oscrypto-1.3.0-r1.ebuild => oscrypto-1.3.0-r2.ebuild} (87%) diff --git a/dev-python/oscrypto/files/openssl-3.0.10-fix.patch b/dev-python/oscrypto/files/openssl-3.0.10-fix.patch new file mode 100644 index 0000000000..a1c2e44c41 --- /dev/null +++ b/dev-python/oscrypto/files/openssl-3.0.10-fix.patch @@ -0,0 +1,38 @@ +From ebbc944485b278192b60080ea1f495e287efb4f8 Mon Sep 17 00:00:00 2001 +From: Martin Journois +Date: Thu, 17 Aug 2023 13:09:31 +0200 +Subject: [PATCH] MJ: Fix #75 bug with openssl 3.0.10 (#76) + +* MJ: Fix #75 bug with openssl 3.0.10 +* MJ: Add fix suggested by @vcunat on _libcrypto_ctypes regex +--- + oscrypto/_openssl/_libcrypto_cffi.py | 2 +- + oscrypto/_openssl/_libcrypto_ctypes.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/oscrypto/_openssl/_libcrypto_cffi.py b/oscrypto/_openssl/_libcrypto_cffi.py +index 8aed03e..14eb576 100644 +--- a/oscrypto/_openssl/_libcrypto_cffi.py ++++ b/oscrypto/_openssl/_libcrypto_cffi.py +@@ -37,7 +37,7 @@ + + is_libressl = 'LibreSSL' in version_string + +-version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string) ++version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string) + if not version_match: + version_match = re.search('(?<=LibreSSL )(\\d\\.\\d(\\.\\d)?)\\b', version_string) + if not version_match: +diff --git a/oscrypto/_openssl/_libcrypto_ctypes.py b/oscrypto/_openssl/_libcrypto_ctypes.py +index e33ebbc..9cb294a 100644 +--- a/oscrypto/_openssl/_libcrypto_ctypes.py ++++ b/oscrypto/_openssl/_libcrypto_ctypes.py +@@ -40,7 +40,7 @@ + + is_libressl = 'LibreSSL' in version_string + +-version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string) ++version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string) + if not version_match: + version_match = re.search('(?<=LibreSSL )(\\d\\.\\d(\\.\\d)?)\\b', version_string) + if not version_match: diff --git a/dev-python/oscrypto/files/py3.12.patch b/dev-python/oscrypto/files/py3.12.patch new file mode 100644 index 0000000000..0bb8cb0cda --- /dev/null +++ b/dev-python/oscrypto/files/py3.12.patch @@ -0,0 +1,902 @@ +From 3be536e4a61ac5fbd403ee80cdb54cb666f34679 Mon Sep 17 00:00:00 2001 +From: Dominik 'Rathann' Mierzejewski +Date: Thu, 17 Aug 2023 09:05:29 +0200 +Subject: [PATCH 01/13] use `importlib` instead of deprecated `imp` module + +This fixes tests with python 3.12 where the `imp` module was +[removed](https://docs.python.org/3.12/whatsnew/3.12.html#removed). + +This should fix issue #74. +--- + tests/__init__.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 4c65360..90bede4 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -1,7 +1,7 @@ + # coding: utf-8 + from __future__ import unicode_literals, division, absolute_import, print_function + +-import imp ++import importlib + import os + import unittest + +@@ -94,8 +94,7 @@ def _import_from(mod, path, mod_dir=None): + return None + + try: +- mod_info = imp.find_module(mod_dir, [path]) +- return imp.load_module(mod, *mod_info) ++ return importlib.import_module(mod) + except ImportError: + return None + + +From 199f07eefb9c0d1d5ad8093c012fbdae1fefa633 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 07:14:40 -0400 +Subject: [PATCH 02/13] Fix compatibility with Python 2.6 + +--- + tests/__init__.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 90bede4..3ca9334 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -1,10 +1,15 @@ + # coding: utf-8 + from __future__ import unicode_literals, division, absolute_import, print_function + +-import importlib + import os ++import sys + import unittest + ++if sys.version_info < (3,): ++ import imp as importlib ++else: ++ import importlib ++ + + __version__ = '1.3.0' + __version_info__ = (1, 3, 0) + +From 19de26bdad3154dc30c6661b652c459438fa9be2 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 07:25:49 -0400 +Subject: [PATCH 03/13] Fix both imp and importlib implementations + +--- + tests/__init__.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 3ca9334..7aab84d 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -6,7 +6,7 @@ + import unittest + + if sys.version_info < (3,): +- import imp as importlib ++ import imp + else: + import importlib + +@@ -99,7 +99,12 @@ def _import_from(mod, path, mod_dir=None): + return None + + try: +- return importlib.import_module(mod) ++ if sys.version_info < (3,): ++ mod_info = imp.find_module(mod_dir, [path]) ++ return imp.load_module(mod, *mod_info) ++ else: ++ mod_info = importlib.machinery.PathFinder().find_spec(mod_dir, [path]) ++ return importlib.import_module(mod, *mod_info) + except ImportError: + return None + + +From 6973b915069babf665bc223979cd86b2dc262da4 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 07:34:37 -0400 +Subject: [PATCH 04/13] More importlib fixes + +--- + tests/__init__.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 7aab84d..957c083 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -103,8 +103,10 @@ def _import_from(mod, path, mod_dir=None): + mod_info = imp.find_module(mod_dir, [path]) + return imp.load_module(mod, *mod_info) + else: +- mod_info = importlib.machinery.PathFinder().find_spec(mod_dir, [path]) +- return importlib.import_module(mod, *mod_info) ++ spec = importlib.machinery.PathFinder().find_spec(mod_dir, [path]) ++ module = importlib.util.module_from_spec(spec) ++ sys.modules[mod] = module ++ spec.loader.exec_module(module) + except ImportError: + return None + + +From 8843c89acae8435a7ba731b42750e42caef87a70 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 07:35:40 -0400 +Subject: [PATCH 05/13] Python 3.3 has a different importlib implementation + +--- + tests/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 957c083..8339b5d 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -5,7 +5,7 @@ + import sys + import unittest + +-if sys.version_info < (3,): ++if sys.version_info < (3, 5): + import imp + else: + import importlib +@@ -99,7 +99,7 @@ def _import_from(mod, path, mod_dir=None): + return None + + try: +- if sys.version_info < (3,): ++ if sys.version_info < (3, 5): + mod_info = imp.find_module(mod_dir, [path]) + return imp.load_module(mod, *mod_info) + else: + +From 53fa3ca263ad6bc04e4a8a56f180b82bdc88aa03 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 08:22:21 -0400 +Subject: [PATCH 06/13] Attempt a different importlib implementation + +--- + tests/__init__.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/__init__.py b/tests/__init__.py +index 8339b5d..0eecf2f 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -103,7 +103,12 @@ def _import_from(mod, path, mod_dir=None): + mod_info = imp.find_module(mod_dir, [path]) + return imp.load_module(mod, *mod_info) + else: +- spec = importlib.machinery.PathFinder().find_spec(mod_dir, [path]) ++ loader_details = ( ++ importlib.machinery.SourceFileLoader, ++ importlib.machinery.SOURCE_SUFFIXES ++ ) ++ finder = importlib.machinery.FileFinder(path, loader_details) ++ spec = finder.find_spec(mod_dir) + module = importlib.util.module_from_spec(spec) + sys.modules[mod] = module + spec.loader.exec_module(module) + +From b013e440061c88dfe0301309b695c7b47bcc1e72 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Thu, 17 Aug 2023 15:52:30 -0400 +Subject: [PATCH 07/13] Hopefully some fully working Python 3.12-compatible + import backflips + +--- + dev/_import.py | 35 ++++++++++++++++++++++++++++++++--- + tests/__init__.py | 4 ++++ + 2 files changed, 36 insertions(+), 3 deletions(-) + +diff --git a/dev/_import.py b/dev/_import.py +index d64c028..016c576 100644 +--- a/dev/_import.py ++++ b/dev/_import.py +@@ -1,12 +1,19 @@ + # coding: utf-8 + from __future__ import unicode_literals, division, absolute_import, print_function + +-import imp + import sys + import os + + from . import build_root, package_name, package_root + ++if sys.version_info < (3, 5): ++ import imp ++else: ++ import importlib ++ import importlib.machinery ++ import importlib.util ++ ++ + if sys.version_info < (3,): + getcwd = os.getcwdu + else: +@@ -34,6 +41,14 @@ def _import_from(mod, path, mod_dir=None, allow_error=False): + None if not loaded, otherwise the module + """ + ++ if mod in sys.modules: ++ return sys.modules[mod] ++ ++ if mod_dir is None: ++ full_mod = mod ++ else: ++ full_mod = mod_dir ++ + if mod_dir is None: + mod_dir = mod.replace('.', os.sep) + +@@ -49,8 +64,22 @@ def _import_from(mod, path, mod_dir=None, allow_error=False): + path = os.path.join(path, append) + + try: +- mod_info = imp.find_module(mod_dir, [path]) +- return imp.load_module(mod, *mod_info) ++ if sys.version_info < (3, 5): ++ mod_info = imp.find_module(mod_dir, [path]) ++ return imp.load_module(mod, *mod_info) ++ ++ else: ++ loader_details = ( ++ importlib.machinery.SourceFileLoader, ++ importlib.machinery.SOURCE_SUFFIXES ++ ) ++ finder = importlib.machinery.FileFinder(path, loader_details) ++ spec = finder.find_spec(full_mod) ++ module = importlib.util.module_from_spec(spec) ++ sys.modules[mod] = module ++ spec.loader.exec_module(module) ++ return module ++ + except ImportError: + if allow_error: + raise +diff --git a/tests/__init__.py b/tests/__init__.py +index 0eecf2f..9759ae3 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -89,6 +89,9 @@ def _import_from(mod, path, mod_dir=None): + None if not loaded, otherwise the module + """ + ++ if mod in sys.modules: ++ return sys.modules[mod] ++ + if mod_dir is None: + mod_dir = mod + +@@ -112,6 +115,7 @@ def _import_from(mod, path, mod_dir=None): + module = importlib.util.module_from_spec(spec) + sys.modules[mod] = module + spec.loader.exec_module(module) ++ return module + except ImportError: + return None + + +From 8ec71631b5adf6f6ab34c7cc3fe8e229a2bdcbd7 Mon Sep 17 00:00:00 2001 +From: Dominik Mierzejewski +Date: Fri, 18 Aug 2023 11:18:06 +0200 +Subject: [PATCH 08/13] Use importlib with python 3.5+ + +This fixes `python run.py ci` under python 3.12. +--- + dev/coverage.py | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/dev/coverage.py b/dev/coverage.py +index bb99a4f..6e669fe 100644 +--- a/dev/coverage.py ++++ b/dev/coverage.py +@@ -4,7 +4,6 @@ + import cgi + import codecs + import coverage +-import imp + import json + import os + import unittest +@@ -33,6 +32,11 @@ + else: + Pattern = re.Pattern + ++if sys.version_info < (3, 5): ++ import imp ++else: ++ import importlib ++ + + def run(ci=False): + """ +@@ -103,8 +107,19 @@ def _load_package_tests(name): + if not os.path.exists(package_dir): + return [] + +- tests_module_info = imp.find_module('tests', [package_dir]) +- tests_module = imp.load_module('%s.tests' % name, *tests_module_info) ++ if sys.version_info < (3, 5): ++ tests_module_info = imp.find_module('tests', [package_dir]) ++ tests_module = imp.load_module('%s.tests' % name, *tests_module_info) ++ else: ++ loader_details = ( ++ importlib.machinery.SourceFileLoader, ++ importlib.machinery.SOURCE_SUFFIXES ++ ) ++ finder = importlib.machinery.FileFinder(package_dir, loader_details) ++ spec = finder.find_spec('tests') ++ test_module = importlib.util.module_from_spec(spec) ++ sys.modules['%s.tests' % name] = test_module ++ spec.loader.exec_module(test_module) + return tests_module.test_classes() + + + +From 23d848a500413847a63df740af543e0fdaba5558 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Tue, 22 Aug 2023 06:56:36 -0400 +Subject: [PATCH 09/13] Reuse _import_from in coverage task, fixing module name + +--- + dev/coverage.py | 21 ++------------------- + 1 file changed, 2 insertions(+), 19 deletions(-) + +diff --git a/dev/coverage.py b/dev/coverage.py +index 6e669fe..00684d0 100644 +--- a/dev/coverage.py ++++ b/dev/coverage.py +@@ -16,6 +16,7 @@ + from fnmatch import fnmatch + + from . import package_name, package_root, other_packages ++from ._import import _import_from + + if sys.version_info < (3,): + str_cls = unicode # noqa +@@ -32,11 +33,6 @@ + else: + Pattern = re.Pattern + +-if sys.version_info < (3, 5): +- import imp +-else: +- import importlib +- + + def run(ci=False): + """ +@@ -107,20 +103,7 @@ def _load_package_tests(name): + if not os.path.exists(package_dir): + return [] + +- if sys.version_info < (3, 5): +- tests_module_info = imp.find_module('tests', [package_dir]) +- tests_module = imp.load_module('%s.tests' % name, *tests_module_info) +- else: +- loader_details = ( +- importlib.machinery.SourceFileLoader, +- importlib.machinery.SOURCE_SUFFIXES +- ) +- finder = importlib.machinery.FileFinder(package_dir, loader_details) +- spec = finder.find_spec('tests') +- test_module = importlib.util.module_from_spec(spec) +- sys.modules['%s.tests' % name] = test_module +- spec.loader.exec_module(test_module) +- return tests_module.test_classes() ++ return _import_from('%s.tests' % name, package_dir, 'tests').test_classes() + + + def _env_info(): + +From 9941d3b96e8aa08622d00954d89005dcf6e94b94 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Tue, 22 Aug 2023 07:03:26 -0400 +Subject: [PATCH 10/13] Factor out remaining usage of imp module + +--- + dev/build.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dev/build.py b/dev/build.py +index 4899594..f429fee 100644 +--- a/dev/build.py ++++ b/dev/build.py +@@ -1,7 +1,6 @@ + # coding: utf-8 + from __future__ import unicode_literals, division, absolute_import, print_function + +-import imp + import os + import tarfile + import zipfile +@@ -9,6 +8,7 @@ + import setuptools.sandbox + + from . import package_root, package_name, has_tests_package ++from ._import import _import_from + + + def _list_zip(filename): +@@ -45,8 +45,8 @@ def run(): + + # Trying to call setuptools.sandbox.run_setup(setup, ['--version']) + # resulted in a segfault, so we do this instead +- module_info = imp.find_module('version', [os.path.join(package_root, package_name)]) +- version_mod = imp.load_module('%s.version' % package_name, *module_info) ++ package_dir = os.path.join(package_root, package_name) ++ version_mod = _import_from('%s.version' % package_name, package_dir, 'version') + + pkg_name_info = (package_name, version_mod.__version__) + print('Building %s-%s' % pkg_name_info) + +From 799aa0d2f4a954d3fc120ab382c8dd4322758654 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Tue, 22 Aug 2023 16:29:39 -0400 +Subject: [PATCH 11/13] Rewrite importlib import mechanism + +--- + dev/_import.py | 69 ++++++++++++++++++++++++++++++++--------- + tests/__init__.py | 79 ++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 122 insertions(+), 26 deletions(-) + +diff --git a/dev/_import.py b/dev/_import.py +index 016c576..20720e7 100644 +--- a/dev/_import.py ++++ b/dev/_import.py +@@ -10,7 +10,7 @@ + import imp + else: + import importlib +- import importlib.machinery ++ import importlib.abc + import importlib.util + + +@@ -20,6 +20,48 @@ + getcwd = os.getcwd + + ++class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): ++ def setup(self): ++ self.modules = {} ++ sys.meta_path.insert(0, self) ++ ++ def add_module(self, package_name, package_path): ++ if package_name not in self.modules: ++ self.modules[package_name] = package_path ++ ++ def find_spec(self, fullname, path, target=None): ++ name_parts = fullname.split('.') ++ if name_parts[0] not in self.modules: ++ return None ++ ++ package = name_parts[0] ++ package_path = self.modules[package] ++ ++ fullpath = os.path.join(package_path, *name_parts[1:]) ++ ++ if os.path.isdir(fullpath): ++ filename = os.path.join(fullpath, "__init__.py") ++ submodule_locations = [fullpath] ++ else: ++ filename = fullpath + ".py" ++ submodule_locations = None ++ ++ if not os.path.exists(filename): ++ return None ++ ++ return importlib.util.spec_from_file_location( ++ fullname, ++ filename, ++ loader=None, ++ submodule_search_locations=submodule_locations ++ ) ++ ++ ++if sys.version_info >= (3, 5): ++ CUSTOM_FINDER = ModCryptoMetaFinder() ++ CUSTOM_FINDER.setup() ++ ++ + def _import_from(mod, path, mod_dir=None, allow_error=False): + """ + Imports a module from a specific path +@@ -47,7 +89,7 @@ def _import_from(mod, path, mod_dir=None, allow_error=False): + if mod_dir is None: + full_mod = mod + else: +- full_mod = mod_dir ++ full_mod = mod_dir.replace(os.sep, '.') + + if mod_dir is None: + mod_dir = mod.replace('.', os.sep) +@@ -55,8 +97,11 @@ def _import_from(mod, path, mod_dir=None, allow_error=False): + if not os.path.exists(path): + return None + +- if not os.path.exists(os.path.join(path, mod_dir)) \ +- and not os.path.exists(os.path.join(path, mod_dir + '.py')): ++ source_path = os.path.join(path, mod_dir, '__init__.py') ++ if not os.path.exists(source_path): ++ source_path = os.path.join(path, mod_dir + '.py') ++ ++ if not os.path.exists(source_path): + return None + + if os.sep in mod_dir: +@@ -69,16 +114,12 @@ def _import_from(mod, path, mod_dir=None, allow_error=False): + return imp.load_module(mod, *mod_info) + + else: +- loader_details = ( +- importlib.machinery.SourceFileLoader, +- importlib.machinery.SOURCE_SUFFIXES +- ) +- finder = importlib.machinery.FileFinder(path, loader_details) +- spec = finder.find_spec(full_mod) +- module = importlib.util.module_from_spec(spec) +- sys.modules[mod] = module +- spec.loader.exec_module(module) +- return module ++ package = mod.split('.', 1)[0] ++ package_dir = full_mod.split('.', 1)[0] ++ package_path = os.path.join(path, package_dir) ++ CUSTOM_FINDER.add_module(package, package_path) ++ ++ return importlib.import_module(mod) + + except ImportError: + if allow_error: +diff --git a/tests/__init__.py b/tests/__init__.py +index 9759ae3..2e24046 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -9,6 +9,8 @@ + import imp + else: + import importlib ++ import importlib.abc ++ import importlib.util + + + __version__ = '1.3.0' +@@ -71,6 +73,48 @@ def local_oscrypto(): + return (_asn1crypto_module, _oscrypto_module) + + ++class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): ++ def setup(self): ++ self.modules = {} ++ sys.meta_path.insert(0, self) ++ ++ def add_module(self, package_name, package_path): ++ if package_name not in self.modules: ++ self.modules[package_name] = package_path ++ ++ def find_spec(self, fullname, path, target=None): ++ name_parts = fullname.split('.') ++ if name_parts[0] not in self.modules: ++ return None ++ ++ package = name_parts[0] ++ package_path = self.modules[package] ++ ++ fullpath = os.path.join(package_path, *name_parts[1:]) ++ ++ if os.path.isdir(fullpath): ++ filename = os.path.join(fullpath, "__init__.py") ++ submodule_locations = [fullpath] ++ else: ++ filename = fullpath + ".py" ++ submodule_locations = None ++ ++ if not os.path.exists(filename): ++ return None ++ ++ return importlib.util.spec_from_file_location( ++ fullname, ++ filename, ++ loader=None, ++ submodule_search_locations=submodule_locations ++ ) ++ ++ ++if sys.version_info >= (3, 5): ++ CUSTOM_FINDER = ModCryptoMetaFinder() ++ CUSTOM_FINDER.setup() ++ ++ + def _import_from(mod, path, mod_dir=None): + """ + Imports a module from a specific path +@@ -93,29 +137,40 @@ def _import_from(mod, path, mod_dir=None): + return sys.modules[mod] + + if mod_dir is None: +- mod_dir = mod ++ full_mod = mod ++ else: ++ full_mod = mod_dir.replace(os.sep, '.') ++ ++ if mod_dir is None: ++ mod_dir = mod.replace('.', os.sep) + + if not os.path.exists(path): + return None + +- if not os.path.exists(os.path.join(path, mod_dir)): ++ source_path = os.path.join(path, mod_dir, '__init__.py') ++ if not os.path.exists(source_path): ++ source_path = os.path.join(path, mod_dir + '.py') ++ ++ if not os.path.exists(source_path): + return None + ++ if os.sep in mod_dir: ++ append, mod_dir = mod_dir.rsplit(os.sep, 1) ++ path = os.path.join(path, append) ++ + try: + if sys.version_info < (3, 5): + mod_info = imp.find_module(mod_dir, [path]) + return imp.load_module(mod, *mod_info) ++ + else: +- loader_details = ( +- importlib.machinery.SourceFileLoader, +- importlib.machinery.SOURCE_SUFFIXES +- ) +- finder = importlib.machinery.FileFinder(path, loader_details) +- spec = finder.find_spec(mod_dir) +- module = importlib.util.module_from_spec(spec) +- sys.modules[mod] = module +- spec.loader.exec_module(module) +- return module ++ package = mod.split('.', 1)[0] ++ package_dir = full_mod.split('.', 1)[0] ++ package_path = os.path.join(path, package_dir) ++ CUSTOM_FINDER.add_module(package, package_path) ++ ++ return importlib.import_module(mod) ++ + except ImportError: + return None + + +From 8a588fa0223f08f817e702f7f2cc4ef81017af26 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Tue, 22 Aug 2023 16:35:17 -0400 +Subject: [PATCH 12/13] Fix custom importlib code for Python < 3.5 + +--- + dev/_import.py | 73 +++++++++++++++++++++++------------------------ + tests/__init__.py | 58 ++++++++++++++++++------------------- + 2 files changed, 65 insertions(+), 66 deletions(-) + +diff --git a/dev/_import.py b/dev/_import.py +index 20720e7..2d016db 100644 +--- a/dev/_import.py ++++ b/dev/_import.py +@@ -19,45 +19,44 @@ + else: + getcwd = os.getcwd + +- +-class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): +- def setup(self): +- self.modules = {} +- sys.meta_path.insert(0, self) +- +- def add_module(self, package_name, package_path): +- if package_name not in self.modules: +- self.modules[package_name] = package_path +- +- def find_spec(self, fullname, path, target=None): +- name_parts = fullname.split('.') +- if name_parts[0] not in self.modules: +- return None +- +- package = name_parts[0] +- package_path = self.modules[package] +- +- fullpath = os.path.join(package_path, *name_parts[1:]) +- +- if os.path.isdir(fullpath): +- filename = os.path.join(fullpath, "__init__.py") +- submodule_locations = [fullpath] +- else: +- filename = fullpath + ".py" +- submodule_locations = None +- +- if not os.path.exists(filename): +- return None +- +- return importlib.util.spec_from_file_location( +- fullname, +- filename, +- loader=None, +- submodule_search_locations=submodule_locations +- ) ++if sys.version_info >= (3, 5): ++ class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): ++ def setup(self): ++ self.modules = {} ++ sys.meta_path.insert(0, self) ++ ++ def add_module(self, package_name, package_path): ++ if package_name not in self.modules: ++ self.modules[package_name] = package_path ++ ++ def find_spec(self, fullname, path, target=None): ++ name_parts = fullname.split('.') ++ if name_parts[0] not in self.modules: ++ return None ++ ++ package = name_parts[0] ++ package_path = self.modules[package] ++ ++ fullpath = os.path.join(package_path, *name_parts[1:]) ++ ++ if os.path.isdir(fullpath): ++ filename = os.path.join(fullpath, "__init__.py") ++ submodule_locations = [fullpath] ++ else: ++ filename = fullpath + ".py" ++ submodule_locations = None ++ ++ if not os.path.exists(filename): ++ return None ++ ++ return importlib.util.spec_from_file_location( ++ fullname, ++ filename, ++ loader=None, ++ submodule_search_locations=submodule_locations ++ ) + + +-if sys.version_info >= (3, 5): + CUSTOM_FINDER = ModCryptoMetaFinder() + CUSTOM_FINDER.setup() + +diff --git a/tests/__init__.py b/tests/__init__.py +index 2e24046..e1e92e6 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -73,44 +73,44 @@ def local_oscrypto(): + return (_asn1crypto_module, _oscrypto_module) + + +-class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): +- def setup(self): +- self.modules = {} +- sys.meta_path.insert(0, self) ++if sys.version_info >= (3, 5): ++ class ModCryptoMetaFinder(importlib.abc.MetaPathFinder): ++ def setup(self): ++ self.modules = {} ++ sys.meta_path.insert(0, self) + +- def add_module(self, package_name, package_path): +- if package_name not in self.modules: +- self.modules[package_name] = package_path ++ def add_module(self, package_name, package_path): ++ if package_name not in self.modules: ++ self.modules[package_name] = package_path + +- def find_spec(self, fullname, path, target=None): +- name_parts = fullname.split('.') +- if name_parts[0] not in self.modules: +- return None ++ def find_spec(self, fullname, path, target=None): ++ name_parts = fullname.split('.') ++ if name_parts[0] not in self.modules: ++ return None + +- package = name_parts[0] +- package_path = self.modules[package] ++ package = name_parts[0] ++ package_path = self.modules[package] + +- fullpath = os.path.join(package_path, *name_parts[1:]) ++ fullpath = os.path.join(package_path, *name_parts[1:]) + +- if os.path.isdir(fullpath): +- filename = os.path.join(fullpath, "__init__.py") +- submodule_locations = [fullpath] +- else: +- filename = fullpath + ".py" +- submodule_locations = None ++ if os.path.isdir(fullpath): ++ filename = os.path.join(fullpath, "__init__.py") ++ submodule_locations = [fullpath] ++ else: ++ filename = fullpath + ".py" ++ submodule_locations = None + +- if not os.path.exists(filename): +- return None ++ if not os.path.exists(filename): ++ return None + +- return importlib.util.spec_from_file_location( +- fullname, +- filename, +- loader=None, +- submodule_search_locations=submodule_locations +- ) ++ return importlib.util.spec_from_file_location( ++ fullname, ++ filename, ++ loader=None, ++ submodule_search_locations=submodule_locations ++ ) + + +-if sys.version_info >= (3, 5): + CUSTOM_FINDER = ModCryptoMetaFinder() + CUSTOM_FINDER.setup() + + +From d9f8e2ff88e722e3af6bf592c097298505a40381 Mon Sep 17 00:00:00 2001 +From: wbond +Date: Tue, 22 Aug 2023 16:45:45 -0400 +Subject: [PATCH 13/13] Fix test loading + +--- + dev/_import.py | 1 - + dev/coverage.py | 2 +- + tests/__init__.py | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/dev/_import.py b/dev/_import.py +index 2d016db..c0a1983 100644 +--- a/dev/_import.py ++++ b/dev/_import.py +@@ -56,7 +56,6 @@ def find_spec(self, fullname, path, target=None): + submodule_search_locations=submodule_locations + ) + +- + CUSTOM_FINDER = ModCryptoMetaFinder() + CUSTOM_FINDER.setup() + +diff --git a/dev/coverage.py b/dev/coverage.py +index 00684d0..98f140b 100644 +--- a/dev/coverage.py ++++ b/dev/coverage.py +@@ -103,7 +103,7 @@ def _load_package_tests(name): + if not os.path.exists(package_dir): + return [] + +- return _import_from('%s.tests' % name, package_dir, 'tests').test_classes() ++ return _import_from('%s_tests' % name, package_dir, 'tests').test_classes() + + + def _env_info(): +diff --git a/tests/__init__.py b/tests/__init__.py +index e1e92e6..3ae721d 100644 +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -110,7 +110,6 @@ def find_spec(self, fullname, path, target=None): + submodule_search_locations=submodule_locations + ) + +- + CUSTOM_FINDER = ModCryptoMetaFinder() + CUSTOM_FINDER.setup() + diff --git a/dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild b/dev-python/oscrypto/oscrypto-1.3.0-r2.ebuild similarity index 87% rename from dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild rename to dev-python/oscrypto/oscrypto-1.3.0-r2.ebuild index 145e19a73a..3bb5f584ed 100644 --- a/dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild +++ b/dev-python/oscrypto/oscrypto-1.3.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=setuptools inherit edo distutils-r1 optfeature @@ -30,6 +30,11 @@ BDEPEND=" DOCS=( docs {changelog,readme}.md ) +PATCHES=( + "${FILESDIR}"/openssl-3.0.10-fix.patch + "${FILESDIR}"/py3.12.patch +) + distutils_enable_tests unittest python_test() { From 96cda54020c13d65d965febfd354b8295468b784 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 19:59:18 -0400 Subject: [PATCH 08/36] dev-python/pem: drop 21.2.0 Closes: https://bugs.gentoo.org/931407 Signed-off-by: Julien Roy --- dev-python/pem/Manifest | 1 - dev-python/pem/pem-21.2.0.ebuild | 27 --------------------------- 2 files changed, 28 deletions(-) delete mode 100644 dev-python/pem/pem-21.2.0.ebuild diff --git a/dev-python/pem/Manifest b/dev-python/pem/Manifest index c60227d7b6..9f68271c31 100644 --- a/dev-python/pem/Manifest +++ b/dev-python/pem/Manifest @@ -1,2 +1 @@ -DIST pem-21.2.0.gh.tar.gz 35899 BLAKE2B b24affc1228d61b61660615c252fbac36abc3e42d9b54a026fd63c68b3ba470c3208ce12d2d8b188bb4e951f2ad55cd4cf441ffdbc49b681e9f0616ed5290123 SHA512 7e6f6d46bd1c8ab5c84b0edee182fbec7ae3c37e2005854ff1bc6f43cb47490a1f3bb0ac97cbc9e8c0ff830d4f22fcddd52f68206452a16ba862354a75491b18 DIST pem-23.1.0.tar.gz 43796 BLAKE2B 903b6bbad0a73266467d876eba2a6a32993fd57f75630149bb00c8eac9f51a0fa7b1edcff9c09d48167f971c1da51f688ae0bda9494c3d3e3acf11262983858d SHA512 e742dba55df69736ed5896370da980b25961682a9fd38b6940490cb82332813fc1d7a931fe651716fa31caf6080e6fb047d0ef62d3e61d7e3e1288a00b70051e diff --git a/dev-python/pem/pem-21.2.0.ebuild b/dev-python/pem/pem-21.2.0.ebuild deleted file mode 100644 index d9d1519003..0000000000 --- a/dev-python/pem/pem-21.2.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 - -DESCRIPTION="Easy PEM file parsing in Python" -HOMEPAGE="https://pem.readthedocs.io/" -SRC_URI="https://github.com/hynek/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - test? ( - >=dev-python/coverage-5.0.2[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest From e4e15800eade001f68bf872c27fe09816f59f7ec Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:00:19 -0400 Subject: [PATCH 09/36] dev-python/plum: enable py3.12, py3.13 Closes: https://bugs.gentoo.org/931396 Signed-off-by: Julien Roy --- dev-python/plum/plum-0.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/plum/plum-0.8.7.ebuild b/dev-python/plum/plum-0.8.7.ebuild index 1e04666599..c9ebe4ca49 100644 --- a/dev-python/plum/plum-0.8.7.ebuild +++ b/dev-python/plum/plum-0.8.7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7..11} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 From da99ba8e0e100709250e14d6fc5ce09d5eeffe32 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:00:33 -0400 Subject: [PATCH 10/36] app-admin/krapplet: enable py3.12 Closes: https://bugs.gentoo.org/931350 Signed-off-by: Julien Roy --- app-admin/krapplet/krapplet-0.3.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/krapplet/krapplet-0.3.1-r1.ebuild b/app-admin/krapplet/krapplet-0.3.1-r1.ebuild index e6ff502519..f366fbe507 100644 --- a/app-admin/krapplet/krapplet-0.3.1-r1.ebuild +++ b/app-admin/krapplet/krapplet-0.3.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi xdg From 7932535672311362b6604671f5300489a10a1207 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:01:32 -0400 Subject: [PATCH 11/36] app-misc/mat2: drop 0.13.3 Closes: https://bugs.gentoo.org/931354 Signed-off-by: Julien Roy --- app-misc/mat2/Manifest | 2 -- app-misc/mat2/mat2-0.13.3.ebuild | 56 -------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 app-misc/mat2/mat2-0.13.3.ebuild diff --git a/app-misc/mat2/Manifest b/app-misc/mat2/Manifest index 980916b801..6599f05b24 100644 --- a/app-misc/mat2/Manifest +++ b/app-misc/mat2/Manifest @@ -1,4 +1,2 @@ -DIST mat2-0.13.3.tar.gz 11782599 BLAKE2B 26ace57f5ac8ba2444a389615cb89f30e27a89f2e704620dcf0e0999f9643d7b46f6a920ead1ee747c1ac7f818cdb3fe0dcd3acf3b370545414aefd7e1c3850c SHA512 48405de214b69e6d6fe818580ce758817632a4a3ab6cc6b73e7c13d0db2d5cd75a4ffffab22ce1b5dc73a6cc03da9436e44e290f74700027277ec18db023a6fb -DIST mat2-0.13.3.tar.gz.asc 833 BLAKE2B 9e1fdd6b714f020e16b3660f535ef1b1a150220011922f50a67cd1dce7ed8c704a7c1537e3304d38a5a2b3b42affa1c46a1bb6afd342ef4247dcbec2e1e68ebc SHA512 d6de8d3675892407da58171c71f65785df6d946842cda23b12a6d9c253a89d9885c83857f3e7bd05309490f3c4e482c2eeef567e2fdc650d9ac772cf91da9e8e DIST mat2-0.13.4.tar.gz 11782937 BLAKE2B cab400479bbf312979e11f00bccf02e0e330455651dcdef239507c511b4101cb8b39af5f9dfdc1df9f1bcedc3dda3276c7cf598491c0ff0fc1f365f540fdb7a6 SHA512 75c08c9c52a82f9983e799c2aeef0da8324d1c92ac32fb748a68063ec7b28569692082aceacf7161d24db0e8a988357c423b6e17ca5c0f934309c9791c41ab18 DIST mat2-0.13.4.tar.gz.asc 833 BLAKE2B 5e108396ca5d52c88e714b3f66f2e36fd900089be0820facdfed02ba44f879a02e4f510d9f28c53ac2d1a01e678f69062a72a6aca2508ceb844620d06ea4cd78 SHA512 380c7ef948aea2af1b0e4c56b69848f365db0967678dbf8881d1a33fd8050523c11b7648a676636ee68190cb640a37e41b60aa6f9f604e7cf1b6f0044fc54c98 diff --git a/app-misc/mat2/mat2-0.13.3.ebuild b/app-misc/mat2/mat2-0.13.3.ebuild deleted file mode 100644 index 760c4817b2..0000000000 --- a/app-misc/mat2/mat2-0.13.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=(python3_{10..11}) -PYTHON_REQ_USE="xml(+)" -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature verify-sig - -DESCRIPTION="Metadata Anonymisation Toolkit: handy tool to trash your metadata" -HOMEPAGE="https://0xacab.org/jvoisin/mat2" -SIG_UPLOAD_HASH="672c73a1b8b0e79cdf7187900f3cc8ca" -SRC_URI=" - https://0xacab.org/jvoisin/${PN}/-/archive/${PV}/${P}.tar.gz - verify-sig? ( https://0xacab.org/jvoisin/${PN}/uploads/${SIG_UPLOAD_HASH}/${P}.tar.gz.asc ) -" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - app-text/poppler[introspection,cairo] - dev-libs/glib:2 - dev-python/pycairo:0[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - gnome-base/librsvg[introspection] - media-libs/mutagen:0[${PYTHON_USEDEP}] - x11-libs/gdk-pixbuf:2[introspection,jpeg,tiff] -" -BDEPEND=" - verify-sig? ( >sec-keys/openpgp-keys-jvoisin-20200714 ) - test? ( - media-libs/exiftool:* - media-video/ffmpeg[mp3,vorbis] - ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jvoisin.asc - -DOCS=( doc {CHANGELOG,CONTRIBUTING,INSTALL,README}.md ) - -distutils_enable_tests unittest - -src_prepare() { - default - rm pyproject.toml || die -} - -pkg_postinst() { - optfeature "misc file format support" media-libs/exiftool - optfeature "sandboxing" sys-apps/bubblewrap - optfeature "video support" media-video/ffmpeg -} From 68901dcc635d1c14498482588c8daaa31da40121 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:04:56 -0400 Subject: [PATCH 12/36] app-shells/pokemon-colorscripts: enable py3.12, py3.13 Closes: https://bugs.gentoo.org/931356 Signed-off-by: Julien Roy --- .../pokemon-colorscripts/pokemon-colorscripts-9999.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app-shells/pokemon-colorscripts/pokemon-colorscripts-9999.ebuild b/app-shells/pokemon-colorscripts/pokemon-colorscripts-9999.ebuild index 4fa9fb5430..11e8ea6942 100644 --- a/app-shells/pokemon-colorscripts/pokemon-colorscripts-9999.ebuild +++ b/app-shells/pokemon-colorscripts/pokemon-colorscripts-9999.ebuild @@ -1,20 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{10,11}) +PYTHON_COMPAT=( python3_{10..13} ) inherit git-r3 python-single-r1 DESCRIPTION="Pokemon unicode sprites for your terminal!" - HOMEPAGE="https://gitlab.com/phoneybadger/pokemon-colorscripts" - EGIT_REPO_URI="https://gitlab.com/phoneybadger/pokemon-colorscripts.git" LICENSE="MIT" - SLOT="0" REQUIRED_USE="${PYTHON_REQUIRED_USE}" From 68531ea891c593f9d1d72adc906d0608ab7c40be Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:05:51 -0400 Subject: [PATCH 13/36] dev-python/pynput: enable py3.12 Closes: https://bugs.gentoo.org/931409 Signed-off-by: Julien Roy --- dev-python/pynput/pynput-1.7.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pynput/pynput-1.7.6.ebuild b/dev-python/pynput/pynput-1.7.6.ebuild index 852dfee819..b62fe62c79 100644 --- a/dev-python/pynput/pynput-1.7.6.ebuild +++ b/dev-python/pynput/pynput-1.7.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi From 0e462e8a00992ee833bf39b1fc7e91adfa3e89a4 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:34:24 -0400 Subject: [PATCH 14/36] media-gfx/beeref: enable py3.12, py3.13 Closes: https://bugs.gentoo.org/931456 Signed-off-by: Julien Roy --- media-gfx/beeref/beeref-0.3.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/beeref/beeref-0.3.2.ebuild b/media-gfx/beeref/beeref-0.3.2.ebuild index 003b7cd62e..654ce2375d 100644 --- a/media-gfx/beeref/beeref-0.3.2.ebuild +++ b/media-gfx/beeref/beeref-0.3.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 desktop xdg From 0231d01eb8ee5dd6d5e226fc966f471677fb4859 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Tue, 14 May 2024 20:44:21 -0400 Subject: [PATCH 15/36] gui-apps/gradience: enable py3.12 fix tests fix dependencies Closes: https://bugs.gentoo.org/921925 Closes: https://bugs.gentoo.org/931453 Signed-off-by: Julien Roy --- .../files/appstream-test-ignore.patch | 16 +++++++++++ ....0-r1.ebuild => gradience-0.3.0-r2.ebuild} | 27 ++++++++++++------- 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 gui-apps/gradience/files/appstream-test-ignore.patch rename gui-apps/gradience/{gradience-0.3.0-r1.ebuild => gradience-0.3.0-r2.ebuild} (64%) diff --git a/gui-apps/gradience/files/appstream-test-ignore.patch b/gui-apps/gradience/files/appstream-test-ignore.patch new file mode 100644 index 0000000000..4a179e1d43 --- /dev/null +++ b/gui-apps/gradience/files/appstream-test-ignore.patch @@ -0,0 +1,16 @@ +diff --git a/data/meson.build b/data/meson.build +index fdebf9be..985ed36e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -50,11 +50,6 @@ appstream_file = i18n.merge_file( + ) + + appstream_util = find_program('appstream-util', required: false) +-if appstream_util.found() +- test('Validate appstream file', appstream_util, +- args: ['validate', appstream_file.full_path()] +- ) +-endif + + configure_file( + input: '@0@.gschema.xml.in'.format(PROJECT_RDNN_NAME), diff --git a/gui-apps/gradience/gradience-0.3.0-r1.ebuild b/gui-apps/gradience/gradience-0.3.0-r2.ebuild similarity index 64% rename from gui-apps/gradience/gradience-0.3.0-r1.ebuild rename to gui-apps/gradience/gradience-0.3.0-r2.ebuild index 8723979bb1..97df5698a7 100644 --- a/gui-apps/gradience/gradience-0.3.0-r1.ebuild +++ b/gui-apps/gradience/gradience-0.3.0-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson xdg python-single-r1 @@ -31,17 +31,24 @@ DEPEND=" x11-themes/hicolor-icon-theme >=gui-libs/gtk-4.5.0:4 >=gui-libs/libadwaita-1.2:1= - >=dev-python/pygobject-3.42.2:3 - >=dev-python/anyascii-0.3 - dev-python/material-color-utilities - dev-python/svglib - dev-python/yapsy - dev-python/cssutils - dev-python/jinja - dev-python/aiohttp + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.42.2:3[${PYTHON_USEDEP}] + >=dev-python/anyascii-0.3[${PYTHON_USEDEP}] + dev-python/material-color-utilities[${PYTHON_USEDEP}] + dev-python/svglib[${PYTHON_USEDEP}] + dev-python/yapsy[${PYTHON_USEDEP}] + dev-python/cssutils[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ') " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/appstream-test-ignore.patch +) + src_prepare() { default xdg_environment_reset From 9dc77eae034063e6c0c51af32dd520026726dbc3 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 May 2024 23:58:19 +0200 Subject: [PATCH 16/36] net-wireless/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- net-wireless/rtl8192eu/rtl8192eu-0_pre20240120.ebuild | 2 +- net-wireless/rtl8821ce/rtl8821ce-0_pre20240120.ebuild | 2 +- net-wireless/rtl8821cu/rtl8821cu-0_pre20240121.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-wireless/rtl8192eu/rtl8192eu-0_pre20240120.ebuild b/net-wireless/rtl8192eu/rtl8192eu-0_pre20240120.ebuild index 7e4da5b83e..481cd13198 100644 --- a/net-wireless/rtl8192eu/rtl8192eu-0_pre20240120.ebuild +++ b/net-wireless/rtl8192eu/rtl8192eu-0_pre20240120.ebuild @@ -12,8 +12,8 @@ HOMEPAGE="https://github.com/Mange/rtl8192eu-linux-driver" SRC_URI="https://github.com/Mange/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${COMMIT}" -SLOT=0 LICENSE="GPL-2" +SLOT=0 KEYWORDS="~amd64 ~x86" CONFIG_CHECK="~!RTL8XXXU" diff --git a/net-wireless/rtl8821ce/rtl8821ce-0_pre20240120.ebuild b/net-wireless/rtl8821ce/rtl8821ce-0_pre20240120.ebuild index 51ac75fb82..a6da02c005 100644 --- a/net-wireless/rtl8821ce/rtl8821ce-0_pre20240120.ebuild +++ b/net-wireless/rtl8821ce/rtl8821ce-0_pre20240120.ebuild @@ -12,8 +12,8 @@ HOMEPAGE="https://github.com/tomaspinho/rtl8821ce" SRC_URI="https://github.com/tomaspinho/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${COMMIT}" -SLOT=0 LICENSE="GPL-2" +SLOT=0 KEYWORDS="~amd64 ~x86" CONFIG_CHECK="~!RTW88_8821CE" diff --git a/net-wireless/rtl8821cu/rtl8821cu-0_pre20240121.ebuild b/net-wireless/rtl8821cu/rtl8821cu-0_pre20240121.ebuild index 8e7ee8bab9..651536eb40 100644 --- a/net-wireless/rtl8821cu/rtl8821cu-0_pre20240121.ebuild +++ b/net-wireless/rtl8821cu/rtl8821cu-0_pre20240121.ebuild @@ -12,8 +12,8 @@ HOMEPAGE="https://github.com/morrownr/8821cu-20210916" SRC_URI="https://github.com/morrownr/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_PN}-${COMMIT}" -SLOT=0 LICENSE="GPL-2" +SLOT=0 KEYWORDS="~amd64 ~x86" src_compile() { From 3399dbb71c2ea9c55b4f161f1eae45d9ddd290ed Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 00:00:24 +0200 Subject: [PATCH 17/36] phosh-base/squeekboard: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- phosh-base/squeekboard/squeekboard-1.17.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phosh-base/squeekboard/squeekboard-1.17.1.ebuild b/phosh-base/squeekboard/squeekboard-1.17.1.ebuild index 8e222fc596..08808f4209 100644 --- a/phosh-base/squeekboard/squeekboard-1.17.1.ebuild +++ b/phosh-base/squeekboard/squeekboard-1.17.1.ebuild @@ -57,6 +57,8 @@ HOMEPAGE="https://gitlab.gnome.org/World/Phosh/squeekboard" SRC_URI="https://gitlab.gnome.org/World/Phosh/squeekboard/-/archive/v${PV}/squeekboard-v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" $(cargo_crate_uris ${CRATES})" +S="${WORKDIR}/${PN}-v${PV}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64" @@ -78,8 +80,6 @@ BDEPEND=" virtual/rust " -S="${WORKDIR}/${PN}-v${PV}" - QA_FLAGS_IGNORED="/usr/bin/squeekboard-test-layout" src_install() { From 8be6f6ab3f185b5879fcda5e17d9b86eedff82a6 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 00:47:50 +0200 Subject: [PATCH 18/36] sci-biology/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sci-biology/cytoscape-bin/cytoscape-bin-3.10.1.ebuild | 4 ++-- sci-biology/jalview-bin/jalview-bin-2.11.2.7.ebuild | 4 ++-- sci-biology/jalview-bin/jalview-bin-2.11.3.2.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sci-biology/cytoscape-bin/cytoscape-bin-3.10.1.ebuild b/sci-biology/cytoscape-bin/cytoscape-bin-3.10.1.ebuild index 127ed4f800..caf507912c 100644 --- a/sci-biology/cytoscape-bin/cytoscape-bin-3.10.1.ebuild +++ b/sci-biology/cytoscape-bin/cytoscape-bin-3.10.1.ebuild @@ -9,13 +9,13 @@ DESCRIPTION="A visualization platform for molecular interaction networks" HOMEPAGE="http://www.cytoscape.org/" SRC_URI="https://github.com/cytoscape/cytoscape/releases/download/${PV}/cytoscape-unix-${PV}.tar.gz" +S="${WORKDIR}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=">=virtual/jre-11-r2" -S="${WORKDIR}" - src_install() { MY_PN="cytoscape" MYW="${WORKDIR}/${MY_PN}-unix-${PV}" diff --git a/sci-biology/jalview-bin/jalview-bin-2.11.2.7.ebuild b/sci-biology/jalview-bin/jalview-bin-2.11.2.7.ebuild index 23755dc138..1fde572cf7 100644 --- a/sci-biology/jalview-bin/jalview-bin-2.11.2.7.ebuild +++ b/sci-biology/jalview-bin/jalview-bin-2.11.2.7.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="Editor of multiple sequence alignments." HOMEPAGE="https://www.jalview.org/" SRC_URI="https://www.jalview.org/getdown/release/jalview-all-${PV}-j1.8.jar" +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -19,8 +21,6 @@ DEPEND="app-arch/unzip" RDEPEND="virtual/jre:1.8" -S="${WORKDIR}" - src_unpack() { cp -v "${DISTDIR}/${A}" . || die unzip -u ${A} images/jalview_logo-48.png || die diff --git a/sci-biology/jalview-bin/jalview-bin-2.11.3.2.ebuild b/sci-biology/jalview-bin/jalview-bin-2.11.3.2.ebuild index 23755dc138..1fde572cf7 100644 --- a/sci-biology/jalview-bin/jalview-bin-2.11.3.2.ebuild +++ b/sci-biology/jalview-bin/jalview-bin-2.11.3.2.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="Editor of multiple sequence alignments." HOMEPAGE="https://www.jalview.org/" SRC_URI="https://www.jalview.org/getdown/release/jalview-all-${PV}-j1.8.jar" +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -19,8 +21,6 @@ DEPEND="app-arch/unzip" RDEPEND="virtual/jre:1.8" -S="${WORKDIR}" - src_unpack() { cp -v "${DISTDIR}/${A}" . || die unzip -u ${A} images/jalview_logo-48.png || die From ad273a2b83e96ca07f5c0a211c91cd5dde0324d9 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:01:35 +0200 Subject: [PATCH 19/36] sci-mathematics/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sci-mathematics/frama-c-aorai/frama-c-aorai-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-aorai/frama-c-aorai-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-aorai/frama-c-aorai-25.0.ebuild | 4 ++-- .../frama-c-callgraph/frama-c-callgraph-23.1.ebuild | 4 ++-- .../frama-c-callgraph/frama-c-callgraph-24.0.ebuild | 4 ++-- .../frama-c-callgraph/frama-c-callgraph-25.0.ebuild | 4 ++-- .../frama-c-constant-folding-23.1.ebuild | 4 ++-- .../frama-c-constant-folding-24.0.ebuild | 4 ++-- .../frama-c-constant-folding-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-dive/frama-c-dive-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-dive/frama-c-dive-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-dive/frama-c-dive-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-e-acsl/frama-c-e-acsl-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-eva/frama-c-eva-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-eva/frama-c-eva-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-eva/frama-c-eva-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-from/frama-c-from-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-from/frama-c-from-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-from/frama-c-from-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-impact/frama-c-impact-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-impact/frama-c-impact-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-impact/frama-c-impact-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-inout/frama-c-inout-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-inout/frama-c-inout-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-inout/frama-c-inout-25.0.ebuild | 4 ++-- .../frama-c-instantiate/frama-c-instantiate-23.1.ebuild | 4 ++-- .../frama-c-instantiate/frama-c-instantiate-24.0.ebuild | 4 ++-- .../frama-c-instantiate/frama-c-instantiate-25.0.ebuild | 4 ++-- .../frama-c-loopanalysis/frama-c-loopanalysis-23.1.ebuild | 4 ++-- .../frama-c-loopanalysis/frama-c-loopanalysis-24.0.ebuild | 4 ++-- .../frama-c-loopanalysis/frama-c-loopanalysis-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-metrics/frama-c-metrics-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-metrics/frama-c-metrics-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-metrics/frama-c-metrics-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-nonterm/frama-c-nonterm-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-nonterm/frama-c-nonterm-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-nonterm/frama-c-nonterm-25.0.ebuild | 4 ++-- .../frama-c-obfuscator/frama-c-obfuscator-23.1.ebuild | 4 ++-- .../frama-c-obfuscator/frama-c-obfuscator-24.0.ebuild | 4 ++-- .../frama-c-obfuscator/frama-c-obfuscator-25.0.ebuild | 4 ++-- .../frama-c-occurrence/frama-c-occurrence-23.1.ebuild | 4 ++-- .../frama-c-occurrence/frama-c-occurrence-24.0.ebuild | 4 ++-- .../frama-c-occurrence/frama-c-occurrence-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-pdg/frama-c-pdg-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-pdg/frama-c-pdg-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-pdg/frama-c-pdg-25.0.ebuild | 4 ++-- .../frama-c-postdominators/frama-c-postdominators-23.1.ebuild | 4 ++-- .../frama-c-postdominators/frama-c-postdominators-24.0.ebuild | 4 ++-- .../frama-c-postdominators/frama-c-postdominators-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-printapi/frama-c-printapi-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-printapi/frama-c-printapi-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-printapi/frama-c-printapi-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-qed/frama-c-qed-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-qed/frama-c-qed-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-qed/frama-c-qed-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-reduc/frama-c-reduc-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-report/frama-c-report-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-report/frama-c-report-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-report/frama-c-report-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-rtegen/frama-c-rtegen-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-rtegen/frama-c-rtegen-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-rtegen/frama-c-rtegen-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-scope/frama-c-scope-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-scope/frama-c-scope-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-scope/frama-c-scope-25.0.ebuild | 4 ++-- .../frama-c-security-slicing-23.1.ebuild | 4 ++-- .../frama-c-security-slicing-24.0.ebuild | 4 ++-- .../frama-c-security-slicing-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-server/frama-c-server-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-server/frama-c-server-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-server/frama-c-server-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-slicing/frama-c-slicing-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-slicing/frama-c-slicing-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-slicing/frama-c-slicing-25.0.ebuild | 4 ++-- .../frama-c-sparecode/frama-c-sparecode-23.1.ebuild | 4 ++-- .../frama-c-sparecode/frama-c-sparecode-24.0.ebuild | 4 ++-- .../frama-c-sparecode/frama-c-sparecode-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-studia/frama-c-studia-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-studia/frama-c-studia-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-studia/frama-c-studia-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-users/frama-c-users-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-users/frama-c-users-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-users/frama-c-users-25.0.ebuild | 4 ++-- sci-mathematics/frama-c-variadic/frama-c-variadic-23.1.ebuild | 4 ++-- sci-mathematics/frama-c-variadic/frama-c-variadic-24.0.ebuild | 4 ++-- sci-mathematics/frama-c-variadic/frama-c-variadic-25.0.ebuild | 4 ++-- sci-mathematics/frama-c/frama-c-23.1-r1.ebuild | 4 ++-- sci-mathematics/frama-c/frama-c-24.0-r1.ebuild | 4 ++-- sci-mathematics/frama-c/frama-c-25.0-r2.ebuild | 4 ++-- .../rstudio-desktop-bin-2023.09.0_p463.ebuild | 4 ++-- .../rstudio-desktop-bin-2023.09.1_p494.ebuild | 4 ++-- 93 files changed, 186 insertions(+), 186 deletions(-) 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 2894df5b71..bcc6251c76 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?] )" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-aorai/frama-c-aorai-24.0.ebuild b/sci-mathematics/frama-c-aorai/frama-c-aorai-24.0.ebuild index 126fcc4d5b..106587043e 100644 --- a/sci-mathematics/frama-c-aorai/frama-c-aorai-24.0.ebuild +++ b/sci-mathematics/frama-c-aorai/frama-c-aorai-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?] )" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-aorai/frama-c-aorai-25.0.ebuild b/sci-mathematics/frama-c-aorai/frama-c-aorai-25.0.ebuild index 03df09abae..2a33e46bf3 100644 --- a/sci-mathematics/frama-c-aorai/frama-c-aorai-25.0.ebuild +++ b/sci-mathematics/frama-c-aorai/frama-c-aorai-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] eva? ( ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?] )" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/aorai" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 0f9b2d0250..34d6e414ab 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ DEPEND="${RDEPEND}" # but is not needed for compilation (and would introduce a mutual dependency) PDEPEND="~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 cb67010978..715aec3e01 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ DEPEND="${RDEPEND}" # but is not needed for compilation (and would introduce a mutual dependency) PDEPEND="~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 f80aba1ff3..fb83c78b1f 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 eb5df5c3b0..fac225c184 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 2c56359bb0..5f3078343e 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 f309af6e12..47760202ba 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-dive/frama-c-dive-23.1.ebuild b/sci-mathematics/frama-c-dive/frama-c-dive-23.1.ebuild index b533f467af..6d6a090d40 100644 --- a/sci-mathematics/frama-c-dive/frama-c-dive-23.1.ebuild +++ b/sci-mathematics/frama-c-dive/frama-c-dive-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-dive/frama-c-dive-24.0.ebuild b/sci-mathematics/frama-c-dive/frama-c-dive-24.0.ebuild index 3f17d93b22..019f572f5f 100644 --- a/sci-mathematics/frama-c-dive/frama-c-dive-24.0.ebuild +++ b/sci-mathematics/frama-c-dive/frama-c-dive-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-dive/frama-c-dive-25.0.ebuild b/sci-mathematics/frama-c-dive/frama-c-dive-25.0.ebuild index 89511a8de1..bdaba02161 100644 --- a/sci-mathematics/frama-c-dive/frama-c-dive-25.0.ebuild +++ b/sci-mathematics/frama-c-dive/frama-c-dive-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/dive" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 cbf36c6b13..a54789d18f 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" + LICENSE="BSD LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 452fd430be..40bdfacc38 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" + LICENSE="BSD LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 0cfc8e0792..b88ba88ed4 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" + LICENSE="BSD LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-rtegen-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/e-acsl" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 f08c928dc8..085313df53 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -26,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?]" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 99444eac92..0769c4f194 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -26,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?]" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 fd0bb906d7..602ab45cda 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 01cdb2ee9d..7456d1285c 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 5678cc5cdd..4596bf8d58 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 675f6f1bd1..479044a32a 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-postdominators-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 b14094e510..9084eac33d 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 7854d7b6e2..d68a5285c4 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 668f7939ca..cd3a4b91e8 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 4ed05de598..e556dddc54 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 392f8e7209..297c2c4fc5 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 c92d13d387..7b836b6c6b 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-23.1.ebuild b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-23.1.ebuild index 50578bd52c..644848948a 100644 --- a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-23.1.ebuild +++ b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-24.0.ebuild b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-24.0.ebuild index 6b748f9c13..4353717f7b 100644 --- a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-24.0.ebuild +++ b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-25.0.ebuild b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-25.0.ebuild index 051fd7d32e..0ecd0a2229 100644 --- a/sci-mathematics/frama-c-instantiate/frama-c-instantiate-25.0.ebuild +++ b/sci-mathematics/frama-c-instantiate/frama-c-instantiate-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/instantiate" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-23.1.ebuild b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-23.1.ebuild index 4886b626c2..b26f689102 100644 --- a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-23.1.ebuild +++ b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-24.0.ebuild b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-24.0.ebuild index bb78022614..5bfe2219ae 100644 --- a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-24.0.ebuild +++ b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-25.0.ebuild b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-25.0.ebuild index fb419cf147..7c9947dc7e 100644 --- a/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-25.0.ebuild +++ b/sci-mathematics/frama-c-loopanalysis/frama-c-loopanalysis-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/loop_analysis" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 b111768466..feacafd828 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 b208703c33..ed40262089 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 02109b9299..f8ba14fed1 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-server-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-23.1.ebuild b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-23.1.ebuild index 908165e94f..b7669ada9e 100644 --- a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-23.1.ebuild +++ b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-24.0.ebuild b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-24.0.ebuild index 23dfd923ba..d0a9385665 100644 --- a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-24.0.ebuild +++ b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-25.0.ebuild b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-25.0.ebuild index aebdb15555..3432922837 100644 --- a/sci-mathematics/frama-c-nonterm/frama-c-nonterm-25.0.ebuild +++ b/sci-mathematics/frama-c-nonterm/frama-c-nonterm-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/nonterm" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-23.1.ebuild b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-23.1.ebuild index 9d1cb998cf..407ddd723c 100644 --- a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-23.1.ebuild +++ b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-24.0.ebuild b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-24.0.ebuild index 9730bbb6f9..9f2a8eca3a 100644 --- a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-24.0.ebuild +++ b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-25.0.ebuild b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-25.0.ebuild index 88d0ead099..29f2bb38dd 100644 --- a/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-25.0.ebuild +++ b/sci-mathematics/frama-c-obfuscator/frama-c-obfuscator-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/obfuscator" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" 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 3ad978ada9..460b24533a 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 ef05597aae..c3efc55f6b 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die 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 760f071278..65bd705b0b 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 @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-pdg/frama-c-pdg-23.1.ebuild b/sci-mathematics/frama-c-pdg/frama-c-pdg-23.1.ebuild index d9bdbdbc3c..b51cc70687 100644 --- a/sci-mathematics/frama-c-pdg/frama-c-pdg-23.1.ebuild +++ b/sci-mathematics/frama-c-pdg/frama-c-pdg-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-pdg/frama-c-pdg-24.0.ebuild b/sci-mathematics/frama-c-pdg/frama-c-pdg-24.0.ebuild index 7a5ba71597..0148f9f92a 100644 --- a/sci-mathematics/frama-c-pdg/frama-c-pdg-24.0.ebuild +++ b/sci-mathematics/frama-c-pdg/frama-c-pdg-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-pdg/frama-c-pdg-25.0.ebuild b/sci-mathematics/frama-c-pdg/frama-c-pdg-25.0.ebuild index 78677ebdf9..78c0795ed4 100644 --- a/sci-mathematics/frama-c-pdg/frama-c-pdg-25.0.ebuild +++ b/sci-mathematics/frama-c-pdg/frama-c-pdg-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-from-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-23.1.ebuild b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-23.1.ebuild index 4cb983633a..cb3f642f5a 100644 --- a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-23.1.ebuild +++ b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-24.0.ebuild b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-24.0.ebuild index 2d729bee1e..51a06371ce 100644 --- a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-24.0.ebuild +++ b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-25.0.ebuild b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-25.0.ebuild index 7186793d40..d599ca7f97 100644 --- a/sci-mathematics/frama-c-postdominators/frama-c-postdominators-25.0.ebuild +++ b/sci-mathematics/frama-c-postdominators/frama-c-postdominators-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-printapi/frama-c-printapi-23.1.ebuild b/sci-mathematics/frama-c-printapi/frama-c-printapi-23.1.ebuild index 73641b67d2..3fb2e0d70f 100644 --- a/sci-mathematics/frama-c-printapi/frama-c-printapi-23.1.ebuild +++ b/sci-mathematics/frama-c-printapi/frama-c-printapi-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-printapi/frama-c-printapi-24.0.ebuild b/sci-mathematics/frama-c-printapi/frama-c-printapi-24.0.ebuild index c48b0f7da0..742f2e3319 100644 --- a/sci-mathematics/frama-c-printapi/frama-c-printapi-24.0.ebuild +++ b/sci-mathematics/frama-c-printapi/frama-c-printapi-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-printapi/frama-c-printapi-25.0.ebuild b/sci-mathematics/frama-c-printapi/frama-c-printapi-25.0.ebuild index 16fd9911bc..3e9b314788 100644 --- a/sci-mathematics/frama-c-printapi/frama-c-printapi-25.0.ebuild +++ b/sci-mathematics/frama-c-printapi/frama-c-printapi-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/print_api" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-qed/frama-c-qed-23.1.ebuild b/sci-mathematics/frama-c-qed/frama-c-qed-23.1.ebuild index 4368d4413c..bc2991f8ce 100644 --- a/sci-mathematics/frama-c-qed/frama-c-qed-23.1.ebuild +++ b/sci-mathematics/frama-c-qed/frama-c-qed-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-qed/frama-c-qed-24.0.ebuild b/sci-mathematics/frama-c-qed/frama-c-qed-24.0.ebuild index c2a9a5fb8b..95a4be160a 100644 --- a/sci-mathematics/frama-c-qed/frama-c-qed-24.0.ebuild +++ b/sci-mathematics/frama-c-qed/frama-c-qed-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-qed/frama-c-qed-25.0.ebuild b/sci-mathematics/frama-c-qed/frama-c-qed-25.0.ebuild index 2f65a4ebbf..593b035c02 100644 --- a/sci-mathematics/frama-c-qed/frama-c-qed-25.0.ebuild +++ b/sci-mathematics/frama-c-qed/frama-c-qed-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/qed" - src_compile() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-reduc/frama-c-reduc-25.0.ebuild b/sci-mathematics/frama-c-reduc/frama-c-reduc-25.0.ebuild index ac1bbcfda2..cfe8234c72 100644 --- a/sci-mathematics/frama-c-reduc/frama-c-reduc-25.0.ebuild +++ b/sci-mathematics/frama-c-reduc/frama-c-reduc-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-inout-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-report/frama-c-report-23.1.ebuild b/sci-mathematics/frama-c-report/frama-c-report-23.1.ebuild index 51f8479e72..71c4b9bbcf 100644 --- a/sci-mathematics/frama-c-report/frama-c-report-23.1.ebuild +++ b/sci-mathematics/frama-c-report/frama-c-report-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-report/frama-c-report-24.0.ebuild b/sci-mathematics/frama-c-report/frama-c-report-24.0.ebuild index 21ca892ea4..8b539f8bc5 100644 --- a/sci-mathematics/frama-c-report/frama-c-report-24.0.ebuild +++ b/sci-mathematics/frama-c-report/frama-c-report-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-report/frama-c-report-25.0.ebuild b/sci-mathematics/frama-c-report/frama-c-report-25.0.ebuild index 053c9f8331..9c365cb6eb 100644 --- a/sci-mathematics/frama-c-report/frama-c-report-25.0.ebuild +++ b/sci-mathematics/frama-c-report/frama-c-report-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/report" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-23.1.ebuild b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-23.1.ebuild index 2dc5703eb4..fec53e9773 100644 --- a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-23.1.ebuild +++ b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-24.0.ebuild b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-24.0.ebuild index e59883c3ef..fa7af032c9 100644 --- a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-24.0.ebuild +++ b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-25.0.ebuild b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-25.0.ebuild index ef18fc0cdc..a045b2c220 100644 --- a/sci-mathematics/frama-c-rtegen/frama-c-rtegen-25.0.ebuild +++ b/sci-mathematics/frama-c-rtegen/frama-c-rtegen-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-scope/frama-c-scope-23.1.ebuild b/sci-mathematics/frama-c-scope/frama-c-scope-23.1.ebuild index f8b4f03ed2..e2c293d0fd 100644 --- a/sci-mathematics/frama-c-scope/frama-c-scope-23.1.ebuild +++ b/sci-mathematics/frama-c-scope/frama-c-scope-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-scope/frama-c-scope-24.0.ebuild b/sci-mathematics/frama-c-scope/frama-c-scope-24.0.ebuild index b389883698..671d47bc5a 100644 --- a/sci-mathematics/frama-c-scope/frama-c-scope-24.0.ebuild +++ b/sci-mathematics/frama-c-scope/frama-c-scope-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-scope/frama-c-scope-25.0.ebuild b/sci-mathematics/frama-c-scope/frama-c-scope-25.0.ebuild index aeebbb6146..543c8ff563 100644 --- a/sci-mathematics/frama-c-scope/frama-c-scope-25.0.ebuild +++ b/sci-mathematics/frama-c-scope/frama-c-scope-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-inout-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-23.1.ebuild b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-23.1.ebuild index 4de77ed9f4..456544fb24 100644 --- a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-23.1.ebuild +++ b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-24.0.ebuild b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-24.0.ebuild index 1c1a58aeed..9d999880cd 100644 --- a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-24.0.ebuild +++ b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-25.0.ebuild b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-25.0.ebuild index 3f9993bd79..4cf22ff95b 100644 --- a/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-25.0.ebuild +++ b/sci-mathematics/frama-c-security-slicing/frama-c-security-slicing-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk,ocamlopt?] ~sci-mathematics/frama-c-slicing-${PV}:=[gtk,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/security_slicing" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-server/frama-c-server-23.1.ebuild b/sci-mathematics/frama-c-server/frama-c-server-23.1.ebuild index b80b490740..b8243bf1be 100644 --- a/sci-mathematics/frama-c-server/frama-c-server-23.1.ebuild +++ b/sci-mathematics/frama-c-server/frama-c-server-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-server/frama-c-server-24.0.ebuild b/sci-mathematics/frama-c-server/frama-c-server-24.0.ebuild index 58f653cd40..77bed37385 100644 --- a/sci-mathematics/frama-c-server/frama-c-server-24.0.ebuild +++ b/sci-mathematics/frama-c-server/frama-c-server-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-server/frama-c-server-25.0.ebuild b/sci-mathematics/frama-c-server/frama-c-server-25.0.ebuild index f823304f50..2fb41db7e1 100644 --- a/sci-mathematics/frama-c-server/frama-c-server-25.0.ebuild +++ b/sci-mathematics/frama-c-server/frama-c-server-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/server" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-slicing/frama-c-slicing-23.1.ebuild b/sci-mathematics/frama-c-slicing/frama-c-slicing-23.1.ebuild index 9ff847d093..d9e618c25d 100644 --- a/sci-mathematics/frama-c-slicing/frama-c-slicing-23.1.ebuild +++ b/sci-mathematics/frama-c-slicing/frama-c-slicing-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-sparecode-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-slicing/frama-c-slicing-24.0.ebuild b/sci-mathematics/frama-c-slicing/frama-c-slicing-24.0.ebuild index 8bd55915a6..efbc708d0f 100644 --- a/sci-mathematics/frama-c-slicing/frama-c-slicing-24.0.ebuild +++ b/sci-mathematics/frama-c-slicing/frama-c-slicing-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-sparecode-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-slicing/frama-c-slicing-25.0.ebuild b/sci-mathematics/frama-c-slicing/frama-c-slicing-25.0.ebuild index 330825f9e6..2928ef4d45 100644 --- a/sci-mathematics/frama-c-slicing/frama-c-slicing-25.0.ebuild +++ b/sci-mathematics/frama-c-slicing/frama-c-slicing-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-sparecode-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-23.1.ebuild b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-23.1.ebuild index 0c8e2f2d9a..0a70535f43 100644 --- a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-23.1.ebuild +++ b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-users-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-24.0.ebuild b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-24.0.ebuild index ddd530a0ad..a6e148859a 100644 --- a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-24.0.ebuild +++ b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -22,8 +24,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-users-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-25.0.ebuild b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-25.0.ebuild index cebb908feb..00120404b6 100644 --- a/sci-mathematics/frama-c-sparecode/frama-c-sparecode-25.0.ebuild +++ b/sci-mathematics/frama-c-sparecode/frama-c-sparecode-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -23,8 +25,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-users-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-studia/frama-c-studia-23.1.ebuild b/sci-mathematics/frama-c-studia/frama-c-studia-23.1.ebuild index 2fbc601030..3783e4d638 100644 --- a/sci-mathematics/frama-c-studia/frama-c-studia-23.1.ebuild +++ b/sci-mathematics/frama-c-studia/frama-c-studia-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-studia/frama-c-studia-24.0.ebuild b/sci-mathematics/frama-c-studia/frama-c-studia-24.0.ebuild index cdfb4af570..c3ca960ec2 100644 --- a/sci-mathematics/frama-c-studia/frama-c-studia-24.0.ebuild +++ b/sci-mathematics/frama-c-studia/frama-c-studia-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-studia/frama-c-studia-25.0.ebuild b/sci-mathematics/frama-c-studia/frama-c-studia-25.0.ebuild index f1c9ef0d30..467b21b970 100644 --- a/sci-mathematics/frama-c-studia/frama-c-studia-25.0.ebuild +++ b/sci-mathematics/frama-c-studia/frama-c-studia-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[gtk=,ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[gtk=,ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/studia" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-users/frama-c-users-23.1.ebuild b/sci-mathematics/frama-c-users/frama-c-users-23.1.ebuild index d44b8f5763..8f3e9dacbd 100644 --- a/sci-mathematics/frama-c-users/frama-c-users-23.1.ebuild +++ b/sci-mathematics/frama-c-users/frama-c-users-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-users/frama-c-users-24.0.ebuild b/sci-mathematics/frama-c-users/frama-c-users-24.0.ebuild index 6ed4b17eb3..89ad080754 100644 --- a/sci-mathematics/frama-c-users/frama-c-users-24.0.ebuild +++ b/sci-mathematics/frama-c-users/frama-c-users-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-users/frama-c-users-25.0.ebuild b/sci-mathematics/frama-c-users/frama-c-users-25.0.ebuild index a1cc117a6d..6ac2054e07 100644 --- a/sci-mathematics/frama-c-users/frama-c-users-25.0.ebuild +++ b/sci-mathematics/frama-c-users/frama-c-users-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -21,8 +23,6 @@ RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?] ~sci-mathematics/frama-c-eva-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c-variadic/frama-c-variadic-23.1.ebuild b/sci-mathematics/frama-c-variadic/frama-c-variadic-23.1.ebuild index 59b6fdab79..9aff55411e 100644 --- a/sci-mathematics/frama-c-variadic/frama-c-variadic-23.1.ebuild +++ b/sci-mathematics/frama-c-variadic/frama-c-variadic-23.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-variadic/frama-c-variadic-24.0.ebuild b/sci-mathematics/frama-c-variadic/frama-c-variadic-24.0.ebuild index 3c42697bfa..13f3ca0005 100644 --- a/sci-mathematics/frama-c-variadic/frama-c-variadic-24.0.ebuild +++ b/sci-mathematics/frama-c-variadic/frama-c-variadic-24.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c-variadic/frama-c-variadic-25.0.ebuild b/sci-mathematics/frama-c-variadic/frama-c-variadic-25.0.ebuild index 8bd2074aa0..a2e4d73ed3 100644 --- a/sci-mathematics/frama-c-variadic/frama-c-variadic-25.0.ebuild +++ b/sci-mathematics/frama-c-variadic/frama-c-variadic-25.0.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/frama-c-${PV}-${NAME}.tar.gz" +S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" + LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -19,8 +21,6 @@ RESTRICT="strip" RDEPEND="~sci-mathematics/frama-c-${PV}:=[ocamlopt?]" DEPEND="${RDEPEND}" -S="${WORKDIR}/frama-c-${PV}-${NAME}/src/plugins/variadic" - src_prepare() { export FRAMAC_SHARE="${ESYSROOT}/usr/share/frama-c" export FRAMAC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/frama-c" diff --git a/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild b/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild index 10569e819b..001a60281a 100644 --- a/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild +++ b/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Vanadium" SRC_URI="https://frama-c.com/download/${P}-${NAME}.tar.gz" +S="${WORKDIR}/${P}-${NAME}" + LICENSE="BSD LGPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -25,8 +27,6 @@ RDEPEND=" DEPEND="${RDEPEND} media-gfx/graphviz" -S="${WORKDIR}/${P}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild b/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild index 8d7b3ee3f7..204463ac89 100644 --- a/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild +++ b/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Chromium" SRC_URI="https://frama-c.com/download/${P}-${NAME}.tar.gz" +S="${WORKDIR}/${P}-${NAME}" + LICENSE="BSD LGPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -25,8 +27,6 @@ RDEPEND=" DEPEND="${RDEPEND} media-gfx/graphviz" -S="${WORKDIR}/${P}-${NAME}" - PATCHES=( "${FILESDIR}/frama-c-24.0-fix-bflags.patch" ) src_prepare() { diff --git a/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild b/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild index 5356f31fbd..0b34d7e195 100644 --- a/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild +++ b/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://frama-c.com" NAME="Manganese" SRC_URI="https://frama-c.com/download/${P}-${NAME}.tar.gz" +S="${WORKDIR}/${P}-${NAME}" + LICENSE="BSD LGPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64" @@ -27,8 +29,6 @@ RDEPEND=" DEPEND="${RDEPEND} media-gfx/graphviz" -S="${WORKDIR}/${P}-${NAME}" - src_prepare() { mv configure.in configure.ac || die sed -i 's/configure\.in/configure.ac/g' Makefile.generating Makefile || die diff --git a/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.0_p463.ebuild b/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.0_p463.ebuild index 895f238dd1..48714d2411 100644 --- a/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.0_p463.ebuild +++ b/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.0_p463.ebuild @@ -17,6 +17,8 @@ DESCRIPTION="IDE for R and Python" HOMEPAGE="https://posit.co" SRC_URI="https://download1.rstudio.org/electron/rhel8/x86_64/${MY_PN}-${PV/_p/-}-x86_64.rpm" +S="${WORKDIR}/usr/lib/${MY_PN}" + LICENSE="AGPL-3" SLOT="0" KEYWORDS="-* ~amd64" @@ -79,8 +81,6 @@ QA_PREBUILT=" CONFIG_CHECK="~USER_NS" -S="${WORKDIR}/usr/lib/${MY_PN}" - src_configure() { default chromium_suid_sandbox_check_kernel_config diff --git a/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.1_p494.ebuild b/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.1_p494.ebuild index f12e569269..7e36b6a7df 100644 --- a/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.1_p494.ebuild +++ b/sci-mathematics/rstudio-desktop-bin/rstudio-desktop-bin-2023.09.1_p494.ebuild @@ -17,6 +17,8 @@ DESCRIPTION="IDE for R and Python" HOMEPAGE="https://posit.co" SRC_URI="https://download1.rstudio.org/electron/rhel8/x86_64/${MY_PN}-${PV/_p/-}-x86_64.rpm" +S="${WORKDIR}/usr/lib/${MY_PN}" + LICENSE="AGPL-3" SLOT="0" KEYWORDS="-* ~amd64" @@ -79,8 +81,6 @@ QA_PREBUILT=" CONFIG_CHECK="~USER_NS" -S="${WORKDIR}/usr/lib/${MY_PN}" - src_configure() { default chromium_suid_sandbox_check_kernel_config From b3a76199a2cf0ebb7b832f0611ae08e0f4ee922e Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:03:34 +0200 Subject: [PATCH 20/36] sci-misc/boinc-wrapper: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild index 6142c048cf..e388e52a28 100644 --- a/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild +++ b/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="Wrapper to use non-BOINC apps with BOINC" HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp" SRC_URI="https://github.com/BOINC/boinc/archive/refs/tags/wrapper/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm64 ~x86" LICENSE="Info-ZIP LGPL-3+ regexp-UofT" SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" # libboinc-api dependencies # no subslot, because "-Wl,--as-needed" removes them From ad3cd174f419fafe74ab66405cf31f1c2902dbe3 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:33:59 +0200 Subject: [PATCH 21/36] sys-apps/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-apps/bat-extras/bat-extras-2023.09.19.ebuild | 2 -- sys-apps/fchroot/fchroot-0.1.2.ebuild | 3 ++- sys-apps/openSeaChest/openSeaChest-23.03.1.ebuild | 2 +- sys-apps/openSeaChest/openSeaChest-23.12.ebuild | 2 +- sys-apps/ov/ov-0.32.0.ebuild | 4 ++-- sys-apps/pnpm-bin/pnpm-bin-9.0.6.ebuild | 7 +++---- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild index f0c500214b..c89742c14c 100644 --- a/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild +++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild @@ -38,8 +38,6 @@ RDEPEND=" virtual/rust[rustfmt(+)] " -S="${WORKDIR}/${P}" - src_unpack() { default if [[ ${PV} == *9999 ]]; then diff --git a/sys-apps/fchroot/fchroot-0.1.2.ebuild b/sys-apps/fchroot/fchroot-0.1.2.ebuild index 9c5b93bd92..f42c6f55b3 100644 --- a/sys-apps/fchroot/fchroot-0.1.2.ebuild +++ b/sys-apps/fchroot/fchroot-0.1.2.ebuild @@ -10,11 +10,12 @@ inherit distutils-r1 pypi DESCRIPTION="Funtoo's franken-chroot tool - chroot from AMD64 to ARM system" HOMEPAGE="https://code.funtoo.org/bitbucket/users/drobbins/repos/fchroot/browse" -RESTRICT="mirror test" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" +RESTRICT="mirror test" + RDEPEND=" ${PYTHON_DEPS} app-emulation/qemu[qemu_user_targets_aarch64,qemu_user_targets_arm,static-user] diff --git a/sys-apps/openSeaChest/openSeaChest-23.03.1.ebuild b/sys-apps/openSeaChest/openSeaChest-23.03.1.ebuild index 8a087598c1..977e43a0d9 100644 --- a/sys-apps/openSeaChest/openSeaChest-23.03.1.ebuild +++ b/sys-apps/openSeaChest/openSeaChest-23.03.1.ebuild @@ -8,7 +8,7 @@ inherit meson DESCRIPTION="SeaGate's open source harddrive control utilities" HOMEPAGE="https://github.com/Seagate/openSeaChest" SRC_URI="https://github.com/Seagate/openSeaChest/releases/download/v${PV}/SourceCode_With_Submodules.tar.xz -> openSeaChest-v${PV}.tar.xz" +S="${WORKDIR}/openSeaChest-v${PV}" LICENSE="MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64" -S="${WORKDIR}/openSeaChest-v${PV}" diff --git a/sys-apps/openSeaChest/openSeaChest-23.12.ebuild b/sys-apps/openSeaChest/openSeaChest-23.12.ebuild index 8a087598c1..977e43a0d9 100644 --- a/sys-apps/openSeaChest/openSeaChest-23.12.ebuild +++ b/sys-apps/openSeaChest/openSeaChest-23.12.ebuild @@ -8,7 +8,7 @@ inherit meson DESCRIPTION="SeaGate's open source harddrive control utilities" HOMEPAGE="https://github.com/Seagate/openSeaChest" SRC_URI="https://github.com/Seagate/openSeaChest/releases/download/v${PV}/SourceCode_With_Submodules.tar.xz -> openSeaChest-v${PV}.tar.xz" +S="${WORKDIR}/openSeaChest-v${PV}" LICENSE="MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64" -S="${WORKDIR}/openSeaChest-v${PV}" diff --git a/sys-apps/ov/ov-0.32.0.ebuild b/sys-apps/ov/ov-0.32.0.ebuild index 501cdca535..5f6f16bfbc 100644 --- a/sys-apps/ov/ov-0.32.0.ebuild +++ b/sys-apps/ov/ov-0.32.0.ebuild @@ -9,12 +9,12 @@ DESCRIPTION="Feature-rich terminal pager" HOMEPAGE="https://github.com/noborus/ov" SRC_URI="https://github.com/noborus/${PN}/releases/download/v${PV}/${P}.tar.gz" +S="${WORKDIR}" + LICENSE="MIT Apache-2.0 BSD-2 BSD MPL-2.0" SLOT="0" KEYWORDS="~amd64" -S="${WORKDIR}" - src_compile() { ego build -v -x -o ${PN} -ldflags="-X main.Version=${PV}" edo ./ov --config ov.yaml --completion fish > ov.fish diff --git a/sys-apps/pnpm-bin/pnpm-bin-9.0.6.ebuild b/sys-apps/pnpm-bin/pnpm-bin-9.0.6.ebuild index 4f3f2f23f5..e5a0811728 100644 --- a/sys-apps/pnpm-bin/pnpm-bin-9.0.6.ebuild +++ b/sys-apps/pnpm-bin/pnpm-bin-9.0.6.ebuild @@ -5,17 +5,16 @@ EAPI=8 DESCRIPTION="Fast, disk space efficient package manager, alternative to npm and yarn" HOMEPAGE="https://pnpm.io" - SRC_URI="https://github.com/pnpm/pnpm/releases/download/v${PV}/pnpm-linux-x64" -KEYWORDS="~amd64" + +S="${WORKDIR}" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64" RESTRICT="strip" -S="${WORKDIR}" - QA_PREBUILT="usr/bin/${PN}" src_install() { From 760f98e72f05bea490db747104f26b89f23edffe Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:35:15 +0200 Subject: [PATCH 22/36] sys-cluster/genders: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-cluster/genders/genders-1.28.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/genders/genders-1.28.1-r1.ebuild b/sys-cluster/genders/genders-1.28.1-r1.ebuild index 6095f48c28..5feff10d36 100644 --- a/sys-cluster/genders/genders-1.28.1-r1.ebuild +++ b/sys-cluster/genders/genders-1.28.1-r1.ebuild @@ -17,10 +17,11 @@ HOMEPAGE="https://github.com/chaos/genders" SRC_URI="https://github.com/chaos/${PN}/archive/${MY_P}.tar.gz" S="${WORKDIR}/${PN}-${MY_P}" -KEYWORDS="~amd64" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64" IUSE="cxx java perl python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND=" perl? ( dev-lang/perl:= ) @@ -41,7 +42,6 @@ BDEPEND=" ) " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( README TUTORIAL NEWS ) PATCHES=( "${FILESDIR}/${PN}-1.28.1-gcc14.patch" ) From 893f965dff579e073c6624d07f995614701b6776 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:36:02 +0200 Subject: [PATCH 23/36] sys-firmware/pinephone-firmware: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- .../pinephone-firmware/pinephone-firmware-20210809.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild b/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild index 68cc0db1d2..f992669bfc 100644 --- a/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild +++ b/sys-firmware/pinephone-firmware/pinephone-firmware-20210809.ebuild @@ -10,12 +10,12 @@ https://xff.cz/git/linux-firmware/tree/anx7688-fw.bin?id=4ec2645b007ba4c3f2962e3 https://xff.cz/git/linux-firmware/tree/rtl_bt/rtl8723cs_xx_fw.bin?id=4ec2645b007ba4c3f2962e38b50c06f274abbf7c -> rtl8723cs_xx-fw.bin " +S="${WORKDIR}" + LICENSE="linux-fw-redistributable no-source-code" SLOT="0" KEYWORDS="~amd64 ~arm64" -S="${WORKDIR}" - src_install() { mkdir -p "${D}"/lib/firmware/ || die insinto /lib/firmware/ From b7346d34615978a5c991057c582ef4edfb120ccf Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:41:54 +0200 Subject: [PATCH 24/36] sys-fs/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild | 8 ++++---- sys-fs/diskonaut/diskonaut-0.10.0.ebuild | 2 +- sys-fs/diskonaut/diskonaut-0.11.0.ebuild | 2 +- sys-fs/diskonaut/diskonaut-9999.ebuild | 2 +- sys-fs/dwarfs/dwarfs-0.9.6.ebuild | 6 ++++-- sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.1.1.ebuild | 7 +++---- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild index bd96db154d..55d34280ed 100644 --- a/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild +++ b/sys-fs/ddrescueview/ddrescueview-0.4.5.ebuild @@ -11,20 +11,20 @@ DESCRIPTION="Graphical viewer for GNU ddrescue mapfiles" HOMEPAGE="https://sourceforge.net/projects/ddrescueview/" SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" +RESTRICT="strip" + BDEPEND="dev-lang/lazarus" # Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it. QA_FLAGS_IGNORED="usr/bin/ddrescueview" QA_PRESTRIPPED="${QA_FLAGS_IGNORED}" -RESTRICT="strip" - -S="${WORKDIR}/${MY_P}" - src_compile() { cd source || die edo lazbuild \ diff --git a/sys-fs/diskonaut/diskonaut-0.10.0.ebuild b/sys-fs/diskonaut/diskonaut-0.10.0.ebuild index 86d07b8c61..1b5a54cc33 100644 --- a/sys-fs/diskonaut/diskonaut-0.10.0.ebuild +++ b/sys-fs/diskonaut/diskonaut-0.10.0.ebuild @@ -107,9 +107,9 @@ else KEYWORDS="~amd64" fi -RESTRICT="mirror" LICENSE="MIT" SLOT="0" +RESTRICT="mirror" QA_FLAGS_IGNORED="usr/bin/diskonaut" diff --git a/sys-fs/diskonaut/diskonaut-0.11.0.ebuild b/sys-fs/diskonaut/diskonaut-0.11.0.ebuild index d6ea290b47..5d22063829 100644 --- a/sys-fs/diskonaut/diskonaut-0.11.0.ebuild +++ b/sys-fs/diskonaut/diskonaut-0.11.0.ebuild @@ -115,9 +115,9 @@ else KEYWORDS="~amd64" fi -RESTRICT="mirror" LICENSE="MIT" SLOT="0" +RESTRICT="mirror" QA_FLAGS_IGNORED="usr/bin/diskonaut" diff --git a/sys-fs/diskonaut/diskonaut-9999.ebuild b/sys-fs/diskonaut/diskonaut-9999.ebuild index d6ea290b47..5d22063829 100644 --- a/sys-fs/diskonaut/diskonaut-9999.ebuild +++ b/sys-fs/diskonaut/diskonaut-9999.ebuild @@ -115,9 +115,9 @@ else KEYWORDS="~amd64" fi -RESTRICT="mirror" LICENSE="MIT" SLOT="0" +RESTRICT="mirror" QA_FLAGS_IGNORED="usr/bin/diskonaut" diff --git a/sys-fs/dwarfs/dwarfs-0.9.6.ebuild b/sys-fs/dwarfs/dwarfs-0.9.6.ebuild index 533766758b..42bdd10ad7 100644 --- a/sys-fs/dwarfs/dwarfs-0.9.6.ebuild +++ b/sys-fs/dwarfs/dwarfs-0.9.6.ebuild @@ -11,12 +11,15 @@ DESCRIPTION="A fast very high compression read-only FUSE file system" HOMEPAGE="https://github.com/mhx/dwarfs" SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.xz" +S="${WORKDIR}/dwarfs-${PV}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="+jemalloc test man" #Tests is broken at this moment # See https://github.com/mhx/dwarfs/issues/194 -S="${WORKDIR}/dwarfs-${PV}" + +RESTRICT="!test? ( test )" RDEPEND=" app-arch/brotli @@ -58,7 +61,6 @@ BDEPEND=" " DOCS=( "README.md" "CHANGES.md" "TODO" ) -RESTRICT="!test? ( test )" CHECKREQS_DISK_BUILD="1300M" CMAKE_IN_SOURCE_BUILD=1 diff --git a/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.1.1.ebuild b/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.1.1.ebuild index 19f5ca2ec1..c922a6daca 100644 --- a/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.1.1.ebuild +++ b/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.1.1.ebuild @@ -5,19 +5,18 @@ EAPI=8 DESCRIPTION="Fuse for AWS S3 (Simple Storage Service), official" HOMEPAGE="https://github.com/awslabs/mountpoint-s3" - SRC_URI="https://s3.amazonaws.com/mountpoint-s3-release/${PV}/x86_64/mount-s3-${PV}-x86_64.tar.gz" -KEYWORDS="~amd64" + +S="${WORKDIR}" LICENSE="Apache-2.0" # Dependent crate licenses LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT openssl Unicode-DFS-2016 ZLIB" SLOT="0" +KEYWORDS="~amd64" RDEPEND="sys-fs/fuse:0" -S="${WORKDIR}" - QA_PREBUILT="/usr/bin/${PN}" src_install() { From 5242e245bdc70adc3e6f4314f67a0b4bd0692d40 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:44:35 +0200 Subject: [PATCH 25/36] sys-boot/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- .../customrescuecd-x86-grub-0.1.ebuild | 5 ++--- .../customrescuecd-x86_64-grub-0.1.ebuild | 5 ++--- sys-boot/mkusb/mkusb-23.2.0.ebuild | 6 +++--- sys-boot/ventoy-bin/ventoy-bin-1.0.97.ebuild | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild b/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild index 87c6a8e961..2b35cd8356 100644 --- a/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild +++ b/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild @@ -5,14 +5,13 @@ EAPI=7 DESCRIPTION="Grub menu entries for the .iso image of customrescuecd" HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" -SRC_URI="" + +S="${WORKDIR}" LICENSE="GPL-2" SLOT=0 KEYWORDS="~x86" -S=${WORKDIR} - RDEPEND="app-admin/customrescuecd-x86 sys-boot/grub" diff --git a/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild b/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild index 2599fdd71f..8c86237c65 100644 --- a/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild +++ b/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild @@ -5,14 +5,13 @@ EAPI=7 DESCRIPTION="Grub menu entries for the .iso image of customrescuecd" HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" -SRC_URI="" + +S="${WORKDIR}" LICENSE="GPL-2" SLOT=0 KEYWORDS="~amd64" -S=${WORKDIR} - RDEPEND="app-admin/customrescuecd-x86_64 sys-boot/grub" diff --git a/sys-boot/mkusb/mkusb-23.2.0.ebuild b/sys-boot/mkusb/mkusb-23.2.0.ebuild index d13c1a2ff6..aa7fbf5998 100644 --- a/sys-boot/mkusb/mkusb-23.2.0.ebuild +++ b/sys-boot/mkusb/mkusb-23.2.0.ebuild @@ -19,13 +19,11 @@ SRC_URI=" S="${WORKDIR}" -SLOT="0" - LICENSE="GPL-3" +SLOT="0" KEYWORDS="~amd64" RESTRICT="strip" -QA_PREBUILT="*" # REQUIRES_EXCLUDE="libcef.so" # Already inside RDEPEND=" @@ -37,6 +35,8 @@ RDEPEND=" " # About sys-fs/ntfs3g see my issue to make this dep optionsl https://bugs.launchpad.net/mkusb/+bug/2058962 +QA_PREBUILT="*" + src_unpack() { unpack_deb "$DISTDIR/$P-common.deb" unpack_deb "$DISTDIR/$P.deb" diff --git a/sys-boot/ventoy-bin/ventoy-bin-1.0.97.ebuild b/sys-boot/ventoy-bin/ventoy-bin-1.0.97.ebuild index 678803b8f6..5a68a99201 100644 --- a/sys-boot/ventoy-bin/ventoy-bin-1.0.97.ebuild +++ b/sys-boot/ventoy-bin/ventoy-bin-1.0.97.ebuild @@ -9,12 +9,13 @@ DESCRIPTION="Creator of bootable USBs, with ability to copy ISOs, persistence st HOMEPAGE="http://www.ventoy.net" SRC_URI="https://github.com/ventoy/Ventoy/releases/download/v${PV}/ventoy-${PV}-linux.tar.gz" +S="${WORKDIR}"/ventoy-${PV} + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" RESTRICT="strip mirror" -QA_PREBUILT="*" # Against "does not respect LDFLAGS" DEPEND=" sys-fs/dosfstools @@ -23,7 +24,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -S=${WORKDIR}/ventoy-${PV} +QA_PREBUILT="*" # Against "does not respect LDFLAGS" CARCH="x86_64" From 2c446930f0af6dd0677ee671046ae513af24176d Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:48:36 +0200 Subject: [PATCH 26/36] sys-libs/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild | 7 +++---- sys-libs/cyclonedds/cyclonedds-9999.ebuild | 7 +++---- sys-libs/gcompat/gcompat-1.1.0.ebuild | 6 +++--- sys-libs/nss-tls/nss-tls-1.0.ebuild | 6 +++--- sys-libs/nss-tls/nss-tls-9999.ebuild | 15 +++++++-------- .../solo-udev-rules/solo-udev-rules-4.1.5.ebuild | 4 ++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild index 8d0db9c61c..b1e0bed51e 100644 --- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild @@ -5,6 +5,9 @@ EAPI=8 inherit cmake +DESCRIPTION="Eclipse Cyclone DDS project" +HOMEPAGE="https://cyclonedds.io/" + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git" inherit git-r3 @@ -13,10 +16,6 @@ else KEYWORDS="~amd64" fi -S="${WORKDIR}/${P}" -DESCRIPTION="Eclipse Cyclone DDS project" -HOMEPAGE="https://cyclonedds.io/" - LICENSE="EPL-2.0" SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild index 8d0db9c61c..b1e0bed51e 100644 --- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild @@ -5,6 +5,9 @@ EAPI=8 inherit cmake +DESCRIPTION="Eclipse Cyclone DDS project" +HOMEPAGE="https://cyclonedds.io/" + if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/eclipse-cyclonedds/cyclonedds.git" inherit git-r3 @@ -13,10 +16,6 @@ else KEYWORDS="~amd64" fi -S="${WORKDIR}/${P}" -DESCRIPTION="Eclipse Cyclone DDS project" -HOMEPAGE="https://cyclonedds.io/" - LICENSE="EPL-2.0" SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" diff --git a/sys-libs/gcompat/gcompat-1.1.0.ebuild b/sys-libs/gcompat/gcompat-1.1.0.ebuild index 6e5d56674c..9479681985 100644 --- a/sys-libs/gcompat/gcompat-1.1.0.ebuild +++ b/sys-libs/gcompat/gcompat-1.1.0.ebuild @@ -7,11 +7,11 @@ inherit multilib-minimal flag-o-matic DESCRIPTION="The GNU C Library compatibility layer for musl" HOMEPAGE="https://git.adelielinux.org/adelie/gcompat" -KEYWORDS="~amd64 ~x86" -LICENSE="UoI-NCSA" -IUSE="libucontext obstack" SRC_URI="https://distfiles.adelielinux.org/source/${PN}/${P}.tar.xz" +LICENSE="UoI-NCSA" SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libucontext obstack" DEPEND=" libucontext? ( sys-libs/libucontext ) diff --git a/sys-libs/nss-tls/nss-tls-1.0.ebuild b/sys-libs/nss-tls/nss-tls-1.0.ebuild index 31fa1f2c5b..ab641fd2d6 100644 --- a/sys-libs/nss-tls/nss-tls-1.0.ebuild +++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild @@ -3,16 +3,16 @@ EAPI=7 +inherit meson systemd + DESCRIPTION="A DNS over HTTPS resolver for glibc" HOMEPAGE="https://github.com/dimkr/nss-tls" SRC_URI="https://github.com/dimkr/nss-tls/archive/v${PV}.tar.gz -> ${P}.tar.gz" -inherit meson systemd - LICENSE="LGPL-2.1" +SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="systemd" -SLOT="0" RDEPEND="dev-libs/glib net-libs/libsoup" diff --git a/sys-libs/nss-tls/nss-tls-9999.ebuild b/sys-libs/nss-tls/nss-tls-9999.ebuild index 6e215c7336..10fdecdadc 100644 --- a/sys-libs/nss-tls/nss-tls-9999.ebuild +++ b/sys-libs/nss-tls/nss-tls-9999.ebuild @@ -3,16 +3,18 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git" -DESCRIPTION="A DNS over HTTPS resolver for glibc" -HOMEPAGE="https://github.com/dimkr/nss-tls" - inherit git-r3 meson systemd +DESCRIPTION="A DNS over HTTPS resolver for glibc" +HOMEPAGE="https://github.com/dimkr/nss-tls" +EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git" +EGIT_BRANCH="master" + S="${WORKDIR}/${PN}-9999" + LICENSE="LGPL-2.1" -IUSE="systemd" SLOT="0" +IUSE="systemd" RDEPEND="dev-libs/glib net-libs/libsoup" @@ -24,9 +26,6 @@ BDEPEND=" dev-build/meson " -EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git" -EGIT_BRANCH="master" - src_prepare() { default sed -e "s/@0@\/run\/nss-tls/\/var\/run\/nss-tls/" -i "${S}"/meson.build || die diff --git a/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild b/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild index 6abd111d3e..ae63e3e8d0 100644 --- a/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild +++ b/sys-libs/solo-udev-rules/solo-udev-rules-4.1.5.ebuild @@ -13,6 +13,8 @@ HOMEPAGE=" " SRC_URI="https://github.com/solokeys/solo1/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="|| ( Apache-2.0 MIT )" SLOT="0" KEYWORDS="~amd64" @@ -20,8 +22,6 @@ KEYWORDS="~amd64" RDEPEND="virtual/udev" DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" - src_compile() { # Omitting src_compile() would invoke make, leaving it empty is not allowed. : From d54b91e8e0865b5e9afbe7c5b9ebb25914f9afa7 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:50:09 +0200 Subject: [PATCH 27/36] sys-power/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-power/auto-cpufreq/auto-cpufreq-1.9.6.ebuild | 2 +- sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild | 2 +- sys-power/auto-cpufreq/auto-cpufreq-2.1.0.ebuild | 2 +- sys-power/envycontrol/envycontrol-3.4.0.ebuild | 3 +-- sys-power/fan2go/fan2go-0.8.1.ebuild | 2 +- sys-power/gtherm/gtherm-0.0.3.ebuild | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-power/auto-cpufreq/auto-cpufreq-1.9.6.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-1.9.6.ebuild index 5e0b16b7b4..0d5cde33e7 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-1.9.6.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-1.9.6.ebuild @@ -14,8 +14,8 @@ HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~amd64" SLOT="0" +KEYWORDS="~amd64" IUSE="systemd" RDEPEND=" diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild index ea80f8e18d..dddb0042bf 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.1.0-r1.ebuild @@ -14,8 +14,8 @@ HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~amd64" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" dev-python/click[${PYTHON_USEDEP}] diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.1.0.ebuild index ba46f6a706..58fc669425 100644 --- a/sys-power/auto-cpufreq/auto-cpufreq-2.1.0.ebuild +++ b/sys-power/auto-cpufreq/auto-cpufreq-2.1.0.ebuild @@ -14,8 +14,8 @@ HOMEPAGE="https://github.com/AdnanHodzic/auto-cpufreq" SRC_URI="https://github.com/AdnanHodzic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="~amd64" SLOT="0" +KEYWORDS="~amd64" IUSE="systemd" RDEPEND=" diff --git a/sys-power/envycontrol/envycontrol-3.4.0.ebuild b/sys-power/envycontrol/envycontrol-3.4.0.ebuild index 8108e4e67f..48a69ab049 100644 --- a/sys-power/envycontrol/envycontrol-3.4.0.ebuild +++ b/sys-power/envycontrol/envycontrol-3.4.0.ebuild @@ -8,13 +8,12 @@ PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 -SRC_URI="https://github.com/bayasdev/envycontrol/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Easy GPU switching for Nvidia Optimus laptops under Linux " HOMEPAGE="https://github.com/bayasdev/envycontrol" +SRC_URI="https://github.com/bayasdev/envycontrol/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" - KEYWORDS="~amd64 ~x86" src_compile() { diff --git a/sys-power/fan2go/fan2go-0.8.1.ebuild b/sys-power/fan2go/fan2go-0.8.1.ebuild index e3267a9b1b..a7250eb11a 100644 --- a/sys-power/fan2go/fan2go-0.8.1.ebuild +++ b/sys-power/fan2go/fan2go-0.8.1.ebuild @@ -6,9 +6,9 @@ EAPI=8 inherit go-module shell-completion systemd DESCRIPTION="A simple daemon providing dynamic fan speed control" +HOMEPAGE="https://github.com/markusressel/fan2go" SRC_URI="https://github.com/markusressel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz" -HOMEPAGE="https://github.com/markusressel/fan2go" LICENSE="AGPL-3 Apache-2.0 MIT BSD BSD-2 MIT MPL-2.0" SLOT="0" diff --git a/sys-power/gtherm/gtherm-0.0.3.ebuild b/sys-power/gtherm/gtherm-0.0.3.ebuild index e24df31dda..209df7a5e2 100644 --- a/sys-power/gtherm/gtherm-0.0.3.ebuild +++ b/sys-power/gtherm/gtherm-0.0.3.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="A simple daemon to monitor thermal zones and cooling devices" HOMEPAGE="https://source.puri.sm/Librem5/gtherm" SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64" @@ -25,8 +27,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v${PV}" - src_prepare() { eapply_user use vala && vala_src_prepare From d374aa73067476c238c5b4695a691810938ac903 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:50:49 +0200 Subject: [PATCH 28/36] sys-process/snooze: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- sys-process/snooze/snooze-0.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-process/snooze/snooze-0.5.ebuild b/sys-process/snooze/snooze-0.5.ebuild index c6b84b601a..a7f68d474d 100644 --- a/sys-process/snooze/snooze-0.5.ebuild +++ b/sys-process/snooze/snooze-0.5.ebuild @@ -6,10 +6,10 @@ EAPI=7 DESCRIPTION="Run a command at a particular time" HOMEPAGE="https://github.com/leahneukirchen/snooze" SRC_URI="https://github.com/leahneukirchen/snooze/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" LICENSE="CC0-1.0" SLOT="0" +KEYWORDS="~amd64 ~x86" src_install() { emake DESTDIR="${D}" PREFIX=/usr install From 0edbd0ac2d1bc256b44d138f8fc2632ac338aff3 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 01:57:10 +0200 Subject: [PATCH 29/36] www-apps/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- .../code-server-bin-4.14.1.ebuild | 8 ++++--- .../code-server-bin-4.15.0.ebuild | 8 ++++--- .../code-server-bin-4.16.0.ebuild | 8 ++++--- .../code-server-bin-4.16.1.ebuild | 8 ++++--- www-apps/libmedium/libmedium-20231020.ebuild | 3 ++- .../librarian/librarian-2023.05.07.ebuild | 23 ++++++++++--------- www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild | 5 ++-- www-apps/rimgo/rimgo-1.2.1.ebuild | 16 +++++++------ 8 files changed, 45 insertions(+), 34 deletions(-) diff --git a/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild b/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild index 35845168af..e2684ffe09 100644 --- a/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild +++ b/www-apps/code-server-bin/code-server-bin-4.14.1.ebuild @@ -15,7 +15,9 @@ SRC_URI=" amd64? ( ${BASE_URI}-amd64.tar.gz ) arm64? ( ${BASE_URI}-arm64.tar.gz ) " -RESTRICT="test" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ || ( BSD-2 MIT Apache-2.0 ) || ( MIT WTFPL ) @@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ SLOT="0" KEYWORDS="~amd64 ~arm64" +RESTRICT="test" + RDEPEND=" ${DEPEND} >=net-libs/nodejs-16.0.0[ssl] @@ -31,8 +35,6 @@ RDEPEND=" app-crypt/libsecret " -S="${WORKDIR}/${MY_P}-linux-${ARCH}" - PATCHES=( "${FILESDIR}/${PN}-node.patch" ) DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" ) diff --git a/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild index 35845168af..e2684ffe09 100644 --- a/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild +++ b/www-apps/code-server-bin/code-server-bin-4.15.0.ebuild @@ -15,7 +15,9 @@ SRC_URI=" amd64? ( ${BASE_URI}-amd64.tar.gz ) arm64? ( ${BASE_URI}-arm64.tar.gz ) " -RESTRICT="test" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ || ( BSD-2 MIT Apache-2.0 ) || ( MIT WTFPL ) @@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ SLOT="0" KEYWORDS="~amd64 ~arm64" +RESTRICT="test" + RDEPEND=" ${DEPEND} >=net-libs/nodejs-16.0.0[ssl] @@ -31,8 +35,6 @@ RDEPEND=" app-crypt/libsecret " -S="${WORKDIR}/${MY_P}-linux-${ARCH}" - PATCHES=( "${FILESDIR}/${PN}-node.patch" ) DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" ) diff --git a/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild index 35845168af..e2684ffe09 100644 --- a/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild +++ b/www-apps/code-server-bin/code-server-bin-4.16.0.ebuild @@ -15,7 +15,9 @@ SRC_URI=" amd64? ( ${BASE_URI}-amd64.tar.gz ) arm64? ( ${BASE_URI}-arm64.tar.gz ) " -RESTRICT="test" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ || ( BSD-2 MIT Apache-2.0 ) || ( MIT WTFPL ) @@ -24,6 +26,8 @@ LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ SLOT="0" KEYWORDS="~amd64 ~arm64" +RESTRICT="test" + RDEPEND=" ${DEPEND} >=net-libs/nodejs-16.0.0[ssl] @@ -31,8 +35,6 @@ RDEPEND=" app-crypt/libsecret " -S="${WORKDIR}/${MY_P}-linux-${ARCH}" - PATCHES=( "${FILESDIR}/${PN}-node.patch" ) DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" ) diff --git a/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild b/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild index cdf7ad04c1..177cd81c52 100644 --- a/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild +++ b/www-apps/code-server-bin/code-server-bin-4.16.1.ebuild @@ -15,7 +15,9 @@ SRC_URI=" amd64? ( ${BASE_URI}-amd64.tar.gz -> ${P}-amd64.tar.gz ) arm64? ( ${BASE_URI}-arm64.tar.gz -> ${P}-arm64.tar.gz ) " -RESTRICT="test" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + LICENSE="MIT ISC BSD Apache-2.0 BSD-2 PYTHON GPL-2 0BSD" LICENSE+=" LGPL-2.1+ || ( MIT WTFPL ) @@ -24,6 +26,8 @@ LICENSE+=" LGPL-2.1+ SLOT="0" KEYWORDS="~amd64 ~arm64" +RESTRICT="test" + RDEPEND=" ${DEPEND} >=net-libs/nodejs-16.0.0[ssl] @@ -31,8 +35,6 @@ RDEPEND=" app-crypt/libsecret " -S="${WORKDIR}/${MY_P}-linux-${ARCH}" - PATCHES=( "${FILESDIR}/${PN}-node.patch" ) DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" ) diff --git a/www-apps/libmedium/libmedium-20231020.ebuild b/www-apps/libmedium/libmedium-20231020.ebuild index b83f110b8c..810c3565cb 100644 --- a/www-apps/libmedium/libmedium-20231020.ebuild +++ b/www-apps/libmedium/libmedium-20231020.ebuild @@ -288,6 +288,8 @@ SHA="1808d2fd77526d335ab6ab4e85b99b1ddbbf07ed" SRC_URI="https://github.com/realaravinth/libmedium/archive/${SHA}.tar.gz" SRC_URI+=" ${CARGO_CRATE_URIS}" +S="${WORKDIR}/${PN}-${SHA}" + # License set may be more restrictive as OR is not respected # use cargo-license for a more accurate license picture LICENSE="0BSD AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB" @@ -300,7 +302,6 @@ RDEPEND="acct-user/libmedium # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / QA_FLAGS_IGNORED="usr/bin/${PN}" -S="${WORKDIR}/${PN}-${SHA}" src_prepare() { sed -i -e 's/#cache = "\/var\/lib\/libmedium"/cache = "\/var\/cache\/libmedium"/' 'config/default.toml' || die diff --git a/www-apps/librarian/librarian-2023.05.07.ebuild b/www-apps/librarian/librarian-2023.05.07.ebuild index 069eb60135..a86baea26b 100644 --- a/www-apps/librarian/librarian-2023.05.07.ebuild +++ b/www-apps/librarian/librarian-2023.05.07.ebuild @@ -7,17 +7,9 @@ inherit go-module DESCRIPTION="An alternative frontend for LBRY/Odysee. Inspired by Invidious and Libreddit." HOMEPAGE="https://codeberg.org/librarian/librarian" -S="${WORKDIR}/${PN}" SHA="8f5bef89a558ee24b1193694fee693b57d50e66f" SRC_URI="https://codeberg.org/librarian/librarian/archive/${SHA}.tar.gz -> ${P}.tar.gz" -LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="acct-user/librarian - acct-group/librarian" - EGO_SUM=( "cloud.google.com/go v0.26.0/go.mod" "cloud.google.com/go v0.34.0/go.mod" @@ -1499,9 +1491,18 @@ go-module_set_globals SRC_URI+=" ${EGO_SUM_SRC_URI}" +S="${WORKDIR}/${PN}" + +LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="acct-user/librarian + acct-group/librarian" + src_prepare() { default - sed -i -e 's/IMAGE_CACHE: false/IMAGE_CACHE: true/' 'config.example.yml' || die + sed -i -e 's/IMAGE_CACHE: false/IMAGE_CACHE: true/' 'config.example.yml' || die } src_compile() { @@ -1512,6 +1513,6 @@ src_install() { einstalldocs dobin librarian newinitd "${FILESDIR}/librarian.initd" "librarian" - insinto "/etc/librarian" - newins "config.example.yml" "config.yml" + insinto "/etc/librarian" + newins "config.example.yml" "config.yml" } diff --git a/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild b/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild index 17387f97a7..3e58b5dc31 100644 --- a/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild +++ b/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild @@ -7,16 +7,15 @@ inherit go-module DESCRIPTION="Git-based wiki engine written in Go using mycomarkup" HOMEPAGE="https://mycorrhiza.wiki" - SRC_URI=" https://github.com/bouncepaw/mycorrhiza/archive/v${PV}.tar.gz -> ${P}.tar.gz https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}-vendor.tar.xz " -KEYWORDS="~amd64 ~x86" - LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0" SLOT="0" +KEYWORDS="~amd64 ~x86" + RESTRICT="mirror" BDEPEND=">=dev-lang/go-1.19.0" diff --git a/www-apps/rimgo/rimgo-1.2.1.ebuild b/www-apps/rimgo/rimgo-1.2.1.ebuild index 04fbfcebfe..63f52233e9 100644 --- a/www-apps/rimgo/rimgo-1.2.1.ebuild +++ b/www-apps/rimgo/rimgo-1.2.1.ebuild @@ -7,15 +7,8 @@ inherit go-module DESCRIPTION="An alternative frontend for Imgur. Originally based on rimgu." HOMEPAGE="https://codeberg.org/rimgo/rimgo" -S="${WORKDIR}/${PN}" -LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT" -SLOT="0" -KEYWORDS="~amd64" SRC_URI="https://codeberg.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RDEPEND="acct-user/rimgo - acct-group/rimgo" - EGO_SUM=( "github.com/PuerkitoBio/goquery v1.8.1" "github.com/PuerkitoBio/goquery v1.8.1/go.mod" @@ -170,6 +163,15 @@ go-module_set_globals SRC_URI+=" ${EGO_SUM_SRC_URI}" +S="${WORKDIR}/${PN}" + +LICENSE="AGPL-3 Apache-2.0 BSD-2 BSD MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="acct-user/rimgo + acct-group/rimgo" + src_prepare() { default From 44501be34c3f5bd539ceb6e16953c4042d9b2a16 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:00:03 +0200 Subject: [PATCH 30/36] www-client/yandex-browser: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- .../yandex-browser-24.4.1.915_p1.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/www-client/yandex-browser/yandex-browser-24.4.1.915_p1.ebuild b/www-client/yandex-browser/yandex-browser-24.4.1.915_p1.ebuild index 016bb0e247..a1ee0d81f2 100644 --- a/www-client/yandex-browser/yandex-browser-24.4.1.915_p1.ebuild +++ b/www-client/yandex-browser/yandex-browser-24.4.1.915_p1.ebuild @@ -5,8 +5,6 @@ EAPI=8 CHROMIUM_LANGS="cs de en-US es fr it ja kk pt-BR pt-PT ru tr uk uz zh-CN zh-TW" inherit chromium-2 unpacker desktop wrapper pax-utils xdg -RESTRICT="bindist mirror strip" - MY_PV="${PV/_p/-}" if [[ ${PN} == yandex-browser ]]; then MY_PN=${PN}-stable @@ -18,14 +16,19 @@ FFMPEG="120" DESCRIPTION="The web browser from Yandex" HOMEPAGE="https://browser.yandex.ru/" -LICENSE="Yandex-EULA" -SLOT="0" -IUSE="+ffmpeg-codecs" SRC_URI=" amd64? ( https://repo.yandex.ru/yandex-browser/deb/pool/main/y/${MY_PN}/${MY_PN}_${MY_PV}_amd64.deb -> ${P}.deb ) " + +S="${WORKDIR}" + +LICENSE="Yandex-EULA" +SLOT="0" KEYWORDS="~amd64" +IUSE="+ffmpeg-codecs" +RESTRICT="bindist mirror strip" + RDEPEND=" dev-libs/expat dev-libs/glib:2 @@ -65,7 +68,6 @@ DEPEND=" QA_PREBUILT="*" QA_DESKTOP_FILE="usr/share/applications/yandex-browser.*\\.desktop" -S=${WORKDIR} YANDEX_HOME="opt/${PN/-//}" pkg_setup() { From edbcbad03dae56aee95b5c5d696c483a764513de Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:01:28 +0200 Subject: [PATCH 31/36] www-misc/waldl: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- www-misc/waldl/waldl-0.0.1_pre20211112.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-misc/waldl/waldl-0.0.1_pre20211112.ebuild b/www-misc/waldl/waldl-0.0.1_pre20211112.ebuild index a19a7c99e8..0089683a93 100644 --- a/www-misc/waldl/waldl-0.0.1_pre20211112.ebuild +++ b/www-misc/waldl/waldl-0.0.1_pre20211112.ebuild @@ -8,6 +8,8 @@ HOMEPAGE="https://github.com/pystardust/waldl" GIT_COMMIT="727640c1583cf627c075db7239e09e7bbdfecf17" SRC_URI="https://github.com/pystardust/waldl/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${GIT_COMMIT}/" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -21,8 +23,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${GIT_COMMIT}/" - PATCHES=( "${FILESDIR}/waldl-0.0.1-customize.patch" ) From 9481e1a377ae0410f0a365faf4b1c7519d43e0a8 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:04:35 +0200 Subject: [PATCH 32/36] x11-misc/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild | 11 ++++++----- x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild | 2 +- x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild | 2 +- x11-misc/gromit-mpx/gromit-mpx-9999.ebuild | 2 +- x11-misc/i3-restore/i3-restore-4.1.ebuild | 11 +++++------ x11-misc/selx/selx-1.1.0.ebuild | 4 ++-- x11-misc/xbanish/xbanish-1.8.ebuild | 3 +-- x11-misc/xbanish/xbanish-1.8_p20230519.ebuild | 2 +- .../xscreensaver-anclock-2.2.1.ebuild | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild b/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild index 7faa454d15..f2b98eca1d 100644 --- a/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild +++ b/x11-misc/greenclip-bin/greenclip-bin-4.2.ebuild @@ -3,21 +3,22 @@ EAPI=7 -HOMEPAGE="https://github.com/erebe/greenclip" -DESCRIPTION="Simple clipboard manager to be integrated with rofi" - MY_PN=${PN%-bin} + +DESCRIPTION="Simple clipboard manager to be integrated with rofi" +HOMEPAGE="https://github.com/erebe/greenclip" SRC_URI=" https://github.com/erebe/${MY_PN}/releases/download/v${PV}/${MY_PN} -> ${P} https://raw.githubusercontent.com/erebe/${MY_PN}/v${PV}/README.md -> ${P}.README.md " -KEYWORDS="~amd64" +S="${WORKDIR}" + LICENSE="BSD" SLOT="0" +KEYWORDS="~amd64" QA_PREBUILT="/usr/bin/${MY_PN}" -S="${WORKDIR}" src_install() { newbin "${DISTDIR}/${P}" "${MY_PN}" diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild index 95600ede05..074c4f1534 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.5.1.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild index 3b827169fc..18ac1a5e82 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild index 95600ede05..074c4f1534 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -16,8 +16,8 @@ else KEYWORDS="~amd64 ~x86" fi -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" x11-libs/gtk+:3 diff --git a/x11-misc/i3-restore/i3-restore-4.1.ebuild b/x11-misc/i3-restore/i3-restore-4.1.ebuild index 2d3d1965b9..662d841413 100644 --- a/x11-misc/i3-restore/i3-restore-4.1.ebuild +++ b/x11-misc/i3-restore/i3-restore-4.1.ebuild @@ -3,17 +3,18 @@ EAPI=8 +PYTHON_COMPAT=( python3_{7..12} ) +inherit python-single-r1 + DESCRIPTION="A simple bash + python script to restore your i3 session" HOMEPAGE="https://github.com/jdholtz/i3-restore/" - SRC_URI="https://github.com/jdholtz/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64" -PYTHON_COMPAT=( python3_{7..12} ) -inherit python-single-r1 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" x11-wm/i3 @@ -26,8 +27,6 @@ DEPEND=" 'dev-python/psutil[${PYTHON_USEDEP}]' ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - src_prepare() { sed -i 's#CURR_DIR="$(dirname "${0}")"#CURR_DIR=/usr/libexec/i3-restore#' i3-save i3-restore || die "Sed error" sed -i "s/version=.*/version=${PV}/" utils/common.bash diff --git a/x11-misc/selx/selx-1.1.0.ebuild b/x11-misc/selx/selx-1.1.0.ebuild index 15f8e130fa..5d796ec1df 100644 --- a/x11-misc/selx/selx-1.1.0.ebuild +++ b/x11-misc/selx/selx-1.1.0.ebuild @@ -7,13 +7,13 @@ inherit toolchain-funcs edo DESCRIPTION="Minimal X11 rectangle selection tool" HOMEPAGE="https://codeberg.org/NRK/selx" - SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}" -KEYWORDS="~amd64" LICENSE="GPL-3+" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xbanish/xbanish-1.8.ebuild b/x11-misc/xbanish/xbanish-1.8.ebuild index 8b3a322920..a25dd0baec 100644 --- a/x11-misc/xbanish/xbanish-1.8.ebuild +++ b/x11-misc/xbanish/xbanish-1.8.ebuild @@ -7,12 +7,11 @@ inherit toolchain-funcs DESCRIPTION="Banish the mouse cursor when typing, show it again when the mouse moves" HOMEPAGE="https://github.com/jcs/xbanish" - SRC_URI="https://github.com/jcs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="ISC" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild b/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild index 69ede7d3bd..c00734e962 100644 --- a/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild +++ b/x11-misc/xbanish/xbanish-1.8_p20230519.ebuild @@ -12,9 +12,9 @@ COMMIT="189ce79b1df4eb4995980530ebc3d28715a67488" SRC_URI="https://github.com/jcs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" -KEYWORDS="~amd64" LICENSE="ISC" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild b/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild index 977e129968..2a7207390c 100644 --- a/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild +++ b/x11-misc/xscreensaver-anclock/xscreensaver-anclock-2.2.1.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="http://pt2k.xii.jp/software/anclock/xscreensaver/index_e.html" SRC_URI="https://www.jwz.org/xscreensaver/xscreensaver-6.05.1.tar.gz \ http://pt2k.xii.jp/software/anclock/xscreensaver/oldver/anclock-${PV}-for-xscreensaver-6.04.patch.gz" +S="${WORKDIR}"/xscreensaver-6.05/ + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" @@ -55,8 +57,6 @@ PATCHES=( "${FILESDIR}"/xscreensaver-6.05-configure-exit-codes.patch ) -S="${WORKDIR}"/xscreensaver-6.05/ - src_unpack() { default gunzip --force "${DISTDIR}/anclock-${PV}-for-xscreensaver-6.04.patch.gz" From 4494a2d0b6bd796e0714897f9ccd00bfad86373c Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:05:14 +0200 Subject: [PATCH 33/36] x11-plugins/purple-mm-sms: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- x11-plugins/purple-mm-sms/purple-mm-sms-0.1.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-plugins/purple-mm-sms/purple-mm-sms-0.1.7.ebuild b/x11-plugins/purple-mm-sms/purple-mm-sms-0.1.7.ebuild index defb9e63f2..26761d45d8 100644 --- a/x11-plugins/purple-mm-sms/purple-mm-sms-0.1.7.ebuild +++ b/x11-plugins/purple-mm-sms/purple-mm-sms-0.1.7.ebuild @@ -7,6 +7,8 @@ DESCRIPTION="Purple SMS plugin using ModemManager" HOMEPAGE="https://source.puri.sm/Librem5/purple-mm-sms" SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64" @@ -17,5 +19,3 @@ DEPEND=" " RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-v${PV}" From 4a08fa1805343f3917634c055404d920f53fca24 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:06:07 +0200 Subject: [PATCH 34/36] x11-terms/tabby-bin: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- x11-terms/tabby-bin/tabby-bin-1.0.189.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-terms/tabby-bin/tabby-bin-1.0.189.ebuild b/x11-terms/tabby-bin/tabby-bin-1.0.189.ebuild index e919fd7bca..8f58a0dcd1 100644 --- a/x11-terms/tabby-bin/tabby-bin-1.0.189.ebuild +++ b/x11-terms/tabby-bin/tabby-bin-1.0.189.ebuild @@ -14,13 +14,13 @@ SRC_URI=" arm? ( https://github.com/Eugeny/tabby/releases/download/v${PV}/${MY_P}-armhf.tar.gz ) " +# This needs to be adjusted to allow for arm +S="${WORKDIR}/${MY_P}-x64" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm" -# This needs to be adjusted to allow for arm -S="${WORKDIR}/${MY_P}-x64" - DEPEND=" || ( >=app-accessibility/at-spi2-core-2.46.0:2 From f51b3ad8e38755337697455e704efc6c0869614b Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:10:03 +0200 Subject: [PATCH 35/36] x11-themes/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- .../bibata-xcursors/bibata-xcursors-2.0.2.ebuild | 4 ++-- .../bibata-xcursors/bibata-xcursors-2.0.3.ebuild | 4 ++-- .../breezex-xcursors/breezex-xcursors-2.0.0.ebuild | 4 ++-- .../catppuccin-cursors-0.2.0.ebuild | 12 +++++------- .../materia-theme/materia-theme-20210322.ebuild | 6 ++---- x11-themes/neonly-cursor/neonly-cursor-1.0.0.ebuild | 11 ++++++----- .../papirus-claws-mail-theme-0_pre20181023.ebuild | 4 ++-- .../papirus-claws-mail-theme-0_pre20201019.ebuild | 4 ++-- .../sound-theme-librem5-0.1.0.ebuild | 4 ++-- 9 files changed, 25 insertions(+), 28 deletions(-) diff --git a/x11-themes/bibata-xcursors/bibata-xcursors-2.0.2.ebuild b/x11-themes/bibata-xcursors/bibata-xcursors-2.0.2.ebuild index f0cf55bc17..08f951d224 100644 --- a/x11-themes/bibata-xcursors/bibata-xcursors-2.0.2.ebuild +++ b/x11-themes/bibata-xcursors/bibata-xcursors-2.0.2.ebuild @@ -7,14 +7,14 @@ DESCRIPTION="Opensource, compact, and material-designed cursor set" HOMEPAGE="https://github.com/ful1e5/Bibata_Cursor" SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="x11-libs/libXcursor" -S="${WORKDIR}" - src_install() { insinto /usr/share/cursors/xorg-x11 doins -r Bibata-{Modern,Original}-{Amber,Classic,Ice} diff --git a/x11-themes/bibata-xcursors/bibata-xcursors-2.0.3.ebuild b/x11-themes/bibata-xcursors/bibata-xcursors-2.0.3.ebuild index f0cf55bc17..08f951d224 100644 --- a/x11-themes/bibata-xcursors/bibata-xcursors-2.0.3.ebuild +++ b/x11-themes/bibata-xcursors/bibata-xcursors-2.0.3.ebuild @@ -7,14 +7,14 @@ DESCRIPTION="Opensource, compact, and material-designed cursor set" HOMEPAGE="https://github.com/ful1e5/Bibata_Cursor" SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="x11-libs/libXcursor" -S="${WORKDIR}" - src_install() { insinto /usr/share/cursors/xorg-x11 doins -r Bibata-{Modern,Original}-{Amber,Classic,Ice} diff --git a/x11-themes/breezex-xcursors/breezex-xcursors-2.0.0.ebuild b/x11-themes/breezex-xcursors/breezex-xcursors-2.0.0.ebuild index e7f37ea7b0..6777a4c394 100644 --- a/x11-themes/breezex-xcursors/breezex-xcursors-2.0.0.ebuild +++ b/x11-themes/breezex-xcursors/breezex-xcursors-2.0.0.ebuild @@ -11,14 +11,14 @@ SRC_URI=" https://github.com/ful1e5/BreezeX_Cursor/releases/download/v${PV}/BreezeX-Light.tar.gz -> ${P}-light.tar.gz " +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="x11-libs/libXcursor" -S="${WORKDIR}" - src_install() { insinto /usr/share/cursors/xorg-x11 doins -r BreezeX-{Black,Dark,Light} diff --git a/x11-themes/catppuccin-cursors/catppuccin-cursors-0.2.0.ebuild b/x11-themes/catppuccin-cursors/catppuccin-cursors-0.2.0.ebuild index 80f8d0ca6f..44047ab1ce 100644 --- a/x11-themes/catppuccin-cursors/catppuccin-cursors-0.2.0.ebuild +++ b/x11-themes/catppuccin-cursors/catppuccin-cursors-0.2.0.ebuild @@ -78,17 +78,15 @@ SRC_URI=" " S="${WORKDIR}" -IUSE="+frappe latte macchiato mocha" -REQUIRED_USE="|| ( frappe latte macchiato mocha )" - -BDEPEND=" - app-arch/unzip -" - LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" +IUSE="+frappe latte macchiato mocha" +REQUIRED_USE="|| ( frappe latte macchiato mocha )" + +BDEPEND="app-arch/unzip" + src_install() { insinto "/usr/share/icons" for folder in * ; do diff --git a/x11-themes/materia-theme/materia-theme-20210322.ebuild b/x11-themes/materia-theme/materia-theme-20210322.ebuild index 212cc1cec5..531fc6c5ca 100644 --- a/x11-themes/materia-theme/materia-theme-20210322.ebuild +++ b/x11-themes/materia-theme/materia-theme-20210322.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="A Material Design theme for GNOME/GTK based desktop environments" HOMEPAGE="https://github.com/nana-4/materia-theme" SRC_URI="https://github.com/nana-4/materia-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64" RDEPEND=" x11-libs/gdk-pixbuf @@ -19,6 +19,4 @@ RDEPEND=" x11-themes/gtk-engines-murrine " DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/sassc -" +BDEPEND="dev-lang/sassc" diff --git a/x11-themes/neonly-cursor/neonly-cursor-1.0.0.ebuild b/x11-themes/neonly-cursor/neonly-cursor-1.0.0.ebuild index f323dd70f9..1f584f967f 100644 --- a/x11-themes/neonly-cursor/neonly-cursor-1.0.0.ebuild +++ b/x11-themes/neonly-cursor/neonly-cursor-1.0.0.ebuild @@ -10,14 +10,15 @@ MY_PV="v$(ver_cut 1-2)" DESCRIPTION="Cursor theme using a custom color palette inspired by boreal colors" HOMEPAGE="https://github.com/alvatip/Neonly" SRC_URI="https://github.com/alvatip/Neonly/releases/download/${MY_PV}/Neonly.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" - -KEYWORDS="~amd64" -SLOT="0" -RESTRICT="mirror" S="${WORKDIR}" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="mirror" + src_install() { insinto "/usr/share/icons/${PN}" doins -r cursors index.theme diff --git a/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20181023.ebuild b/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20181023.ebuild index b870137cbc..786da2c763 100644 --- a/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20181023.ebuild +++ b/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20181023.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="Papirus icon theme for Claws Mail" HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-claws-mail-theme" SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-claws-mail-theme/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" diff --git a/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20201019.ebuild b/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20201019.ebuild index 49c20c6f98..82f6e89abe 100644 --- a/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20201019.ebuild +++ b/x11-themes/papirus-claws-mail-theme/papirus-claws-mail-theme-0_pre20201019.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="Papirus icon theme for Claws Mail" HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-claws-mail-theme" SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-claws-mail-theme/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" diff --git a/x11-themes/sound-theme-librem5/sound-theme-librem5-0.1.0.ebuild b/x11-themes/sound-theme-librem5/sound-theme-librem5-0.1.0.ebuild index e2129612e0..53b89c781d 100644 --- a/x11-themes/sound-theme-librem5/sound-theme-librem5-0.1.0.ebuild +++ b/x11-themes/sound-theme-librem5/sound-theme-librem5-0.1.0.ebuild @@ -7,6 +7,8 @@ DESCRIPTION="Sound theme for the Librem 5/PinePhone" HOMEPAGE="https://source.puri.sm/Librem5/sound-theme-librem5" SRC_URI="https://source.puri.sm/Librem5/sound-theme-librem5/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + LICENSE="GPL-2 LGPL-2 CC-BY-3.0 CC-BY-SA-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64" @@ -17,8 +19,6 @@ DEPEND=" >=dev-util/intltool-0.40 " -S="${WORKDIR}/${PN}-v${PV}" - src_install() { insinto /usr/share/sounds/ doins -r librem5 From e04ce94a6cfa8e59ee76852e7c9759a4a9a6ffd6 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 15 May 2024 02:12:22 +0200 Subject: [PATCH 36/36] x11-wm/*: fix variable order Signed-off-by: Lucio Sauer Closes: https://github.com/gentoo/guru/pull/190 Signed-off-by: Julien Roy --- x11-wm/dk/dk-1.7.ebuild | 10 ++++++---- x11-wm/qtile-extras/qtile-extras-0.23.0.ebuild | 17 +++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/x11-wm/dk/dk-1.7.ebuild b/x11-wm/dk/dk-1.7.ebuild index b53dad3a95..a50deb207c 100644 --- a/x11-wm/dk/dk-1.7.ebuild +++ b/x11-wm/dk/dk-1.7.ebuild @@ -3,18 +3,21 @@ EAPI=8 +inherit toolchain-funcs xdg-utils desktop + DESCRIPTION="A list based tiling window manager in the vein of dwm, bspwm, and xmonad." HOMEPAGE="https://bitbucket.org/natemaia/dk/src/master/" -#EGIT_REPO_URI="https://bitbucket.org/natemaia/dk.git" SRC_URI="https://bitbucket.org/natemaia/dk/get/bc9bd6349321c27ddb2dd7a9cb7630e2f1794c85.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}" -inherit toolchain-funcs xdg-utils desktop +S="${WORKDIR}" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + IUSE="examples man" RESTRICT=strip + DEPEND=" x11-base/xcb-proto x11-libs/libxcb @@ -28,7 +31,6 @@ RDEPEND=" ${DEPEND} x11-misc/sxhkd " -KEYWORDS="~amd64 ~riscv ~x86" #src_prepare() { # default diff --git a/x11-wm/qtile-extras/qtile-extras-0.23.0.ebuild b/x11-wm/qtile-extras/qtile-extras-0.23.0.ebuild index eba8f97d6e..04ddfe984e 100644 --- a/x11-wm/qtile-extras/qtile-extras-0.23.0.ebuild +++ b/x11-wm/qtile-extras/qtile-extras-0.23.0.ebuild @@ -8,25 +8,22 @@ PYTHON_COMPAT=(python3_{9..12}) inherit distutils-r1 -SRC_URI="https://github.com/elParaguayo/qtile-extras/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - DESCRIPTION="elParaguayo's Qtile Extras" HOMEPAGE="https://github.com/elParaguayo/qtile-extras" +SRC_URI="https://github.com/elParaguayo/qtile-extras/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="x11-wm/qtile" +DEPEND="${RDEPEND}" BDEPEND=" dev-python/build dev-python/installer dev-python/setuptools-scm " -RDEPEND="x11-wm/qtile" - -DEPEND="${RDEPEND}" - -LICENSE="MIT" -SLOT="0" - export SETUPTOOLS_SCM_PRETEND_VERSION=7.0.0 python_compile() {