From 029ff2d6c6e2840b271732c61612d860c00fc506 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 17 Apr 2023 18:45:19 +0500 Subject: [PATCH 01/19] dev-python/mkdocs-render-swagger-plugin: treeclean Signed-off-by: Anna (cybertailor) Vyalkova --- .../mkdocs-render-swagger-plugin/Manifest | 1 - .../mkdocs-render-swagger-plugin/metadata.xml | 12 ----------- .../mkdocs-render-swagger-plugin-0.0.4.ebuild | 21 ------------------- profiles/package.mask | 5 ----- 4 files changed, 39 deletions(-) delete mode 100644 dev-python/mkdocs-render-swagger-plugin/Manifest delete mode 100644 dev-python/mkdocs-render-swagger-plugin/metadata.xml delete mode 100644 dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild diff --git a/dev-python/mkdocs-render-swagger-plugin/Manifest b/dev-python/mkdocs-render-swagger-plugin/Manifest deleted file mode 100644 index 35056695b3..0000000000 --- a/dev-python/mkdocs-render-swagger-plugin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mkdocs-render-swagger-plugin-0.0.4.tar.gz 4576 BLAKE2B e9bfafee3d04cc71bd91f6ea2e5a92c1649197a48ce86ff80f23079862dadbbd00f6e557d5f8821951123540e0764118302ee7efbfae6c8865d2cc70ccb45327 SHA512 fab17797aedeb9dbc2790cf31eddef77a78e4a12929aeed88ded2ddefb39a450f076d2e2aaef833e2bc079343fe40d6c9351dee205ca093e15dd5f637d74676a diff --git a/dev-python/mkdocs-render-swagger-plugin/metadata.xml b/dev-python/mkdocs-render-swagger-plugin/metadata.xml deleted file mode 100644 index c3893498ec..0000000000 --- a/dev-python/mkdocs-render-swagger-plugin/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - cyber+gentoo@sysrq.in - Anna - - - mkdocs-render-swagger-plugin - bharel/mkdocs-render-swagger-plugin - - diff --git a/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild b/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild deleted file mode 100644 index 0a0207dd8a..0000000000 --- a/dev-python/mkdocs-render-swagger-plugin/mkdocs-render-swagger-plugin-0.0.4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -inherit distutils-r1 pypi - -DESCRIPTION="MKDocs plugin for rendering swagger & openapi files" -HOMEPAGE=" - https://pypi.org/project/mkdocs-render-swagger-plugin/ - https://github.com/bharel/mkdocs-render-swagger-plugin -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="dev-python/mkdocs" diff --git a/profiles/package.mask b/profiles/package.mask index 84e9091690..e32d14282d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -66,11 +66,6 @@ dev-python/os-resource-classes dev-python/os-traits dev-python/python-manilaclient -# Anna Vyalkova (2023-03-17) -# Python library with no consumers left in tree. -# Masked for removal in 30 days. -dev-python/mkdocs-render-swagger-plugin - # Julien Roy (2023-01-25) # Requires Date: Mon, 17 Apr 2023 18:45:39 +0500 Subject: [PATCH 02/19] dev-python/python-manilaclient: treeclean Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/python-manilaclient/Manifest | 1 - dev-python/python-manilaclient/metadata.xml | 14 ------ .../python-manilaclient-3.4.0.ebuild | 48 ------------------- profiles/package.mask | 1 - 4 files changed, 64 deletions(-) delete mode 100644 dev-python/python-manilaclient/Manifest delete mode 100644 dev-python/python-manilaclient/metadata.xml delete mode 100644 dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest deleted file mode 100644 index 095d44be69..0000000000 --- a/dev-python/python-manilaclient/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST python-manilaclient-3.4.0.tar.gz 320304 BLAKE2B 4bb9fc47816c1cf8dcc163bd3119932b14f6af6796486053175e91efd94434d485281e6ec74f79c9d054309a486c4590d379817015f78e0c29f5036f7583b8d9 SHA512 0b4852a2df90b1a1f0deaacc235aec47e9f4e95f0d3b75a0fbad7ef90569f438723e4b9df02e6a9dc9752ff77a0b2425f09add8f95d41c1db12c50fbfa3022b0 diff --git a/dev-python/python-manilaclient/metadata.xml b/dev-python/python-manilaclient/metadata.xml deleted file mode 100644 index 7329879483..0000000000 --- a/dev-python/python-manilaclient/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri - - - - python-manilaclient - openstack/python-manilaclient - - diff --git a/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild deleted file mode 100644 index c43c8aff86..0000000000 --- a/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EPYTEST_IGNORE=( manilaclient/tests/functional ) -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Manila API" -HOMEPAGE=" - https://opendev.org/openstack/python-manilaclient - https://github.com/openstack/python-manilaclient - https://pypi.org/project/python-manilaclient/ -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/tempest-17.1.0[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/profiles/package.mask b/profiles/package.mask index e32d14282d..8c072561e7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -64,7 +64,6 @@ net-im/gtkcord:0 # Masked for removal in 30 days. dev-python/os-resource-classes dev-python/os-traits -dev-python/python-manilaclient # Julien Roy (2023-01-25) # Requires Date: Mon, 17 Apr 2023 18:45:55 +0500 Subject: [PATCH 03/19] dev-python/os-traits: treeclean Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/os-traits/Manifest | 1 - dev-python/os-traits/metadata.xml | 14 --------- dev-python/os-traits/os-traits-2.7.0.ebuild | 33 --------------------- profiles/package.mask | 1 - 4 files changed, 49 deletions(-) delete mode 100644 dev-python/os-traits/Manifest delete mode 100644 dev-python/os-traits/metadata.xml delete mode 100644 dev-python/os-traits/os-traits-2.7.0.ebuild diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest deleted file mode 100644 index 3605d40973..0000000000 --- a/dev-python/os-traits/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST os-traits-2.7.0.tar.gz 30237 BLAKE2B bcd14d416b8b57fed413fac6fd5496c65f7e43851aaaab367593e1f44dd0d18d1aae63dc57c61ab8efa1c7ab5b17c6dcbb7c30f70c13618810f42fe38f3d8dfc SHA512 91ba2d527597eb00cc7576e1597b5bb1ca55c488752576debec5539512387f058bafa410c044eb46d7fc22441612ab446faf1e1b3db5678d11197abc91873457 diff --git a/dev-python/os-traits/metadata.xml b/dev-python/os-traits/metadata.xml deleted file mode 100644 index 2e9f3f362a..0000000000 --- a/dev-python/os-traits/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri - - - - openstack/os-traits - os-traits - - diff --git a/dev-python/os-traits/os-traits-2.7.0.ebuild b/dev-python/os-traits/os-traits-2.7.0.ebuild deleted file mode 100644 index a1becbf22d..0000000000 --- a/dev-python/os-traits/os-traits-2.7.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="os-traits is a library containing standardized trait strings" -HOMEPAGE=" - https://github.com/openstack/os-traits - https://pypi.org/project/os-traits/ - https://opendev.org/openstack/os-traits - https://launchpad.net/os-traits -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]" -DEPEND=" - ${RDEPEND} - test? ( - >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/profiles/package.mask b/profiles/package.mask index 8c072561e7..78acae9f79 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -63,7 +63,6 @@ net-im/gtkcord:0 # Python libraries with no consumers left in tree. # Masked for removal in 30 days. dev-python/os-resource-classes -dev-python/os-traits # Julien Roy (2023-01-25) # Requires Date: Mon, 17 Apr 2023 18:46:21 +0500 Subject: [PATCH 04/19] dev-python/os-resource-classes: treeclean Closes: https://bugs.gentoo.org/821478 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/os-resource-classes/Manifest | 1 - dev-python/os-resource-classes/metadata.xml | 14 --------- .../os-resource-classes-1.1.0.ebuild | 31 ------------------- profiles/package.mask | 5 --- 4 files changed, 51 deletions(-) delete mode 100644 dev-python/os-resource-classes/Manifest delete mode 100644 dev-python/os-resource-classes/metadata.xml delete mode 100644 dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild diff --git a/dev-python/os-resource-classes/Manifest b/dev-python/os-resource-classes/Manifest deleted file mode 100644 index 22a6300da9..0000000000 --- a/dev-python/os-resource-classes/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST os-resource-classes-1.1.0.tar.gz 17461 BLAKE2B 22b98ce7a33b4896c2796e3a46878396f83110f7adf70384c3eda4d06f941a44bc2ae614a10a7e62aeaa8c4834171eea731c60dde2b9dbe95fb12b56fe684048 SHA512 957bab6bd9fb4463401e207852382ecaa3179098faaa42eea84cbec0879560406db87a893f6c20868a200bfff54c6935a41d85c95081cf04dc6c33941f52f3d4 diff --git a/dev-python/os-resource-classes/metadata.xml b/dev-python/os-resource-classes/metadata.xml deleted file mode 100644 index b6d787ceb7..0000000000 --- a/dev-python/os-resource-classes/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - co-maintainers welcome - lssndrbarbieri@gmail.com - Alessandro Barbieri - - - - openstack/os-resource-classes - os-resource-classes - - diff --git a/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild deleted file mode 100644 index b20da8a1d2..0000000000 --- a/dev-python/os-resource-classes/os-resource-classes-1.1.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 - -DESCRIPTION="A list of standardized resource classes for OpenStack" -HOMEPAGE=" - https://github.com/openstack/os-resource-classes - https://opendev.org/openstack/os-resource-classes - https://pypi.org/project/os-resource-classes/ -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( - >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/profiles/package.mask b/profiles/package.mask index 78acae9f79..439b0e262d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -59,11 +59,6 @@ dev-python/oslo-policy # Archived upstream. net-im/gtkcord:0 -# Anna Vyalkova (2023-03-17) -# Python libraries with no consumers left in tree. -# Masked for removal in 30 days. -dev-python/os-resource-classes - # Julien Roy (2023-01-25) # Requires Date: Mon, 17 Apr 2023 23:11:43 +0100 Subject: [PATCH 05/19] gui-wm/swayfx: fix 0.2 ebuild deps Signed-off-by: Rahul Sandhu --- gui-wm/swayfx/swayfx-0.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/swayfx/swayfx-0.2.ebuild b/gui-wm/swayfx/swayfx-0.2.ebuild index ac081a87a8..35d2bcf8ee 100644 --- a/gui-wm/swayfx/swayfx-0.2.ebuild +++ b/gui-wm/swayfx/swayfx-0.2.ebuild @@ -38,8 +38,8 @@ DEPEND=" X? ( x11-libs/libxcb:0= ) " DEPEND+=" - >=gui-libs/wlroots-0.15:=[X?] - =gui-libs/wlroots-0.16:=[X?] + Date: Wed, 19 Apr 2023 02:05:31 +0300 Subject: [PATCH 08/19] dev-util/fpm: replace repetitive build flags with BUILD_FLAGS array Signed-off-by: Sergey Torokhov --- dev-util/fpm/fpm-0.7.0-r2.ebuild | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0-r2.ebuild b/dev-util/fpm/fpm-0.7.0-r2.ebuild index fba8f63c42..38cc9186de 100644 --- a/dev-util/fpm/fpm-0.7.0-r2.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r2.ebuild @@ -52,7 +52,7 @@ pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -set_omp_flag() { +set_build_flags() { OMPFLAG="" if use openmp ; then case $(tc-getFC) in @@ -62,13 +62,19 @@ set_omp_flag() { die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; esac fi + + BUILD_FLAGS=( --compiler "$(tc-getFC)" + --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" + --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" ) } pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp fortran-2_pkg_setup python-any-r1_pkg_setup - set_omp_flag + set_build_flags } src_prepare() { @@ -88,10 +94,7 @@ src_compile() { "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die # Use the bootstrap binary to build the feature complete fpm version - "${BSDIR}"/fpm build --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm build --verbose "${BUILD_FLAGS[@]}" || die if use doc ; then einfo "Build API documentation:" @@ -100,19 +103,12 @@ src_compile() { } src_test() { - "${BSDIR}"/fpm test --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm test --verbose "${BUILD_FLAGS[@]}" || die } src_install() { # Set prefix and pass all used env flags to avoid recompiling with default values - "${BSDIR}"/fpm install --prefix "${ED}/usr" \ - --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm install --prefix "${ED}/usr" "${BUILD_FLAGS[@]}" || die use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) einstalldocs From c9b6373e9953d1555930fd83f7e9bea4f16c8080 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 02:18:46 +0300 Subject: [PATCH 09/19] dev-libs/M_CLI2: 3.2.0 version bump Signed-off-by: Sergey Torokhov --- dev-libs/M_CLI2/M_CLI2-3.2.0.ebuild | 26 ++++++++ dev-libs/M_CLI2/Manifest | 1 + ...M_CLI2-3.2.0_fix_meson_install_rules.patch | 61 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 dev-libs/M_CLI2/M_CLI2-3.2.0.ebuild create mode 100644 dev-libs/M_CLI2/files/M_CLI2-3.2.0_fix_meson_install_rules.patch diff --git a/dev-libs/M_CLI2/M_CLI2-3.2.0.ebuild b/dev-libs/M_CLI2/M_CLI2-3.2.0.ebuild new file mode 100644 index 0000000000..ca99b9590f --- /dev/null +++ b/dev-libs/M_CLI2/M_CLI2-3.2.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +inherit fortran-2 meson + +DESCRIPTION="M_CLI2 - parse Unix-like command line arguments from Fortran" +HOMEPAGE="https://github.com/urbanjost/M_CLI2" +SRC_URI="https://github.com/urbanjost/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs test" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}/${P}_fix_meson_install_rules.patch" ) + +src_configure() { + use !static-libs && local emesonargs+=( -Ddefault_library=shared ) + meson_src_configure +} diff --git a/dev-libs/M_CLI2/Manifest b/dev-libs/M_CLI2/Manifest index 493367e93d..ed011f4d23 100644 --- a/dev-libs/M_CLI2/Manifest +++ b/dev-libs/M_CLI2/Manifest @@ -1 +1,2 @@ DIST M_CLI2-1.0.0_p20221116.tar.gz 13771712 BLAKE2B a97eb944e7a117f821822a6018d27e666ad9e761cc0d0c6901ae384b1d1d19002ee117d22695e7cfbca62e8038adcdc11d902af58f15a61f44a0e3850b8547b5 SHA512 47ede587a6fd10a8f68deae0df0eb380a51499ed15b736905054619eefd25f018189f656384fa8d72093f622e0a9871cfdea81796a9f9071e797086182f8bd57 +DIST M_CLI2-3.2.0.tar.gz 14304233 BLAKE2B 3587fc2ed33f81c3dd1938322e1f1f442b5fbaa72bd54ec118a03f6ff2500891bfe0ca8e0a4b2cd074d2b3265c5b258be8a3ec3f2e0907f475828fe35a66c36b SHA512 637d0b74a0b692b4b6b30cc58f0c8d90760d88653490751d34123d6f4752ee43723497ee88158ec77e69bab14f6a120d7e654c8bf798449ef1a73be25cfbdd46 diff --git a/dev-libs/M_CLI2/files/M_CLI2-3.2.0_fix_meson_install_rules.patch b/dev-libs/M_CLI2/files/M_CLI2-3.2.0_fix_meson_install_rules.patch new file mode 100644 index 0000000000..9604c53a6a --- /dev/null +++ b/dev-libs/M_CLI2/files/M_CLI2-3.2.0_fix_meson_install_rules.patch @@ -0,0 +1,61 @@ +# Based on patch from: +# https://github.com/urbanjost/M_CLI2/pull/18 +# by ZUO Zhihua +# (added only version update for 3.2.0 tarball) +diff -Naur a/meson.build b/meson.build +--- a/meson.build ++++ b/meson.build +@@ -1,10 +1,12 @@ + project( + 'M_CLI2', + 'fortran', +- version : '1.0.0', ++ version : '3.2.0', + license : 'UNLICENSE', + default_options : [ + 'buildtype=debugoptimized', ++ 'fortran_std=f2008', ++ 'default_library=both', + ] + ) + +@@ -33,3 +35,39 @@ + dependencies : M_CLI2_dep, + ), + ) ++ ++M_CLI2_lic = files( ++ 'LICENSE', ++) ++install_data( ++ M_CLI2_lic, ++ install_dir : join_paths(get_option('prefix'), 'share', 'licenses', meson.project_name()), ++) ++ ++if host_machine.system() == 'windows' ++ symbols_file = 'lib'+meson.project_name()+'-'+meson.project_version().split('.')[0]+'.dll.symbols' ++ obj_file = 'src_M_CLI2.F90.obj' ++else ++ symbols_file = 'lib'+meson.project_name()+'.so.'+meson.project_version()+'.symbols' ++ obj_file = 'src_M_CLI2.F90.o' ++endif ++install_subdir(M_CLI2_lib.path()+'.p', ++ install_dir: 'include'/meson.project_name(), ++ strip_directory: true, ++ exclude_files: [ ++ 'depscan.dd', ++ meson.project_name()+'-deps.json', ++ meson.project_name()+'.dat', ++ symbols_file, ++ obj_file, ++ ] ++) ++ ++pkg = import('pkgconfig') ++pkg.generate( ++ name : meson.project_name(), ++ description : 'Fortran commandline-interface using a simple prototype command', ++ version : meson.project_version(), ++ libraries : M_CLI2_lib, ++ subdirs : meson.project_name(), ++) From a77ca0ad88cce6dc42c140ea04911fca49ca0b4e Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 03:09:02 +0300 Subject: [PATCH 10/19] app-doc/ford: 6.2.4 version bump Signed-off-by: Sergey Torokhov --- app-doc/ford/Manifest | 1 + app-doc/ford/ford-6.2.4.ebuild | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 app-doc/ford/ford-6.2.4.ebuild diff --git a/app-doc/ford/Manifest b/app-doc/ford/Manifest index a9bc028188..4692ef909b 100644 --- a/app-doc/ford/Manifest +++ b/app-doc/ford/Manifest @@ -1,2 +1,3 @@ DIST FORD-6.1.17.tar.gz 6132346 BLAKE2B b01aa7cd19f02bec53fe3f85e3d4f002cf314655a1d344ecdee7765bd423cfeb6a1d85a4df084b57a1484ab22519b1604bc5fe869ea34220b9a6bdceadc5ec46 SHA512 b5d89ffec4485276b4f37f7ebdb00774e3dd31a572dd047ccbf7fd7a7d579f4221a60920d2965a4c198cbd9392414c635adb4aeed68d7587906a7574c0f9bcec DIST FORD-6.2.0.tar.gz 6135683 BLAKE2B 3d8e87007259fea7dce3d88641902a367634ed00e96eb77c70a037be5736fb341d41737af002c9daa8c6e5606bbc5f0240c466e7e9164af698cfacdcbb06f5aa SHA512 8f87a17c9b0736ba994d7cd7a38d601f8fa9432340908db61866e9362f76168ed4bb5fe2ab92b3c0bd93138640dbbb9e8e6eed681241a663e3c8500d84d67de9 +DIST FORD-6.2.4.tar.gz 6138975 BLAKE2B 6f9ad0978db752fbc517072a77f15f33372ff0e34f3d86f89f23386763aa0bdc5efefcb335b9fd6f3da17418f76872bd317b8e60785bd5ea74a4d91063880762 SHA512 6b9db315e74b8c8bfe63923a0305f6fc43eef6ac016ffb6d268dc84259cfdce738341aca0726eb6f60bd3ccff882193140516fa52f5b453f58d0872d632e87db diff --git a/app-doc/ford/ford-6.2.4.ebuild b/app-doc/ford/ford-6.2.4.ebuild new file mode 100644 index 0000000000..dc98cfeea5 --- /dev/null +++ b/app-doc/ford/ford-6.2.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 pypi toolchain-funcs + +MY_PN="FORD" +DESCRIPTION="FORD, automatic documentation generator for modern Fortran programs" +HOMEPAGE="https://github.com/Fortran-FOSS-Programmers/ford" +SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN^}" "${PV}")" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + >=dev-python/graphviz-0.20[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/markdown-3.4[${PYTHON_USEDEP}] + >=dev-python/markdown-include-0.7.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.12.0[${PYTHON_USEDEP}] + dev-python/python-markdown-math[${PYTHON_USEDEP}] + >=dev-python/toposort-1.7[${PYTHON_USEDEP}] + >=dev-python/tqdm-4.64.0[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md README.md ) + +distutils_enable_tests pytest + +src_prepare() { + default + sed -i -e 's/"cpp /"'"$(tc-getCPP)"' /' ford/__init__.py || die # bug: 839300 +} From 048fb1eff189d00bb2159dc295f96421586d946e Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 03:14:55 +0300 Subject: [PATCH 11/19] dev-libs/toml-f: 0.4.0 version bump Signed-off-by: Sergey Torokhov --- dev-libs/toml-f/Manifest | 1 + dev-libs/toml-f/toml-f-0.4.0.ebuild | 34 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 dev-libs/toml-f/toml-f-0.4.0.ebuild diff --git a/dev-libs/toml-f/Manifest b/dev-libs/toml-f/Manifest index 1f214a5d2e..fae6a11063 100644 --- a/dev-libs/toml-f/Manifest +++ b/dev-libs/toml-f/Manifest @@ -1,2 +1,3 @@ DIST toml-f-0.2.4.tar.gz 94087 BLAKE2B 20302f864debd7070d72a13fcd42b52be5596761a535fb969a26cea851e0f305827aba43389d3b229004b85942f0ef7a4ef01d7ca8ec05b97e125fb2e50e6c99 SHA512 19693efac1944ed6b68ccd1762dafdf188656ecdc6e9d7092e1f9008c644db20f1c3be91044e516547bc778e2cc7c0a6060a3d2fafe3b4d225aaf3a9103e62f0 DIST toml-f-0.3.1.tar.gz 408898 BLAKE2B b59841eb4f7e3d7caab6a5f0ac7ee84b84946f60830d72c988f10e7b81148f5833d61cd6c21b0dbfdbb0750809142a79ac6d294501bec38dfb0ec3376911427d SHA512 51cdfdb6aa948c7797126d1655a0fd720b58d9e4a8968ca00ab17ba5ca2a3c65ae56774c4ef9b9afdf80c59af4cbdbc05d147e2f3aecde7beaec5f9f96bb29ae +DIST toml-f-0.4.0.tar.gz 436988 BLAKE2B 96e99b2680b428565436945330286f8745a55794c800ccb32c66e75d99c53e2e51397c1452e4871ae24ff9413571c70ca90aa0b472535a07b25b299f617a581c SHA512 770b3e54c0d405624670ab08a4f2fbf5237300fa082c5d530258dd91a76739175da914c003f13deb412bff07fc9ef632f2b6d1dcdfeabc1d65c2602d919dde44 diff --git a/dev-libs/toml-f/toml-f-0.4.0.ebuild b/dev-libs/toml-f/toml-f-0.4.0.ebuild new file mode 100644 index 0000000000..160dfc221b --- /dev/null +++ b/dev-libs/toml-f/toml-f-0.4.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +inherit cmake fortran-2 + +DESCRIPTION="TOML parser implementation for data serialization and deserialization in Fortran" +HOMEPAGE="https://toml-f.readthedocs.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0/4" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( dev-util/fortran-test-drive ) +" + +src_prepare() { + default + + if ! use test ; then + sed -i -e '/^enable_testing()/d' \ + -e '/^add_subdirectory("test")/d' CMakeLists.txt || die + fi + + cmake_src_prepare +} From 39cba32eca5851f1972211d802af1c0f7fda9310 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 03:18:08 +0300 Subject: [PATCH 12/19] dev-libs/jonquil: new package, version 0.2.0 Signed-off-by: Sergey Torokhov --- dev-libs/jonquil/Manifest | 1 + dev-libs/jonquil/jonquil-0.2.0.ebuild | 32 +++++++++++++++++++++++++++ dev-libs/jonquil/metadata.xml | 11 +++++++++ 3 files changed, 44 insertions(+) create mode 100644 dev-libs/jonquil/Manifest create mode 100644 dev-libs/jonquil/jonquil-0.2.0.ebuild create mode 100644 dev-libs/jonquil/metadata.xml diff --git a/dev-libs/jonquil/Manifest b/dev-libs/jonquil/Manifest new file mode 100644 index 0000000000..c4dd50d010 --- /dev/null +++ b/dev-libs/jonquil/Manifest @@ -0,0 +1 @@ +DIST jonquil-0.2.0.tar.gz 49875 BLAKE2B 15b5b9acf08495979961dcc6ea065d47cfdd06da9519c715fde6a73c426828ef0dda6aecc8df3355ec3bd4ad537e41f83e021a5d16e7a67d6131441651bb8b5c SHA512 6abc682ba19307bcbb71fabc557b0cdc6b597138bfa6879553beb70384f362e9e73724f6a7fd7243b3e1711b42865e22daa16d1188092307c3782951f37b5b91 diff --git a/dev-libs/jonquil/jonquil-0.2.0.ebuild b/dev-libs/jonquil/jonquil-0.2.0.ebuild new file mode 100644 index 0000000000..b917eb0ace --- /dev/null +++ b/dev-libs/jonquil/jonquil-0.2.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +inherit cmake fortran-2 + +DESCRIPTION="Jonquil: Bringing TOML blooms to JSON land" +HOMEPAGE="https://toml-f.readthedocs.io/en/latest/how-to/jonquil/" +SRC_URI="https://github.com/toml-f/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0/2" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/toml-f:0/4 + test? ( dev-util/fortran-test-drive ) +" + +src_configure() { + local mycmakeargs=( + -DENABLE_TESTING=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-libs/jonquil/metadata.xml b/dev-libs/jonquil/metadata.xml new file mode 100644 index 0000000000..b700377bb3 --- /dev/null +++ b/dev-libs/jonquil/metadata.xml @@ -0,0 +1,11 @@ + + + + + torokhov-s-a@yandex.ru + Sergey Torokhov + + + toml-f/jonquil + + From 46bab8888da30406faf836982f5796d12c0d2bc7 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 03:21:41 +0300 Subject: [PATCH 13/19] dev-util/fpm: 0.8.1 version bump Signed-off-by: Sergey Torokhov --- dev-util/fpm/Manifest | 2 + dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch | 20 ++++ dev-util/fpm/fpm-0.8.1.ebuild | 116 ++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch create mode 100644 dev-util/fpm/fpm-0.8.1.ebuild diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index ae6d0f0212..e9dcbeeeec 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -1,2 +1,4 @@ DIST fpm-0.7.0.F90 985847 BLAKE2B 05d6acc336880ea0c2dcd01db9b5eb5790ee593d9d97b36c7dab231d96f564125293e944f4c7c1debcee1dace9a0709ca9dbec40535c2b7320f909023d561d0a SHA512 76e4a465f38375469ccad849f705837d90dc288df2ac101dfc6941f4fa676c3302f6f23bfd45037c7ce4bb5fac637f021373ff0756534d5cf762044709dbd8c0 DIST fpm-0.7.0.tar.gz 169412 BLAKE2B 6895d91cb67a8d15e50025c298aed32e77966685a1db426b9437a5c441f7c365cec76a7836c83ff5a5299216a9392812ae832bfb72d5cd4263bcb60976d12b6e SHA512 ec18798e02b4fb3e403062c68f97bf34200559207ffc87dba3b8b801aef31cabefdcda29203a1405ed0231192316a1fab16ecff603b0bf9fab0cede0fe4506de +DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d1c773c8bee3dfea84ab89dd2f57e7fdc6fc31e8297f5df89744ff657244d790bb8526ae35fc1d4be37a SHA512 627f5a6976358449b2dfa3623039244ddbab64007e1518718b6ae033e206d4a6b1ff462769df75137067522d85b0fbbb5f4a1749f7bbfba3c7b9040b457b1872 +DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 diff --git a/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch b/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch new file mode 100644 index 0000000000..8bea036c46 --- /dev/null +++ b/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch @@ -0,0 +1,20 @@ +diff -Naur a/fpm.toml b/fpm.toml +--- a/fpm.toml ++++ b/fpm.toml +@@ -5,13 +5,9 @@ + maintainer = "" + copyright = "2020 fpm contributors" + +-[dependencies] +-toml-f.git = "https://github.com/toml-f/toml-f" +-toml-f.rev = "54686e45993f3a9a1d05d5c7419f39e7d5a4eb3f" +-M_CLI2.git = "https://github.com/urbanjost/M_CLI2.git" +-M_CLI2.rev = "7264878cdb1baff7323cc48596d829ccfe7751b8" +-jonquil.git = "https://github.com/toml-f/jonquil" +-jonquil.rev = "05d30818bb12fb877226ce284b9a3a41b971a889" ++[build] ++external-modules = ["tomlf","jonquil","m_cli2"] ++link = ["toml-f","jonquil","M_CLI2"] + + [[test]] + name = "cli-test" diff --git a/dev-util/fpm/fpm-0.8.1.ebuild b/dev-util/fpm/fpm-0.8.1.ebuild new file mode 100644 index 0000000000..0f3dda1c38 --- /dev/null +++ b/dev-util/fpm/fpm-0.8.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Fortran Package Manager (fpm)" +HOMEPAGE="https://fpm.fortran-lang.org" +SRC_URI=" + https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/jonquil:0/2 + dev-libs/toml-f:0/4 + dev-libs/M_CLI2 +" + +RDEPEND=" + ${CDEPEND} + dev-vcs/git +" + +DEPEND=" + ${CDEPEND} + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( LICENSE PACKAGING.md README.md ) + +PATCHES="${FILESDIR}/${P}_fpm_toml.patch" + +BSDIR="build/bootstrap" # Bootstrap directory path + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +set_build_flags() { + OMPFLAG="" + if use openmp ; then + case $(tc-getFC) in + *gfortran* ) + OMPFLAG="-fopenmp" ;; + * ) + die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; + esac + fi + + BUILD_FLAGS=( --compiler "$(tc-getFC)" + --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f/modules -I/usr/include/jonquil/modules -I/usr/include/M_CLI2" + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" + --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" ) +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + fortran-2_pkg_setup + python-any-r1_pkg_setup + set_build_flags +} + +src_prepare() { + default + + mkdir -p "${BSDIR}" || die + cp "${DISTDIR}/${P}.F90" "${BSDIR}/" || die + + # Use favicon.png instead remote icon + sed -i -e 's#https://fortran-lang.org/assets/img/fortran_logo_512x512.png#favicon.png#' docs.md || die +} + +src_compile() { + default + + # Build a bootstrap binary from the single source version + "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die + + # Use the bootstrap binary to build the feature complete fpm version + "${BSDIR}"/fpm build --verbose "${BUILD_FLAGS[@]}" || die + + if use doc ; then + einfo "Build API documentation:" + ford docs.md || die + fi +} + +src_test() { + "${BSDIR}"/fpm test --verbose "${BUILD_FLAGS[@]}" || die +} + +src_install() { + # Set prefix and pass all used env flags to avoid recompiling with default values + "${BSDIR}"/fpm install --prefix "${ED}/usr" "${BUILD_FLAGS[@]}" || die + + use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) + einstalldocs +} From 8bd6ca0cea11a6a3f7b68fb19d7034444ae2506f Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 19 Apr 2023 03:22:28 +0300 Subject: [PATCH 14/19] dev-libs/toml-f: drop old unused version (no reverse deps) Signed-off-by: Sergey Torokhov --- dev-libs/toml-f/Manifest | 1 - dev-libs/toml-f/toml-f-0.3.1.ebuild | 37 ----------------------------- 2 files changed, 38 deletions(-) delete mode 100644 dev-libs/toml-f/toml-f-0.3.1.ebuild diff --git a/dev-libs/toml-f/Manifest b/dev-libs/toml-f/Manifest index fae6a11063..55ab38df88 100644 --- a/dev-libs/toml-f/Manifest +++ b/dev-libs/toml-f/Manifest @@ -1,3 +1,2 @@ DIST toml-f-0.2.4.tar.gz 94087 BLAKE2B 20302f864debd7070d72a13fcd42b52be5596761a535fb969a26cea851e0f305827aba43389d3b229004b85942f0ef7a4ef01d7ca8ec05b97e125fb2e50e6c99 SHA512 19693efac1944ed6b68ccd1762dafdf188656ecdc6e9d7092e1f9008c644db20f1c3be91044e516547bc778e2cc7c0a6060a3d2fafe3b4d225aaf3a9103e62f0 -DIST toml-f-0.3.1.tar.gz 408898 BLAKE2B b59841eb4f7e3d7caab6a5f0ac7ee84b84946f60830d72c988f10e7b81148f5833d61cd6c21b0dbfdbb0750809142a79ac6d294501bec38dfb0ec3376911427d SHA512 51cdfdb6aa948c7797126d1655a0fd720b58d9e4a8968ca00ab17ba5ca2a3c65ae56774c4ef9b9afdf80c59af4cbdbc05d147e2f3aecde7beaec5f9f96bb29ae DIST toml-f-0.4.0.tar.gz 436988 BLAKE2B 96e99b2680b428565436945330286f8745a55794c800ccb32c66e75d99c53e2e51397c1452e4871ae24ff9413571c70ca90aa0b472535a07b25b299f617a581c SHA512 770b3e54c0d405624670ab08a4f2fbf5237300fa082c5d530258dd91a76739175da914c003f13deb412bff07fc9ef632f2b6d1dcdfeabc1d65c2602d919dde44 diff --git a/dev-libs/toml-f/toml-f-0.3.1.ebuild b/dev-libs/toml-f/toml-f-0.3.1.ebuild deleted file mode 100644 index cafee26f2f..0000000000 --- a/dev-libs/toml-f/toml-f-0.3.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_STANDARD="2003" - -inherit cmake fortran-2 - -DESCRIPTION="TOML parser implementation for data serialization and deserialization in Fortran" -HOMEPAGE="https://toml-f.readthedocs.io" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 MIT" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( dev-util/fortran-test-drive ) -" - -src_prepare() { - default - - # Remove Fortran compiler version from paths - sed -i -e "s:/\${CMAKE_Fortran_COMPILER_ID}-\${CMAKE_Fortran_COMPILER_VERSION}::" config/CMakeLists.txt || die - - if ! use test ; then - sed -i -e '/^enable_testing()/d' \ - -e '/^add_subdirectory("test")/d' CMakeLists.txt || die - fi - - cmake_src_prepare -} From f92fa7820b35b50d486cf436bd8b99a232fb8c35 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Apr 2023 09:27:36 +0200 Subject: [PATCH 15/19] sys-apps/dool: add 1.1.0 Signed-off-by: Florian Schmaus --- sys-apps/dool/Manifest | 2 + sys-apps/dool/dool-1.1.0.ebuild | 67 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 sys-apps/dool/dool-1.1.0.ebuild diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest index cce2385ed9..ca8c528044 100644 --- a/sys-apps/dool/Manifest +++ b/sys-apps/dool/Manifest @@ -1 +1,3 @@ +DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d DIST dool-1.0.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 +DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 diff --git a/sys-apps/dool/dool-1.1.0.ebuild b/sys-apps/dool/dool-1.1.0.ebuild new file mode 100644 index 0000000000..67fc995a6f --- /dev/null +++ b/sys-apps/dool/dool-1.1.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-r1 + +DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat (clone of dstat)" +HOMEPAGE="https://github.com/scottchiefbaker/dool" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git" + inherit git-r3 +else + DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d" + SRC_URI=" + https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz + https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch + -> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch + " + S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}" +fi + +if [[ "${PV}" != "9999" ]]; then + KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc examples" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +PATCHES=( + "${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch +) + +src_compile() { + : +} + +src_install() { + python_foreach_impl python_doscript "${PN}" + + insinto "/usr/share/${PN}" + newins "${PN}" "${PN}.py" + doins plugins/${PN}_*.py + + doman "docs/${PN}.1" + + einstalldocs + + if use examples; then + dodoc examples/{mstat,read}.py + fi + if use doc; then + dodoc docs/*.html + fi +} + +src_test() { + python_foreach_impl emake test +} From bee36a2aedb4986878feb70504bb7dd2a8f96fb7 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Apr 2023 09:28:21 +0200 Subject: [PATCH 16/19] sys-apps/dool: drop 1.0.0 Signed-off-by: Florian Schmaus --- sys-apps/dool/Manifest | 1 - sys-apps/dool/dool-1.0.0.ebuild | 63 --------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 sys-apps/dool/dool-1.0.0.ebuild diff --git a/sys-apps/dool/Manifest b/sys-apps/dool/Manifest index ca8c528044..c627d0a668 100644 --- a/sys-apps/dool/Manifest +++ b/sys-apps/dool/Manifest @@ -1,3 +1,2 @@ DIST dool-1.0.0-fix-proc-diskstats-parsing.patch 7784 BLAKE2B 0c819c124ad5ec66800f2b8700f1b6d533311e91f978c0db16909ef089997605fe4660de8042533f3a8130db521671fbbe7c9064f1a08f108f39f4472d4720ce SHA512 8611cfc39eb1b3b7353c72234b28d13501f9bff544815ae7d939f37b2c1c18ec8b26f7e72db592d6c55481397b31ba0cd5929e0ad80547d3457dca685e9b589d -DIST dool-1.0.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 DIST dool-1.1.0.tar.gz 141224 BLAKE2B 9c1d733b340b3f1d51798ce85698e7fc526aea349b500431d348d413c1fd93d07d8ccb8241e671a40363275b8c4025ed2f4983b4dfc70f5e166178635935337e SHA512 5204eb1c0a37b225d447830048e5f2372dd3973d50cbd3fbc42972782a4853b809e566550e752c857502f86ceed7ea31620ea27059f9f334d27f28cc61abd968 diff --git a/sys-apps/dool/dool-1.0.0.ebuild b/sys-apps/dool/dool-1.0.0.ebuild deleted file mode 100644 index 6c09eece27..0000000000 --- a/sys-apps/dool/dool-1.0.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-r1 - -DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat (clone of dstat)" -HOMEPAGE="https://github.com/scottchiefbaker/dool" - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/scottchiefbaker/dool.git" - inherit git-r3 -else - DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d" - SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}" -fi - -if [[ "${PV}" != "9999" ]]; then - KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc examples" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" -) - -src_compile() { - : -} - -src_install() { - python_foreach_impl python_doscript "${PN}" - - insinto "/usr/share/${PN}" - newins "${PN}" "${PN}.py" - doins plugins/${PN}_*.py - - doman "docs/${PN}.1" - - einstalldocs - - if use examples; then - dodoc examples/{mstat,read}.py - fi - if use doc; then - dodoc docs/*.html - fi -} - -src_test() { - python_foreach_impl emake test -} From b01a4a318340ad874c3067efeae83a9579f487d5 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Apr 2023 09:28:42 +0200 Subject: [PATCH 17/19] sys-apps/dool: sync live Signed-off-by: Florian Schmaus --- sys-apps/dool/dool-9999.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild index 6c09eece27..67fc995a6f 100644 --- a/sys-apps/dool/dool-9999.ebuild +++ b/sys-apps/dool/dool-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,11 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 else DOOL_COMMIT_ID="6b89f2d0b6e38e1c8d706e88a12e020367f5100d" - SRC_URI="https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/scottchiefbaker/dool/archive/${DOOL_COMMIT_ID}.tar.gz -> ${P}.tar.gz + https://github.com/stanford-rc/dool/commit/fa079a43c97f772a4809304386dbed5f4afa9a54.patch + -> ${PN}-1.0.0-fix-proc-diskstats-parsing.patch + " S="${WORKDIR}/${PN}-${DOOL_COMMIT_ID}" fi @@ -32,7 +36,7 @@ RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" + "${DISTDIR}"/${PN}-1.0.0-fix-proc-diskstats-parsing.patch ) src_compile() { From 8aab641b263e642ba4a2a77589a5f3971138865f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Apr 2023 09:30:41 +0200 Subject: [PATCH 18/19] sys-apps/dool: add github upstream metadata Signed-off-by: Florian Schmaus --- sys-apps/dool/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/dool/metadata.xml b/sys-apps/dool/metadata.xml index 75209e7cb5..9f3302d8ab 100644 --- a/sys-apps/dool/metadata.xml +++ b/sys-apps/dool/metadata.xml @@ -5,4 +5,7 @@ flow@gentoo.org Florian Schmaus + + scottchiefbaker/dool + From 0df272e143e90954ab1b7b11a224bdfb7107e2cf Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 19 Apr 2023 09:31:49 +0200 Subject: [PATCH 19/19] sys-apps/dool: remove unused patch Signed-off-by: Florian Schmaus --- ...dool_disk_avgqu.py-to-avoid-KeyError.patch | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch diff --git a/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch b/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch deleted file mode 100644 index 05db739070..0000000000 --- a/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 67b58a3e453d6a7b9c225c1f210e20fe2605908a Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Mon, 3 May 2021 19:34:41 +0200 -Subject: [PATCH] Key for key in dool_disk_avgqu.py to avoid KeyError - -Running "make test" may fail with: - -Traceback (most recent call last): - File "./dool", line 2899, in - main() - File "./dool", line 2751, in main - scheduler.run() - File "/usr/lib/python3.7/sched.py", line 151, in run - action(*argument, **kwargs) - File "./dool", line 2847, in perform - o.extract() - File "", line 63, in extract -KeyError: 'rq_ticks' -make: *** [Makefile:38: test] Error 1 - -See https://bugs.gentoo.org/784704 ---- - plugins/dool_disk_avgqu.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/plugins/dool_disk_avgqu.py b/plugins/dool_disk_avgqu.py -index 5da8d4666d5c..bc421a82028a 100644 ---- a/plugins/dool_disk_avgqu.py -+++ b/plugins/dool_disk_avgqu.py -@@ -60,6 +60,10 @@ class dstat_plugin(dstat): - ) - - for name in self.vars: -+ # Avoid KeyError: 'rq_ticks' -+ # See https://bugs.gentoo.org/784704 -+ if 'rq_ticks' not in self.set1[name] or 'rq_ticks' not in self.set2[name]: -+ continue - self.val[name] = ( ( self.set2[name]['rq_ticks'] - self.set1[name]['rq_ticks'] ) * 1.0 / elapsed / 1000, ) - - if step == op.delay: --- -2.30.2 -